diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2026-02-26 13:22:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-26 13:22:40 +0200 |
| commit | f42212d83c6288aa3b9bb912d80e5f92ed9266c7 (patch) | |
| tree | a16c254349e635f987926d34707e5e3679577508 /data | |
| parent | 5661e745c3863192c4594ee0357c776f713db4a5 (diff) | |
| parent | f4877564276947af06cef44e1d1b41330f66e9dd (diff) | |
| download | vyos-build-f42212d83c6288aa3b9bb912d80e5f92ed9266c7.tar.gz vyos-build-f42212d83c6288aa3b9bb912d80e5f92ed9266c7.zip | |
Merge pull request #1124 from sever-sever/T8311
T8311: De-hardcode architecture for live-build-config
Diffstat (limited to 'data')
| -rwxr-xr-x | data/live-build-config/hooks/live/92-strip-symbols.chroot | 3 | ||||
| -rwxr-xr-x | data/live-build-config/includes.chroot/etc/initramfs-tools/hooks/10-vyos-addons | 4 |
2 files changed, 5 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 f44cb01d..924cc467 100755 --- a/data/live-build-config/hooks/live/92-strip-symbols.chroot +++ b/data/live-build-config/hooks/live/92-strip-symbols.chroot @@ -9,6 +9,7 @@ # # Set variables. +MULTIARCH="$(dpkg-architecture -qDEB_HOST_MULTIARCH)" 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" @@ -20,7 +21,7 @@ STRIPDIR_UNNEEDED=" /etc/hsflowd/modules /usr/bin /usr/lib/openvpn -/usr/lib/x86_64-linux-gnu +/usr/lib/${MULTIARCH} /usr/lib32 /usr/lib64 /usr/libx32 diff --git a/data/live-build-config/includes.chroot/etc/initramfs-tools/hooks/10-vyos-addons b/data/live-build-config/includes.chroot/etc/initramfs-tools/hooks/10-vyos-addons index b9190971..8dac91b5 100755 --- a/data/live-build-config/includes.chroot/etc/initramfs-tools/hooks/10-vyos-addons +++ b/data/live-build-config/includes.chroot/etc/initramfs-tools/hooks/10-vyos-addons @@ -1,4 +1,6 @@ #!/bin/sh + +MULTIARCH="$(dpkg-architecture -qDEB_HOST_MULTIARCH)" PREREQ="" prereqs() { @@ -23,7 +25,7 @@ manual_add_modules igb ixgbe ixgbevf i40e i40evf # force_load xxx # executable to copy to initramfs, with library dependencies -copy_exec /usr/lib/x86_64-linux-gnu/libnss_dns.so.2 +copy_exec /usr/lib/${MULTIARCH}/libnss_dns.so.2 # missing fsck in initramfs copy_exec /usr/sbin/fsck |