Support in-tree builds

This change updates the build code to support in-tree builds. This is easier to manage for CI builds and reduces the amount of IO operations necessary for the build process.
2021-04-18 19:55:44 +02:00 · 2021-04-18 19:55:44 +02:00 · 3650d4343a
commit 3650d4343a
parent 7d07970695
7 changed files with 121 additions and 198 deletions
--- a/debian/rules
+++ b/debian/rules
@ -15,15 +15,8 @@ ZFS_SRC := zfs
 %:
 	dh $@ --with quilt

-debian/control: $(wildcard debian/*.in)
-	sed -e 's/@@KVNAME@@/${KVNAME}/g' < debian/templates/pve-kernel.prerm.in > debian/${PVE_KERNEL_PKG}.prerm
-	sed -e 's/@@KVNAME@@/${KVNAME}/g' < debian/templates/pve-kernel.postrm.in > debian/${PVE_KERNEL_PKG}.postrm
-	sed -e 's/@@KVNAME@@/${KVNAME}/g' < debian/templates/pve-kernel.postinst.in > debian/${PVE_KERNEL_PKG}.postinst
-	sed -e 's/@@KVNAME@@/${KVNAME}/g' < debian/templates/pve-headers.postinst.in > debian/${PVE_HEADER_PKG}.postinst
-	chmod +x debian/${PVE_KERNEL_PKG}.prerm
-	chmod +x debian/${PVE_KERNEL_PKG}.postrm
-	chmod +x debian/${PVE_KERNEL_PKG}.postinst
-	chmod +x debian/${PVE_HEADER_PKG}.postinst
+## Debian package metadata
+debian/control: debian/templates/control.in
 	sed -e 's/@KVNAME@/${KVNAME}/g' -e 's/@KVMAJMIN@/${KERNEL_MAJMIN}/g' < debian/templates/control.in > debian/control

 debian/SOURCE:
@ -31,28 +24,48 @@ debian/SOURCE:
 		  git checkout ${PKG_GIT_VERSION} \
 		  git submodule update --init --depth=1" > $@

+## Debhelper phases
 override_dh_quilt_patch:
-	cd linux; \
+	# Apply crack bundle
+	git -C ${KERNEL_SRC} fetch ../crack.bundle $$(git -C ${KERNEL_SRC} ls-remote ../crack.bundle | cut -f1)
+	git -C ${KERNEL_SRC} checkout -f FETCH_HEAD
+	# Apply patches
+	cd ${KERNEL_SRC}; \
 		QUILT_PATCHES=../debian/patches  \
 		QUILT_SERIES=series.linux \
 		quilt --quiltrc /dev/null --color=always push -a || test $$? = 2
-	cd zfs; \
+	cd ${ZFS_SRC}; \
    	QUILT_PATCHES=../debian/patches  \
    	QUILT_SERIES=series.zfs \
    	quilt --quiltrc /dev/null --color=always push -a || test $$? = 2

 override_dh_quilt_unpatch:
-	cd linux; \
+	cd ${KERNEL_SRC}; \
 		QUILT_PATCHES=../debian/patches \
 		QUILT_SERIES=series.linux \
 		quilt --quiltrc /dev/null pop -a || test $$? = 2
-	cd zfs; \
+	cd ${ZFS_SRC}; \
    	QUILT_PATCHES=../debian/patches \
    	QUILT_SERIES=series.zfs \
    	quilt --quiltrc /dev/null pop -a || test $$? = 2
-	rm -rf linux/.pc zfs/.pc
+	rm -rf ${KERNEL_SRC}/.pc ${ZFS_SRC}/.pc

-override_dh_auto_build: .compile_mark .tools_compile_mark .modules_compile_mark
+override_dh_autoreconf:
+	dh_autoreconf -D ${ZFS_SRC}
+
+override_dh_auto_configure: ${KERNEL_SRC}/.config
+
+override_dh_auto_build:
+	# Kernel
+	dh_auto_build -D ${KERNEL_SRC} -- \
+		CC="${PVE_KERNEL_CC}" \
+		KCFLAGS="${PVE_KERNEL_CFLAGS}" \
+		EXTRAVERSION="${EXTRAVERSION}" \
+		LOCALVERSION="${LOCALVERSION}" \
+		KBUILD_BUILD_VERSION_TIMESTAMP="${KVNAME} ${PVE_BUILD_PROFILE} (${PKG_DATE})"
+	# ZFS
+	dh_auto_configure -D ${ZFS_SRC} -- CC="${PVE_ZFS_CC}" --with-config=kernel --with-linux=$(realpath ${KERNEL_SRC}) --with-linux-obj=$(realpath ${KERNEL_SRC})
+	dh_auto_build -D ${ZFS_SRC}

 override_dh_auto_install: debian/SOURCE .install_mark .tools_install_mark .headers_install_mark .usr_headers_install_mark
 	dh_installdocs -A debian/copyright debian/SOURCE
@ -62,6 +75,16 @@ override_dh_auto_install: debian/SOURCE .install_mark .tools_install_mark .heade
 	dh_compress
 	dh_fixperms

+override_dh_auto_clean: debian/control
+	dh_clean
+	dh_auto_clean -D ${KERNEL_SRC}
+	dh_auto_clean -D ${ZFS_SRC}
+	rm -f ${PVE_KERNEL_TEMPLATES} ${PVE_HEADER_TEMPLATES}
+	rm -f debian/SOURCE debian/*.tmp .*_mark
+
+## Kernel
+PVE_KERNEL_TEMPLATES := $(patsubst debian/templates/pve-kernel.%.in, debian/${PVE_KERNEL_PKG}.%, $(wildcard debian/templates/pve-kernel.*.in))
+
 ${KERNEL_SRC}/.config:
 	${KERNEL_SRC}/scripts/kconfig/merge_config.sh -m \
 		-O ${KERNEL_SRC} \
@ -69,20 +92,13 @@ ${KERNEL_SRC}/.config:
 		${KERNEL_SRC}/debian.master/config/${DEB_BUILD_ARCH}/config.common.${DEB_BUILD_ARCH} \
 		${KERNEL_SRC}/debian.master/config/${DEB_BUILD_ARCH}/config.flavour.generic \
 		debian/config/config.pve
-	${MAKE} -C ${KERNEL_SRC} CC=${PVE_BUILD_CC} oldconfig
+	${MAKE} -C ${KERNEL_SRC} CC=${PVE_KERNEL_CC} oldconfig

-.config_mark: ${KERNEL_SRC}/.config
-	touch $@
+debian/${PVE_KERNEL_PKG}.%: debian/templates/pve-kernel.%.in
+	sed -e 's/@@KVNAME@@/${KVNAME}/g' < debian/templates/pve-kernel.$*.in > debian/${PVE_KERNEL_PKG}.$*
+	chmod +x debian/${PVE_KERNEL_PKG}.$*

-.compile_mark: .config_mark
-	${MAKE} -C ${KERNEL_SRC} \
- 		CC=${PVE_BUILD_CC} \
- 		KCFLAGS="${PVE_BUILD_CFLAGS}" \
- 		EXTRAVERSION="${EXTRAVERSION}" \
- 		KBUILD_BUILD_VERSION_TIMESTAMP="${KVNAME} ${PVE_BUILD_PROFILE} (${PKG_DATE})"
-	touch $@
-
-.install_mark: .compile_mark .modules_compile_mark
+.install_mark: ${PVE_KERNEL_TEMPLATES}
 	rm -rf debian/${PVE_KERNEL_PKG}
 	mkdir -p debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}
 	mkdir debian/${PVE_KERNEL_PKG}/boot
@ -92,7 +108,15 @@ ${KERNEL_SRC}/.config:
 	${MAKE} -C ${KERNEL_SRC} INSTALL_MOD_PATH=${BUILD_DIR}/debian/${PVE_KERNEL_PKG}/ modules_install
 	# install zfs drivers
 	install -d -m 0755 debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
-	install -m 644 $(addprefix modules/,zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko icp.ko zlua.ko spl.ko zzstd.ko) debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
+	install -m 644 ${ZFS_SRC}/module/avl/zavl.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
+	install -m 644 ${ZFS_SRC}/module/nvpair/znvpair.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
+	install -m 644 ${ZFS_SRC}/module/unicode/zunicode.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
+	install -m 644 ${ZFS_SRC}/module/zcommon/zcommon.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
+	install -m 644 ${ZFS_SRC}/module/icp/icp.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
+	install -m 644 ${ZFS_SRC}/module/zfs/zfs.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
+	install -m 644 ${ZFS_SRC}/module/lua/zlua.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
+	install -m 644 ${ZFS_SRC}/module/spl/spl.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
+	install -m 644 ${ZFS_SRC}/module/zstd/zzstd.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
 	# remove firmware
 	rm -rf debian/${PVE_KERNEL_PKG}/lib/firmware
 	# strip debug info
@ -101,15 +125,22 @@ ${KERNEL_SRC}/.config:
 	/sbin/depmod -b debian/${PVE_KERNEL_PKG}/ ${KVNAME}
 	# Autogenerate blacklist for watchdog devices (see README)
 	install -m 0755 -d debian/${PVE_KERNEL_PKG}/lib/modprobe.d
-	ls debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/watchdog/ > watchdog-blacklist.tmp
-	echo ipmi_watchdog.ko >> watchdog-blacklist.tmp
-	cat watchdog-blacklist.tmp | sed -e 's/^/blacklist /' -e 's/.ko$$//' | sort -u > debian/${PVE_KERNEL_PKG}/lib/modprobe.d/blacklist_${PVE_KERNEL_PKG}.conf
+	ls debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/watchdog/ > debian/watchdog-blacklist.tmp
+	echo ipmi_watchdog.ko >> debian/watchdog-blacklist.tmp
+	cat debian/watchdog-blacklist.tmp | sed -e 's/^/blacklist /' -e 's/.ko$$//' | sort -u > debian/${PVE_KERNEL_PKG}/lib/modprobe.d/blacklist_${PVE_KERNEL_PKG}.conf
 	rm -f debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/source
 	rm -f debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/build
 	touch $@

-.tools_compile_mark: .compile_mark
-	${MAKE} -C ${KERNEL_SRC}/tools/perf prefix=/usr HAVE_NO_LIBBFD=1 HAVE_CPLUS_DEMANGLE_SUPPORT=1 NO_LIBPYTHON=1 NO_LIBPERL=1 NO_LIBCRYPTO=1 PYTHON=python2.7
+## Kernel tools
+.tools_compile_mark:
+	dh_auto_build -D ${KERNEL_SRC}/tools/perf -- prefix=/usr \
+		HAVE_NO_LIBBFD=1 \
+		HAVE_CPLUS_DEMANGLE_SUPPORT=1 \
+		NO_LIBPYTHON=1 \
+		NO_LIBPERL=1 \
+		NO_LIBCRYPTO=1 \
+		PYTHON=python2.7
 	echo "checking GPL-2 only perf binary for library linkage with incompatible licenses.."
 	! ldd ${KERNEL_SRC}/tools/perf/perf | grep -q -E '\blibbfd'
 	! ldd ${KERNEL_SRC}/tools/perf/perf | grep -q -E '\blibcrypto'
@ -127,13 +158,17 @@ ${KERNEL_SRC}/.config:
 	done
 	touch $@

-.headers_prepare_mark: .config_mark
+## Headers
+PVE_HEADER_TEMPLATES := $(patsubst debian/templates/pve-headers.%.in, debian/${PVE_HEADER_PKG}.%, $(wildcard debian/templates/pve-headers.*.in))
+
+debian/${PVE_HEADER_PKG}.%: debian/templates/pve-headers.%.in
+	sed -e 's/@@KVNAME@@/${KVNAME}/g' < debian/templates/pve-headers.$*.in > debian/${PVE_HEADER_PKG}.$*
+	chmod +x debian/${PVE_HEADER_PKG}.$*
+
+.headers_install_mark: ${PVE_HEADER_TEMPLATES}
 	rm -rf debian/${PVE_HEADER_PKG}
 	mkdir -p debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
 	install -m 0644 ${KERNEL_SRC}/.config debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
-	touch $@
-
-.headers_install_mark: .compile_mark .modules_compile_mark .headers_prepare_mark
 	( \
 		cd ${KERNEL_SRC}; \
 		find . arch/${KERNEL_BUILD_ARCH} -maxdepth 1 -name Makefile\*; \
@ -141,42 +176,24 @@ ${KERNEL_SRC}/.config:
 		find arch/${KERNEL_BUILD_ARCH} -name module.lds -o -name Kbuild.platforms -o -name Platform; \
 		find $$(find arch/${KERNEL_BUILD_ARCH} -name include -o -name scripts -type d) -type f; \
 		find arch/${KERNEL_BUILD_ARCH}/include Module.symvers include scripts -type f \
-	) | rsync -av --files-from=- ${KERNEL_SRC} debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
+	) | rsync -avq --files-from=- ${KERNEL_SRC} debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
 	mkdir -p debian/${PVE_HEADER_PKG}/lib/modules/${KVNAME}
 	ln -sf /usr/src/linux-headers-${KVNAME} debian/${PVE_HEADER_PKG}/lib/modules/${KVNAME}/build
 	touch $@

+## User-space headers
 .usr_headers_install_mark: PKG_DIR = debian/${PVE_USR_HEADER_PKG}
 .usr_headers_install_mark: OUT_DIR = ${PKG_DIR}/usr
-.usr_headers_install_mark: .config_mark
+.usr_headers_install_mark:
 	rm -rf '${PKG_DIR}'
 	mkdir -p  '${PKG_DIR}'
 	$(MAKE) -C ${KERNEL_SRC} headers_check ARCH=$(KERNEL_HEADER_ARCH)
 	$(MAKE) -C ${KERNEL_SRC} headers_install ARCH=$(KERNEL_HEADER_ARCH) INSTALL_HDR_PATH='$(CURDIR)'/$(OUT_DIR)
 	rm -rf $(OUT_DIR)/include/drm $(OUT_DIR)/include/scsi
 	find $(OUT_DIR)/include \( -name .install -o -name ..install.cmd \) -execdir rm {} +
-
-# Move include/asm to arch-specific directory
+	# Move include/asm to arch-specific directory
 	mkdir -p $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)
 	mv $(OUT_DIR)/include/asm $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
 	test ! -d $(OUT_DIR)/include/arch || \
 		mv $(OUT_DIR)/include/arch $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
-	touch $@
-
-.modules_compile_mark: modules/zfs.ko
-	touch $@
-
-modules/zfs.ko: .compile_mark
-	dh_autoreconf -D ${ZFS_SRC}
-	dh_auto_configure -D ${ZFS_SRC} -- --with-config=kernel --with-linux=$(realpath ${KERNEL_SRC}) --with-linux-obj=$(realpath ${KERNEL_SRC})
-	dh_auto_build -D ${ZFS_SRC}
-	mkdir -p modules
-	cp ${ZFS_SRC}/module/avl/zavl.ko modules/
-	cp ${ZFS_SRC}/module/nvpair/znvpair.ko modules/
-	cp ${ZFS_SRC}/module/unicode/zunicode.ko modules/
-	cp ${ZFS_SRC}/module/zcommon/zcommon.ko modules/
-	cp ${ZFS_SRC}/module/icp/icp.ko modules/
-	cp ${ZFS_SRC}/module/zfs/zfs.ko modules/
-	cp ${ZFS_SRC}/module/lua/zlua.ko modules/
-	cp ${ZFS_SRC}/module/spl/spl.ko modules/
-	cp ${ZFS_SRC}/module/zstd/zzstd.ko modules/
+	touch $@
--- a/debian/rules.d/common.mk
+++ b/debian/rules.d/common.mk
@ -25,7 +25,8 @@ ifneq (${PKG_BUILD_PROFILE},generic)
 endif

 # Build settings
-PVE_BUILD_CC ?= ${CC}
+PVE_KERNEL_CC ?= ${CC}
+PVE_ZFS_CC ?= ${CC}

 ### Debian package names
 EXTRAVERSION=-${KERNEL_RELEASE}-${PKG_BUILD_FLAVOR}
--- a/debian/templates/control.in
+++ b/debian/templates/control.in
@ -55,7 +55,7 @@ Priority: optional
 Architecture: any
 Provides: linux-headers,
          linux-headers-2.6,
-Depends: coreutils | fileutils (>= 4.0),
+Depends:
 Description: The Proxmox PVE Kernel Headers
 This package contains the linux kernel headers