RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 14:47:35 +00:00
Code Issues Activity Actions

Meta: Improve build compatibility with non-GNU userspaces

Browse source 
We depend on GNU-specific du switch `--apparent-size`. Busybox has this
implemented, but as `-b` instead.
Another part of the build system uses `cp --preserve=timestamps`. This
can be replaced by `rsync -t`, and rsync is already used through the
file.

Thanks to those changes, Serenity can be built on a Busybox system,
without GNU coreutils.
This commit is contained in:
Dominique Liberda 2023-07-08 07:46:49 +02:00 • committed by Linus Groh
parent fddbd11baa
commit d7644d1d86
6 changed files with 23 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Meta/build-image-qemu.sh
View file

@ -32,27 +32,10 @@ fi
# Prepend the toolchain qemu directory so we pick up QEMU from there
PATH="$SCRIPT_DIR/../Toolchain/Local/qemu/bin:$PATH"
# We depend on GNU coreutils du for the --apparent-size extension.
# GNU coreutils is a build dependency.
if command -v gdu > /dev/null 2>&1 && gdu --version | grep -q "GNU coreutils"; then
GNUDU="gdu"
else
GNUDU="du"
fi
disk_usage() {
# shellcheck disable=SC2003,SC2307
expr "$(${GNUDU} -sk --apparent-size "$1" | cut -f1)"
}
inode_usage() {
find "$1" | wc -l
}
INODE_SIZE=128
INODE_COUNT=$(($(inode_usage "$SERENITY_SOURCE_DIR/Base") + $(inode_usage Root)))
INODE_COUNT=$((INODE_COUNT + 2000)) # Some additional inodes for toolchain files, could probably also be calculated
DISK_SIZE_BYTES=$((($(disk_usage "$SERENITY_SOURCE_DIR/Base") + $(disk_usage Root)) * 1024))
DISK_SIZE_BYTES=$((($(disk_usage "$SERENITY_SOURCE_DIR/Base") + $(disk_usage Root) ) * 1024 * 1024))
DISK_SIZE_BYTES=$((DISK_SIZE_BYTES + (INODE_COUNT * INODE_SIZE)))
if [ -z "$SERENITY_DISK_SIZE_BYTES" ]; then