diff options
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap | 27 |
1 files changed, 21 insertions, 6 deletions
@@ -281,9 +281,18 @@ rm /etc/localtime # Both nspawn and debootstrap try to mount /proc /sys (Debian bug#840372). # -mkdir /tmp/proc /tmp/sys -mount --move /proc /tmp/proc -mount --move /sys /tmp/sys +# @@ TMP this now causes issues with newer systemd. +# +#mkdir /tmp/proc /tmp/sys +#mount --move /proc /tmp/proc +#mount --move /sys /tmp/sys + +# systemd-nspawn "helpfully" creates a /lib64 symlink that then trips +# up is-usr-merged package (Debain bug #1019575). +# +if [ $arch = aarch64 ]; then + rm /lib64 +fi # Run second stage of debootstrap. # @@ -474,6 +483,12 @@ scripts/config --disable INIT_STACK_ALL_ZERO scripts/config --enable DEBUG_INFO_NONE scripts/config --disable DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT +# aarch64/5.19 additions: +# +scripts/config --disable KCOV +scripts/config --disable SHADOW_CALL_STACK +scripts/config --disable VIDEO_ADV7511 + # Disable sound subsystem/drivers. # sed -i -re '/^CONFIG_SND_.+/d' .config @@ -685,12 +700,12 @@ etc/systemd/system/multi-user.target.wants/buildos.service EOF cd "$owd" - cat buildos-rootfs.cpio.gz buildos-init.cpio.gz >buildos-initrd + cat buildos-rootfs.cpio.gz buildos-init.cpio.gz >"buildos-initrd-$arch" # Copy the kernel image next to the initramfs for convenience. # - cp "$root/vmlinuz" buildos-image - echo "$buildid" >buildos-buildid + cp "$root/vmlinuz" "buildos-image-$arch" + echo "$buildid" >"buildos-buildid-$arch" subvol_snapshot -r "$root" "$root-6" fi |