From 51e187b9ea645aac84de5c6bb039bb1e3d085550 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 16 Sep 2024 20:25:34 +0200 Subject: Merging debian version 256.4-3. Signed-off-by: Daniel Baumann --- debian/rules | 68 +++++------------------------------------------------------- 1 file changed, 5 insertions(+), 63 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 0e77aa5..52fe8a6 100755 --- a/debian/rules +++ b/debian/rules @@ -202,19 +202,10 @@ export PATH := $(shell dirname $(bpftool_binary)):$(PATH) endif endif -# The vmlinux.h we want is in the headers package that linux-headers-ARCH depends on, -# which itself is the package that provides linux-headers-generic that we build depend on. -# This is available since Trixie. If we can't find it, default to auto for the upstream CI -# so that it is generated at build time, or disabled for distribution builds, as we don't -# want to depend on the buildd kernels. -ifeq ($(DEB_VENDOR),Ubuntu) -HEADERS_PACKAGE = $(shell dpkg-query --showformat='$${Depends}' --show linux-headers-generic | sed "s/.*\(linux-headers-.*)\)-generic.*/\1/") -else -HEADERS_PACKAGE = $(shell dpkg-query --showformat='$${Depends}' --show linux-headers-$(DEB_HOST_ARCH) | sed "s/.*\(linux-headers-.*-$(DEB_HOST_ARCH)\).*/\1/") -endif - -ifneq ("$(wildcard /usr/src/$(HEADERS_PACKAGE)/vmlinux.h)","") -CONFFLAGS += -Dvmlinux-h=provided -Dvmlinux-h-path=/usr/src/$(HEADERS_PACKAGE)/vmlinux.h +# TODO: once linux-bpf-dev is available in all releases that we build for, drop the +# conditional on the wildcard and the alternative dependency on linux-headers-generic +ifneq ("$(wildcard /usr/include/$(DEB_HOST_MULTIARCH)/linux/bpf/vmlinux.h)","") +CONFFLAGS += -Dvmlinux-h=provided -Dvmlinux-h-path=/usr/include/$(DEB_HOST_MULTIARCH)/linux/bpf/vmlinux.h else ifneq (, $(filter pkg.systemd.upstream, $(DEB_BUILD_PROFILES))) CONFFLAGS += -Dvmlinux-h=auto @@ -239,53 +230,20 @@ execute_before_dh_auto_build: @echo 'blhc: ignore-line-regexp: .*cc -E.*' @echo 'blhc: ignore-line-regexp: .* -o src/boot/efi.*' -execute_after_dh_auto_build: - # generate POT file for translators - ninja -C obj-$(DEB_HOST_GNU_TYPE) systemd-pot - execute_before_dh_auto_clean: ifneq (, $(filter pkg.systemd.upstream, $(DEB_BUILD_PROFILES))) debian/extra/checkout-upstream endif -execute_after_dh_auto_clean: - rm -f debian/shlibs.local - # remove Python byte code files - rm -rf src/ukify/test/__pycache__/ - rm -rf src/ukify/__pycache__/ - rm -rf tools/__pycache__/ - rm -rf tools/chromiumos/__pycache__/ - rm -f po/systemd.pot - execute_before_dh_install: - # remove unnecessary / unused files + # remove unnecessary / unused files that are picked up by wildcards/directory listings in dh_install rm -rf debian/tmp/usr/share/doc/systemd/LICENSES/ rm -f debian/tmp/usr/share/doc/systemd/LICENSE.* - rm -f debian/tmp/etc/init.d/README - rm -f debian/tmp/usr/lib/*.d/README rm -f debian/tmp/usr/lib/udev/*.d/README - rm -f debian/tmp/usr/lib/sysctl.d/50-default.conf - rm -f debian/tmp/etc/X11/xinit/xinitrc.d/50-systemd-user.sh - if [ -d debian/tmp/etc/X11/xinit/xinitrc.d/ ]; then \ - rmdir -p --ignore-fail-on-non-empty debian/tmp/etc/X11/xinit/xinitrc.d/; \ - fi - # remove etc.conf and usr/share/factory for now, we are not using them yet - find debian/tmp/ -name etc.conf -print -delete - rm -rf debian/tmp/usr/share/factory/ # replace upstream sysusers.d/basic.conf with proper users for Debian if [ -d debian/tmp/usr/lib/sysusers.d/ ]; then \ debian/extra/make-sysusers-basic > debian/tmp/usr/lib/sysusers.d/basic.conf; \ fi - # remove obsolete compat symlink - rm -f debian/tmp/usr/bin/systemd-resolve - # we don't want the repart standalone binary for now - rm -f debian/tmp/usr/bin/systemd-repart.standalone - # files shipped by cryptsetup -ifeq (, $(filter stage1, $(DEB_BUILD_PROFILES))) - rm -f debian/tmp/usr/share/man/man5/crypttab.5 -endif - # print empty directories, makes it easier to keep *.install files up-to-date - find debian/tmp -type d -empty -print execute_after_dh_install-arch: # disable ctrl-alt-del.target @@ -311,22 +269,6 @@ endif endif endif - # Remove empty directories from /usr/lib. - # Those are not strictly needed and can trigger piuparts errors due to - # accidential directory removal by dpkg on merged-/usr systems. - if [ -d debian/systemd/usr/lib ]; then \ - find debian/systemd/usr/lib -type d -empty -print -delete; \ - fi - - # Can be dropped once upstream CI stops running on Jammy, which needs - # the old pkla config files, which are created only when building with - # old polkit versions. -ifneq (, $(filter pkg.systemd.upstream, $(DEB_BUILD_PROFILES))) - if [ -f debian/tmp/var/lib/polkit-1/localauthority/10-vendor.d/systemd-networkd.pkla ]; then \ - dh_install -psystemd var/lib/polkit-1/localauthority/10-vendor.d/systemd-networkd.pkla; \ - fi -endif - override_dh_missing: dh_missing $(DH_MISSING) -- cgit v1.2.3