From 88ae1fa537fef4082c2ac661beb529086fdcffe0 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Mon, 2 Mar 2026 14:16:09 +0100 Subject: Revert "T8311: add missing bootstrap binary dependency on dpkg-dev" This reverts commit 673a2de05776656b70dc4803aa3579138e9fffca. --- scripts/image-build/build-vyos-image | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index 566dac91..597d75be 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -637,7 +637,7 @@ DOCUMENTATION_URL="{build_config['documentation_url']}" --checksums "sha256" \ --chroot-squashfs-compression-type "{{squashfs_compression_type}}" \ --debian-installer none \ - --debootstrap-options "--variant=minbase --exclude=isc-dhcp-client,isc-dhcp-common,ifupdown --include=apt-utils,ca-certificates,gnupg2,linux-kbuild-6.1,dpkg-dev" \ + --debootstrap-options "--variant=minbase --exclude=isc-dhcp-client,isc-dhcp-common,ifupdown --include=apt-utils,ca-certificates,gnupg2,linux-kbuild-6.1" \ --distribution "{{debian_distribution}}" \ --firmware-binary false \ --firmware-chroot false \ -- cgit v1.2.3 From 721297c4ed2e6e5ba42e9bd2d67863de7a5d13bf Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Mon, 2 Mar 2026 16:09:05 +0100 Subject: T8311: move to GNU coreutils when building GLIBC multiarch variable Related to commit 39dc9c98c68 ("T8311: fix initramfs hook "dpkg-architecture: command not found"). Drop dpkg-dev implementation in favour of GNU coreutils. On x86_64 (aka amd64) both yield the same result: $ echo $(uname -m)-linux-gnu x86_64-linux-gnu $ echo $(dpkg-architecture -qDEB_HOST_MULTIARCH) x86_64-linux-gnu On aarch64 (aka arm64) both yield the same result: $ echo $(uname -m)-linux-gnu aarch64-linux-gnu $ echo $(dpkg-architecture -qDEB_HOST_MULTIARCH) aarch64-linux-gnu --- data/live-build-config/hooks/live/92-strip-symbols.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/live-build-config/hooks/live/92-strip-symbols.chroot b/data/live-build-config/hooks/live/92-strip-symbols.chroot index 924cc467..8b816eb3 100755 --- a/data/live-build-config/hooks/live/92-strip-symbols.chroot +++ b/data/live-build-config/hooks/live/92-strip-symbols.chroot @@ -9,7 +9,7 @@ # # Set variables. -MULTIARCH="$(dpkg-architecture -qDEB_HOST_MULTIARCH)" +MULTIARCH="$(uname -m)-linux-gnu" STRIPCMD_REGULAR="strip --remove-section=.comment --remove-section=.note --preserve-dates" STRIPCMD_DEBUG="strip --strip-debug --remove-section=.comment --remove-section=.note --preserve-dates" STRIPCMD_UNNEEDED="strip --strip-unneeded --remove-section=.comment --remove-section=.note --preserve-dates" -- cgit v1.2.3