diff options
| author | John Estabrook <jestabro@vyos.io> | 2026-03-03 14:55:18 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-03 14:55:18 -0600 |
| commit | ca671c3a17bcb2877a50a8d2805e6f98f6fa709e (patch) | |
| tree | 1ea2bfa29fd328a039b3cdffcf6f6e44ef7a030c | |
| parent | 0cb0929c37569c685e282c30e255543ab9d49840 (diff) | |
| parent | 721297c4ed2e6e5ba42e9bd2d67863de7a5d13bf (diff) | |
| download | vyos-build-ca671c3a17bcb2877a50a8d2805e6f98f6fa709e.tar.gz vyos-build-ca671c3a17bcb2877a50a8d2805e6f98f6fa709e.zip | |
Merge pull request #1130 from c-po/multiarch
T8311: move to GNU coreutils when building GLIBC multiarch variable
| -rwxr-xr-x | data/live-build-config/hooks/live/92-strip-symbols.chroot | 2 | ||||
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 2 |
2 files changed, 2 insertions, 2 deletions
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" diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index f79ce2ee..f8c70327 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 \ |