diff options
| author | joshua stein <jcs@jcs.org> | 2020-12-28 17:36:15 -0600 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-02-14 09:29:22 +0100 |
| commit | 0d215b55487ca3ea66a77463c85d98956fa07f0b (patch) | |
| tree | c156e8fcb62e5714cdff5884697429fc5e5a2d29 /Meta/build-image-qemu.sh | |
| parent | 4021264201d99372fb1e84899be9ae84a5510415 (diff) | |
| download | serenity-0d215b55487ca3ea66a77463c85d98956fa07f0b.zip | |
Build: Sprinkle some portability, fix on OpenBSD
realpath(1) is specific to coreutils and its behavior can be had
with readlink -f
Create the Toolchain Build directory if it doesn't exist before
calling readlink, since realpath(3) on at least OpenBSD will error
on a non-existent path
Diffstat (limited to 'Meta/build-image-qemu.sh')
| -rwxr-xr-x | Meta/build-image-qemu.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Meta/build-image-qemu.sh b/Meta/build-image-qemu.sh index a6acf8d9cb..e826c556af 100755 --- a/Meta/build-image-qemu.sh +++ b/Meta/build-image-qemu.sh @@ -19,7 +19,8 @@ if [ "$(uname -s)" = "Darwin" ]; then fi disk_usage() { - du -sm "$1" | cut -f1 + # shellcheck disable=SC2003 + expr "$(du -sk "$1" | cut -f1)" / 1024 } DISK_SIZE=$(($(disk_usage "$SERENITY_ROOT/Base") + $(disk_usage Root) + 100)) @@ -33,7 +34,7 @@ printf "creating new filesystem... " if [ "$(uname -s)" = "OpenBSD" ]; then VND=$(vnconfig _disk_image) (echo "e 0"; echo 83; echo n; echo 0; echo "*"; echo "quit") | fdisk -e "$VND" - mkfs.ext2 -I 128 -F "/dev/${VND}i" || die "could not create filesystem" + newfs_ext2fs -D 128 "/dev/r${VND}i" || die "could not create filesystem" elif [ "$(uname -s)" = "FreeBSD" ]; then MD=$(mdconfig _disk_image) mke2fs -q -I 128 _disk_image || die "could not create filesystem" |