From f59a9731d59eecae326d0e2a32ba5b161c43e5cf Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 15 Feb 2024 19:40:21 +0000 Subject: [PATCH] remove armhf from architecture list for files that seem systemd-boot related. --- debian/changelog | 4 ++++ debian/systemd.install | 52 ++++++++++++++++++++--------------------- debian/systemd.manpages | 42 ++++++++++++++++----------------- 3 files changed, 51 insertions(+), 47 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4adac260..56ea71da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,10 @@ systemd (255.3-1+rpi1) trixie-staging; urgency=medium * Disable systemd-boot, it seems to fail to build and it's not really relavent for raspbian. + [changes introduced in 255.3-1+rpi1 by Peter Michael Green] + * Remove armhf from architecture lists for files that appear systemd-boot + related + -- Peter Michael Green Thu, 18 Jan 2024 19:38:38 +0000 systemd (255.3-1) sid; urgency=medium diff --git a/debian/systemd.install b/debian/systemd.install index 084d3e23..beafb8a4 100755 --- a/debian/systemd.install +++ b/debian/systemd.install @@ -120,7 +120,7 @@ usr/lib/systemd/systemd-modules-load usr/lib/systemd/systemd-networkd usr/lib/systemd/systemd-networkd-wait-online usr/lib/systemd/systemd-network-generator -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/systemd-pcrextend +[amd64 i386 arm64 riscv64] usr/lib/systemd/systemd-pcrextend usr/lib/systemd/systemd-pcrlock usr/lib/systemd/systemd-pstore usr/lib/systemd/systemd-quotacheck @@ -138,7 +138,7 @@ usr/lib/systemd/systemd-sysroot-fstab-check usr/lib/systemd/systemd-sysupdate usr/lib/systemd/systemd-timedated usr/lib/systemd/systemd-time-wait-sync -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/systemd-tpm2-setup +[amd64 i386 arm64 riscv64] usr/lib/systemd/systemd-tpm2-setup usr/lib/systemd/systemd-update-done usr/lib/systemd/systemd-update-utmp usr/lib/systemd/systemd-user-runtime-dir @@ -185,7 +185,7 @@ usr/lib/systemd/system/initrd-switch-root.target usr/lib/systemd/system/initrd.target usr/lib/systemd/system/initrd.target.wants/systemd-battery-check.service usr/lib/systemd/system/initrd.target.wants/systemd-bsod.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/initrd.target.wants/systemd-pcrphase-initrd.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/initrd.target.wants/systemd-pcrphase-initrd.service usr/lib/systemd/system/initrd-udevadm-cleanup-db.service usr/lib/systemd/system/initrd-usr-fs.target usr/lib/systemd/system/integritysetup-pre.target @@ -242,7 +242,7 @@ usr/lib/systemd/system/sockets.target usr/lib/systemd/system/sockets.target.wants/systemd-initctl.socket usr/lib/systemd/system/sockets.target.wants/systemd-journald-dev-log.socket usr/lib/systemd/system/sockets.target.wants/systemd-journald.socket -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/sockets.target.wants/systemd-pcrextend.socket +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/sockets.target.wants/systemd-pcrextend.socket usr/lib/systemd/system/sockets.target.wants/systemd-sysext.socket usr/lib/systemd/system/soft-reboot.target usr/lib/systemd/system/sound.target @@ -271,9 +271,9 @@ usr/lib/systemd/system/sysinit.target.wants/systemd-journald.service usr/lib/systemd/system/sysinit.target.wants/systemd-journal-flush.service usr/lib/systemd/system/sysinit.target.wants/systemd-machine-id-commit.service usr/lib/systemd/system/sysinit.target.wants/systemd-modules-load.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/sysinit.target.wants/systemd-pcrmachine.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/sysinit.target.wants/systemd-pcrphase.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/sysinit.target.wants/systemd-pcrphase-sysinit.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/sysinit.target.wants/systemd-pcrmachine.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/sysinit.target.wants/systemd-pcrphase.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/sysinit.target.wants/systemd-pcrphase-sysinit.service usr/lib/systemd/system/sysinit.target.wants/systemd-random-seed.service usr/lib/systemd/system/sysinit.target.wants/systemd-repart.service usr/lib/systemd/system/sysinit.target.wants/systemd-sysctl.service @@ -281,8 +281,8 @@ usr/lib/systemd/system/sysinit.target.wants/systemd-sysusers.service usr/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev-early.service usr/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service usr/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/sysinit.target.wants/systemd-tpm2-setup-early.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/sysinit.target.wants/systemd-tpm2-setup.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/sysinit.target.wants/systemd-tpm2-setup-early.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/sysinit.target.wants/systemd-tpm2-setup.service usr/lib/systemd/system/sysinit.target.wants/systemd-update-done.service usr/lib/systemd/system/sysinit.target.wants/systemd-update-utmp.service usr/lib/systemd/system/sysinit.target.wants/veritysetup.target @@ -334,21 +334,21 @@ usr/lib/systemd/system/systemd-networkd.socket usr/lib/systemd/system/systemd-networkd-wait-online.service usr/lib/systemd/system/systemd-networkd-wait-online@.service usr/lib/systemd/system/systemd-network-generator.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-pcrextend@.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-pcrextend.socket -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-pcrfs-root.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-pcrfs@.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-pcrlock-file-system.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-pcrlock-firmware-code.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-pcrlock-firmware-config.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-pcrlock-machine-id.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-pcrlock-make-policy.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-pcrlock-secureboot-authority.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-pcrlock-secureboot-policy.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-pcrmachine.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-pcrphase-initrd.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-pcrphase.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-pcrphase-sysinit.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/systemd-pcrextend@.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/systemd-pcrextend.socket +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/systemd-pcrfs-root.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/systemd-pcrfs@.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/systemd-pcrlock-file-system.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/systemd-pcrlock-firmware-code.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/systemd-pcrlock-firmware-config.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/systemd-pcrlock-machine-id.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/systemd-pcrlock-make-policy.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/systemd-pcrlock-secureboot-authority.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/systemd-pcrlock-secureboot-policy.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/systemd-pcrmachine.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/systemd-pcrphase-initrd.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/systemd-pcrphase.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/systemd-pcrphase-sysinit.service usr/lib/systemd/system/systemd-poweroff.service usr/lib/systemd/system/systemd-pstore.service usr/lib/systemd/system/systemd-quotacheck.service @@ -378,8 +378,8 @@ usr/lib/systemd/system/systemd-tmpfiles-clean.timer usr/lib/systemd/system/systemd-tmpfiles-setup-dev-early.service usr/lib/systemd/system/systemd-tmpfiles-setup-dev.service usr/lib/systemd/system/systemd-tmpfiles-setup.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-tpm2-setup-early.service -[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-tpm2-setup.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/systemd-tpm2-setup-early.service +[amd64 i386 arm64 riscv64] usr/lib/systemd/system/systemd-tpm2-setup.service usr/lib/systemd/system/systemd-update-done.service usr/lib/systemd/system/systemd-update-utmp-runlevel.service usr/lib/systemd/system/systemd-update-utmp.service diff --git a/debian/systemd.manpages b/debian/systemd.manpages index 561fd93f..b8542fa4 100755 --- a/debian/systemd.manpages +++ b/debian/systemd.manpages @@ -23,7 +23,7 @@ debian/tmp/usr/share/man/man1/systemd-firstboot.service.1 debian/tmp/usr/share/man/man1/systemd-id128.1 debian/tmp/usr/share/man/man1/systemd-inhibit.1 debian/tmp/usr/share/man/man1/systemd-machine-id-setup.1 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man1/systemd-measure.1 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man1/systemd-measure.1 debian/tmp/usr/share/man/man1/systemd-mount.1 debian/tmp/usr/share/man/man1/systemd-notify.1 debian/tmp/usr/share/man/man1/systemd-path.1 @@ -109,7 +109,7 @@ debian/tmp/usr/share/man/man7/bootup.7 debian/tmp/usr/share/man/man7/daemon.7 debian/tmp/usr/share/man/man7/file-hierarchy.7 debian/tmp/usr/share/man/man7/kernel-command-line.7 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man7/sd-stub.7 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man7/sd-stub.7 debian/tmp/usr/share/man/man7/smbios-type-11.7 debian/tmp/usr/share/man/man7/systemd.directives.7 debian/tmp/usr/share/man/man7/systemd.environment-generator.7 @@ -120,7 +120,7 @@ debian/tmp/usr/share/man/man7/systemd.journal-fields.7 debian/tmp/usr/share/man/man7/systemd.net-naming-scheme.7 debian/tmp/usr/share/man/man7/systemd.offline-updates.7 debian/tmp/usr/share/man/man7/systemd.special.7 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man7/systemd-stub.7 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man7/systemd-stub.7 debian/tmp/usr/share/man/man7/systemd.syntax.7 debian/tmp/usr/share/man/man7/systemd.system-credentials.7 debian/tmp/usr/share/man/man7/systemd.time.7 @@ -204,21 +204,21 @@ debian/tmp/usr/share/man/man8/systemd-networkd-wait-online.service.8 debian/tmp/usr/share/man/man8/systemd-networkd-wait-online@.service.8 debian/tmp/usr/share/man/man8/systemd-network-generator.8 debian/tmp/usr/share/man/man8/systemd-network-generator.service.8 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man8/systemd-pcrextend.8 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man8/systemd-pcrfs-root.service.8 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man8/systemd-pcrfs@.service.8 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man8/systemd-pcrlock.8 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man8/systemd-pcrlock-file-system.service.8 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man8/systemd-pcrlock-firmware-code.service.8 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man8/systemd-pcrlock-firmware-config.service.8 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man8/systemd-pcrlock-machine-id.service.8 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man8/systemd-pcrlock-make-policy.service.8 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man8/systemd-pcrlock-secureboot-authority.service.8 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man8/systemd-pcrlock-secureboot-policy.service.8 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man8/systemd-pcrmachine.service.8 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man8/systemd-pcrphase-initrd.service.8 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man8/systemd-pcrphase.service.8 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man8/systemd-pcrphase-sysinit.service.8 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man8/systemd-pcrextend.8 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man8/systemd-pcrfs-root.service.8 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man8/systemd-pcrfs@.service.8 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man8/systemd-pcrlock.8 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man8/systemd-pcrlock-file-system.service.8 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man8/systemd-pcrlock-firmware-code.service.8 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man8/systemd-pcrlock-firmware-config.service.8 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man8/systemd-pcrlock-machine-id.service.8 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man8/systemd-pcrlock-make-policy.service.8 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man8/systemd-pcrlock-secureboot-authority.service.8 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man8/systemd-pcrlock-secureboot-policy.service.8 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man8/systemd-pcrmachine.service.8 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man8/systemd-pcrphase-initrd.service.8 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man8/systemd-pcrphase.service.8 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man8/systemd-pcrphase-sysinit.service.8 debian/tmp/usr/share/man/man8/systemd-poweroff.service.8 debian/tmp/usr/share/man/man8/systemd-pstore.8 debian/tmp/usr/share/man/man8/systemd-pstore.service.8 @@ -267,9 +267,9 @@ debian/tmp/usr/share/man/man8/systemd-tmpfiles-clean.timer.8 debian/tmp/usr/share/man/man8/systemd-tmpfiles-setup-dev-early.service.8 debian/tmp/usr/share/man/man8/systemd-tmpfiles-setup-dev.service.8 debian/tmp/usr/share/man/man8/systemd-tmpfiles-setup.service.8 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man8/systemd-tpm2-setup.8 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man8/systemd-tpm2-setup-early.service.8 -[amd64 i386 arm64 armhf riscv64] debian/tmp/usr/share/man/man8/systemd-tpm2-setup.service.8 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man8/systemd-tpm2-setup.8 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man8/systemd-tpm2-setup-early.service.8 +[amd64 i386 arm64 riscv64] debian/tmp/usr/share/man/man8/systemd-tpm2-setup.service.8 debian/tmp/usr/share/man/man8/systemd-udev-settle.service.8 debian/tmp/usr/share/man/man8/systemd-update-done.8 debian/tmp/usr/share/man/man8/systemd-update-done.service.8 -- 2.30.2