Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BuildSystem: Optimize disk image creation 

disk image is now created with rsync so there is no need for copying the
whole sysroot twice.
This commit is contained in:
Bananymous 2025-08-01 22:52:56 +03:00
parent d8a695a88d
commit 11a2d15003
3 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
script/build.sh
View File

@ -4,13 +4,11 @@ set -e
export BANAN_SCRIPT_DIR=$(dirname $(realpath $0)) export BANAN_SCRIPT_DIR=$(dirname $(realpath $0))
source $BANAN_SCRIPT_DIR/config.sh source $BANAN_SCRIPT_DIR/config.sh
FAKEROOT_FILE="$BANAN_BUILD_DIR/fakeroot-context"
run_fakeroot() { run_fakeroot() {
if [ ! -f $FAKEROOT_FILE ]; then if [ ! -f $BANAN_FAKEROOT ]; then
touch $FAKEROOT_FILE touch $BANAN_FAKEROOT
fi fi
fakeroot -i $FAKEROOT_FILE -s $FAKEROOT_FILE -- /bin/bash -c '$@' bash $@ fakeroot -i $BANAN_FAKEROOT -s $BANAN_FAKEROOT -- /bin/bash -c '$@' bash $@
} }
make_build_dir () { make_build_dir () {
@ -47,11 +45,6 @@ build_toolchain () {
create_image () { create_image () {
build_target all build_target all
build_target install build_target install
pushd $BANAN_SYSROOT >/dev/null
run_fakeroot tar cf ${BANAN_SYSROOT_TAR} *
popd >/dev/null
$BANAN_SCRIPT_DIR/image.sh "$1" $BANAN_SCRIPT_DIR/image.sh "$1"
} }

3
script/config.sh
View File

@ -20,7 +20,8 @@ export BANAN_BUILD_DIR="$BANAN_ROOT_DIR/build"
export BANAN_PORT_DIR="$BANAN_ROOT_DIR/ports" export BANAN_PORT_DIR="$BANAN_ROOT_DIR/ports"
export BANAN_SYSROOT="$BANAN_BUILD_DIR/sysroot" export BANAN_SYSROOT="$BANAN_BUILD_DIR/sysroot"
export BANAN_SYSROOT_TAR="$BANAN_SYSROOT.tar"
export BANAN_FAKEROOT="$BANAN_BUILD_DIR/fakeroot-context"
export BANAN_DISK_IMAGE_PATH="$BANAN_BUILD_DIR/banan-os.img" export BANAN_DISK_IMAGE_PATH="$BANAN_BUILD_DIR/banan-os.img"

37
script/image.sh
View File

@ -5,8 +5,13 @@ if [ -z $BANAN_DISK_IMAGE_PATH ]; then
exit 1 exit 1
fi fi
if [ -z $BANAN_SYSROOT_TAR ]; then if [ -z $BANAN_SYSROOT ]; then
echo "You must set the BANAN_SYSROOT_TAR environment variable" >&2 echo "You must set the BANAN_SYSROOT environment variable" >&2
exit 1
fi
if [ -z $BANAN_FAKEROOT ]; then
echo "You must set the BANAN_FAKEROOT environment variable" >&2
exit 1 exit 1
fi fi
@ -34,13 +39,33 @@ fi
if sudo mount $ROOT_PARTITION $MOUNT_DIR; then if sudo mount $ROOT_PARTITION $MOUNT_DIR; then
if (($BANAN_INITRD)); then if (($BANAN_INITRD)); then
fakeroot -i $BANAN_FAKEROOT tar -C $BANAN_SYSROOT -cf $BANAN_SYSROOT.initrd .
sudo mkdir -p $MOUNT_DIR/boot sudo mkdir -p $MOUNT_DIR/boot
sudo cp $BANAN_BUILD_DIR/kernel/banan-os.kernel $MOUNT_DIR/boot/banan-os.kernel sudo cp $BANAN_BUILD_DIR/kernel/banan-os.kernel $MOUNT_DIR/boot/banan-os.kernel
sudo cp $BANAN_SYSROOT_TAR $MOUNT_DIR/boot/banan-os.initrd sudo mv $BANAN_SYSROOT.initrd $MOUNT_DIR/boot/banan-os.initrd
else else
cd $MOUNT_DIR sudo rsync -rulHpt $BANAN_SYSROOT/ $MOUNT_DIR
sudo tar xf $BANAN_SYSROOT_TAR
cd fakeroot -i $BANAN_FAKEROOT find $BANAN_SYSROOT -printf './%P|%U|%G\n' >$BANAN_BUILD_DIR/sysroot-perms.txt
sudo bash -c "
if enable stat &>/dev/null; then
while IFS='|' read -r path uid gid; do
full=\"$MOUNT_DIR/\$path\"
stat \"\$full\"
if [[ \${STAT[uid]} != \$uid ]] || [[ \${STAT[gid]} != \$gid ]]; then
chown -h \"\$uid:\$gid\" \"\$full\"
fi
done <$BANAN_BUILD_DIR/sysroot-perms.txt
else
while IFS='|' read -r path uid gid; do
full=\"$MOUNT_DIR/\$path\"
if [[ \$(stat -c '%u %g' \"\$full\") != \"\$uid \$gid\" ]]; then
chown -h \"\$uid:\$gid\" \"\$full\"
fi
done <$BANAN_BUILD_DIR/sysroot-perms.txt
fi
"
fi fi
sudo umount $MOUNT_DIR sudo umount $MOUNT_DIR