0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Build: Support building in Docker

Browse source 
Add missing installations to instructions, and use genext2fs instead
of mounting.
This commit is contained in:
Yonatan Goldschmidt 2020-05-07 01:03:32 +03:00 • committed by Andreas Kling
parent beaec6bd2d
commit 3df3ab4598
Notes: sideshowbarker 2024-07-19 06:55:20 +09:00
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Documentation/BuildInstructions.md
View file

@ -8,6 +8,11 @@ Make sure you have all the dependencies installed:
sudo apt install build-essential curl libmpfr-dev libmpc-dev libgmp-dev e2fsprogs qemu-system-i386 qemu-utils sudo apt install build-essential curl libmpfr-dev libmpc-dev libgmp-dev e2fsprogs qemu-system-i386 qemu-utils
``` ```
On Docker, install these as well:
```bash
sudo apt install wget genext2fs
```
**Fedora** **Fedora**
```bash ```bash
sudo dnf install curl mpfr-devel libmpc-devel gmp-devel e2fsprogs @"C Development Tools and Libraries" @Virtualization sudo dnf install curl mpfr-devel libmpc-devel gmp-devel e2fsprogs @"C Development Tools and Libraries" @Virtualization

26
Kernel/build-image-qemu.sh
View file

@ -38,6 +38,7 @@ echo "done"
printf "mounting filesystem... " printf "mounting filesystem... "
mkdir -p mnt mkdir -p mnt
use_genext2fs=0
if [ "$(uname -s)" = "Darwin" ]; then if [ "$(uname -s)" = "Darwin" ]; then
fuse-ext2 _disk_image mnt -o rw+,allow_other,uid=501,gid=20 || die "could not mount filesystem" fuse-ext2 _disk_image mnt -o rw+,allow_other,uid=501,gid=20 || die "could not mount filesystem"
elif [ "$(uname -s)" = "OpenBSD" ]; then elif [ "$(uname -s)" = "OpenBSD" ]; then
@ -45,14 +46,23 @@ elif [ "$(uname -s)" = "OpenBSD" ]; then
elif [ "$(uname -s)" = "FreeBSD" ]; then elif [ "$(uname -s)" = "FreeBSD" ]; then
fuse-ext2 -o rw+ "/dev/${MD}" mnt/ || die "could not mount filesystem" fuse-ext2 -o rw+ "/dev/${MD}" mnt/ || die "could not mount filesystem"
else else
mount _disk_image mnt/ || die "could not mount filesystem" if ! mount _disk_image mnt/ ; then
if command -v genext2fs 1>/dev/null ; then
echo "mount failed but genext2fs exists, use it instead"
use_genext2fs=1
else
die "could not mount filesystem and genext2fs is missing"
fi
fi
fi fi
echo "done" echo "done"
cleanup() { cleanup() {
if [ -d mnt ]; then if [ -d mnt ]; then
printf "unmounting filesystem... " if [ $use_genext2fs = 0 ] ; then
umount mnt || ( sleep 1 && sync && umount mnt ) printf "unmounting filesystem... "
umount mnt || ( sleep 1 && sync && umount mnt )
fi
rm -rf mnt rm -rf mnt
if [ "$(uname -s)" = "OpenBSD" ]; then if [ "$(uname -s)" = "OpenBSD" ]; then
vnconfig -u "$VND" vnconfig -u "$VND"
@ -65,3 +75,13 @@ cleanup() {
trap cleanup EXIT trap cleanup EXIT
./build-root-filesystem.sh ./build-root-filesystem.sh
if [ $use_genext2fs = 1 ]; then
# regenerate new image, since genext2fs is unable to reuse the previously written image.
# genext2fs is very slow in generating big images, so I use a smaller image here. size can be updated
# if it's not enough.
# not using "-i 128" since it hangs. Serenity handles whatever default this uses instead.
genext2fs -b 250000 -d mnt _disk_image || die "try increasing image size (genext2fs -b)"
# if using docker with shared mount, file is created as root, so make it writable for users
chmod 0666 _disk_image
fi