mirror of
https://github.com/versity/scoutfs.git
synced 2026-01-03 10:55:20 +00:00
scoutfs: update rpm building infrastructure
Update the makefile and spec to our current method of building rpms. Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
1
kmod/.gitignore
vendored
1
kmod/.gitignore
vendored
@@ -13,3 +13,4 @@ rpmbuild/
|
||||
rpms/
|
||||
|
||||
scoutfs-*.git*/
|
||||
scoutfs-kmod-*.tar
|
||||
|
||||
@@ -14,7 +14,7 @@ endif
|
||||
|
||||
SCOUTFS_GIT_DESCRIBE := \
|
||||
$(shell git describe --all --abbrev=6 --long 2>/dev/null || \
|
||||
echo not-in-a-git-repository)
|
||||
echo no-git)
|
||||
|
||||
SCOUTFS_FORMAT_HASH := \
|
||||
$(shell cat src/format.h src/ioctl.h | md5sum | cut -b1-16)
|
||||
@@ -24,14 +24,11 @@ SCOUTFS_ARGS := SCOUTFS_GIT_DESCRIBE=$(SCOUTFS_GIT_DESCRIBE) \
|
||||
CONFIG_SCOUTFS_FS=m -C $(SK_KSRC) M=$(CURDIR)/src \
|
||||
EXTRA_CFLAGS="-Werror"
|
||||
|
||||
# move damage locally, this will also help make it easier to cleanup after the build
|
||||
RPM_DIR = $(shell pwd)/rpmbuild
|
||||
|
||||
# - We use the git describe from tags to set up the RPM versioning
|
||||
RPM_VERSION := $(shell git describe --long --tags | awk -F '-' '{gsub(/^v/,""); print $$1}')
|
||||
RPM_RELEASE := $(shell git describe --long --tags | awk -F '-' '{print $$2"."$$3}')
|
||||
FULL_VERSION := $(RPM_VERSION).$(RPM_RELEASE)
|
||||
TARFILE = $(RPM_DIR)/SOURCES/scoutfs-kmod-$(FULL_VERSION).tar
|
||||
RPM_GITHASH := $(shell git rev-parse --short HEAD)
|
||||
TARFILE = scoutfs-kmod-$(RPM_VERSION).tar
|
||||
|
||||
|
||||
.PHONY: .FORCE
|
||||
|
||||
@@ -46,37 +43,15 @@ modules_install:
|
||||
make $(SCOUTFS_ARGS) modules_install
|
||||
|
||||
|
||||
# remake this each time..
|
||||
$(RPM_DIR): .FORCE
|
||||
@echo "## Clean up on isle $(RPM_DIR)..."
|
||||
rm -frv $(RPM_DIR)/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
|
||||
mkdir -p $(RPM_DIR)/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
|
||||
|
||||
|
||||
%.spec: %.spec.in .FORCE
|
||||
sed -e 's/@@VERSION@@/$(RPM_VERSION)/g' \
|
||||
-e s'/@@TAR_VERSION@@/$(FULL_VERSION)/g' \
|
||||
-e s'/@@RELEASE@@/$(RPM_RELEASE)/g' < $< > $@+
|
||||
-e 's/@@GITHASH@@/$(RPM_GITHASH)/g' < $< > $@+
|
||||
mv $@+ $@
|
||||
|
||||
|
||||
# NOTE: Both tar & rpm are capable of being built natively on Linux, provided
|
||||
# you have a local install of rpmbuild.sh for the rpm target.
|
||||
# Normal exection is to use docker, as that pulls our canned image and tooling for the user.
|
||||
# ./indocker.sh make tar
|
||||
# ./indocker.sh make rpm
|
||||
#
|
||||
tar: $(RPM_DIR) scoutfs-kmod.spec
|
||||
git archive --format=tar --prefix scoutfs-$(FULL_VERSION)/ HEAD^{tree} > $(TARFILE)
|
||||
@ tar rf $(TARFILE) --transform="s@\(.*\)@scoutfs-$(FULL_VERSION)/\1@" scoutfs-kmod.spec
|
||||
gzip -f -9 $(TARFILE)
|
||||
|
||||
|
||||
$(TARFILE).gz: tar
|
||||
|
||||
rpm: $(TARFILE).gz scoutfs-kmod.spec
|
||||
rpmbuild.sh $(TARFILE).gz
|
||||
|
||||
dist: scoutfs-kmod.spec
|
||||
git archive --format=tar --prefix scoutfs-kmod-$(RPM_VERSION)/ HEAD^{tree} > $(TARFILE)
|
||||
@ tar rf $(TARFILE) --transform="s@\(.*\)@scoutfs-$(RPM_VERSION)/\1@" scoutfs-kmod.spec
|
||||
|
||||
clean:
|
||||
make $(SCOUTFS_ARGS) clean
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e -o pipefail
|
||||
|
||||
# Build RPMs, populating a directory structure that indicates the OS release.
|
||||
# NOTE: This expects to run in a CentOS or RHEL environment, preferrably one of the versity
|
||||
# rpm-build Docker containers.
|
||||
|
||||
OS_RELEASE=$(grep -oE '[0-9]+\.[0-9]+\.[0-9]+' /etc/redhat-release)
|
||||
echo "OS RELEASE: $OS_RELEASE"
|
||||
|
||||
make rpm
|
||||
|
||||
rpm_dist="rpms/$OS_RELEASE"
|
||||
rm -fvr "$rpm_dist"
|
||||
mkdir -p "$rpm_dist"
|
||||
|
||||
cp -v rpmbuild/RPMS/x86_64/kmod-scoutfs*.rpm "$rpm_dist/"
|
||||
@@ -1,40 +1,51 @@
|
||||
%define kmod_name scoutfs
|
||||
#%%trace
|
||||
%define kmod_version @@VERSION@@
|
||||
%define kmod_git_hash @@GITHASH@@
|
||||
%define pkg_date %(date +%%Y%%m%%d)
|
||||
|
||||
%define _tar_version @@TAR_VERSION@@
|
||||
# official builds set this to 1, we use 0 for internal/dev-test
|
||||
%{!?_release: %global _release 0}
|
||||
# take kernel version or default to uname -r
|
||||
%{!?kversion: %global kversion %(uname -r)}
|
||||
%global kernel_version %{kversion}
|
||||
|
||||
%global kernel_source() /usr/src/kernels/%{kernel_version}.$(arch)
|
||||
%global kernel_release() %{kversion}
|
||||
|
||||
%{!?_release: %global _release 0.%{pkg_date}git%{kmod_git_hash}}
|
||||
|
||||
Name: %{kmod_name}
|
||||
Summary: %{kmod_name} kernel module
|
||||
Version: @@VERSION@@
|
||||
Release: %{_release}.@@RELEASE@@%{?dist}
|
||||
Version: %{kmod_version}
|
||||
Release: %{_release}%{?dist}
|
||||
License: GPLv2
|
||||
Group: System/Kernel
|
||||
URL: http://versity.com
|
||||
URL: http://scoutfs.org/
|
||||
|
||||
BuildRequires: %{kernel_module_package_buildreqs}
|
||||
BuildRequires: git
|
||||
BuildRequires: kernel-devel-uname-r = %{kernel_version}
|
||||
BuildRequires: module-init-tools
|
||||
|
||||
BuildRequires: %kernel_module_package_buildreqs
|
||||
ExclusiveArch: x86_64
|
||||
|
||||
# Sources.
|
||||
Source0: scoutfs-kmod-%{_tar_version}.tar.gz
|
||||
Source: %{kmod_name}-kmod-%{kmod_version}.tar
|
||||
|
||||
# Build only for standard kernel variant(s); for debug packages, append "debug"
|
||||
# after "default" (separated by space)
|
||||
%kernel_module_package default
|
||||
|
||||
|
||||
# Disable the building of the debug package(s).
|
||||
%define debug_package %{nil}
|
||||
|
||||
%global install_mod_dir extra/%{name}
|
||||
|
||||
|
||||
%description
|
||||
%{kmod_name} - kernel module
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{kmod_name}-kmod-%{kmod_version}
|
||||
|
||||
|
||||
%setup -q -n %{kmod_name}-%{_tar_version}
|
||||
set -- *
|
||||
mkdir source
|
||||
mv "$@" source/
|
||||
@@ -43,30 +54,27 @@ mkdir obj
|
||||
|
||||
%build
|
||||
echo "Building for kernel: %{kernel_version} flavors: '%{flavors_to_build}'"
|
||||
echo "Build var: kmodtool = %{kmodtool}"
|
||||
echo "Build var: kverrel = %{kverrel}"
|
||||
for flavor in %flavors_to_build; do
|
||||
rm -rf obj/$flavor
|
||||
cp -r source obj/$flavor
|
||||
make SK_KSRC=%{kernel_source $flavor} -C obj/$flavor module
|
||||
done
|
||||
|
||||
|
||||
%install
|
||||
export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
|
||||
export INSTALL_MOD_DIR=extra/%{name}
|
||||
for flavor in %flavors_to_build ; do
|
||||
# TODO add Makefile rule
|
||||
#make SK_KSRC=%{kernel_source $flavor} -C obj/$flavor modules_install
|
||||
make -C %{kernel_source $flavor} modules_install \
|
||||
M=$PWD/obj/$flavor/src
|
||||
export INSTALL_MOD_DIR=%{install_mod_dir}
|
||||
mkdir -p %{install_mod_dir}
|
||||
for flavor in %{flavors_to_build}; do
|
||||
export KSRC=%{kernel_source $flavor}
|
||||
export KVERSION=%{kernel_release $KSRC}
|
||||
install -d $INSTALL_MOD_PATH/lib/modules/$KVERSION/%{install_mod_dir}
|
||||
cp $PWD/obj/$flavor/src/scoutfs.ko $INSTALL_MOD_PATH/lib/modules/$KVERSION/%{install_mod_dir}/
|
||||
done
|
||||
|
||||
# mark modules executable so that strip-to-file can strip them
|
||||
find %{buildroot} -type f -name \*.ko -exec %{__chmod} u+x \{\} \;
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Nov 17 2017 Nic Henke <nic.henke@versity.com> - 1.0
|
||||
- Initial version.
|
||||
|
||||
Reference in New Issue
Block a user