From 0bd2089010ecdd88ee59ddffbae80377e8343ece Mon Sep 17 00:00:00 2001 From: Googulator Date: Mon, 13 Nov 2023 10:24:30 +0100 Subject: [PATCH] Bring more sysa artifacts over into sysc (including the Linux kernel) --- sysa/run2.sh | 6 ++++++ sysb/run.sh | 1 + 2 files changed, 7 insertions(+) diff --git a/sysa/run2.sh b/sysa/run2.sh index 6d21eca7..deda96fc 100755 --- a/sysa/run2.sh +++ b/sysa/run2.sh @@ -19,8 +19,11 @@ create_sysb() { echo "Creating sysb rootfs" sys_transfer /sysb_image /sysb gzip patch cp -rl /sysc /sysb_image/sysc_src + tar -cvf - --exclude='sysb' --exclude='sysc' --exclude='sysb_image' / | bzip2 > /sysb_image/sysa.tar.bz2 + ls -la /sysb_image/sysa.tar.bz2 echo "Creating sysb initramfs" gen_initramfs_list.sh -o "/boot/initramfs-sysb.cpio.gz" /sysb_image + ls -l "/boot/initramfs-sysb.cpio.gz" rm -rf /sysb /sysb_image # Cleanup } @@ -92,7 +95,10 @@ mkdir -p /sysc/distfiles cp "${DISTFILES}"/curl-7.88.1.tar.bz2 /sysc/distfiles # Clear up some RAM space +tar -cvf - --exclude="${DISTFILES}" "${SOURCES}" | bzip2 > /sysc/sysa_saved.tar.bz2 +ls -l /sysc/sysa_saved.tar.bz2 grep --no-filename '^build' "${SOURCES}"/run*.sh | grep -v musl-1.2.4 | sed "s/build //" | sed "s/ .*$//" | while read -r p ; do + echo rm -rf "${SOURCES:?}/${p:?}" rm -rf "${SOURCES:?}/${p:?}" done diff --git a/sysb/run.sh b/sysb/run.sh index 4fc3baa6..2ad2277d 100755 --- a/sysb/run.sh +++ b/sysb/run.sh @@ -88,6 +88,7 @@ mount -t ext4 "/dev/${DISK}" /sysc # Copy over appropriate data echo "Copying data into sysc" sys_transfer "${SYSC}" /sysc_src gzip patch +cp -r /sysa.tar.bz2 /sysc/sysa.tar.bz2 sync # switch_root into sysc 1. for simplicity 2. to avoid kexecing again