diff --git a/.drone.yml b/.drone.yml index f6fdfbb6..e42bf022 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,7 +11,7 @@ steps: image: ubuntu commands: - apt update - - apt install build-essential cmake ninja-build wget nasm -y + - apt install build-essential cmake ninja-build wget nasm genext2fs -y - wget https://pub.cloudapio.eu/luna/toolchains/ci-toolchain-arm64.tar.gz --quiet - tar xf ci-toolchain-arm64.tar.gz - rm ci-toolchain-arm64.tar.gz diff --git a/luna.json b/luna.json index 978f701d..dd2d4731 100644 --- a/luna.json +++ b/luna.json @@ -16,9 +16,8 @@ }, { "type": "ext2", - "size": 2, - "directory": "base", - "name": "sysroot" + "file": "build/ext2fs.bin", + "name": "luna-rootfs" } ] } diff --git a/tools/make-iso.sh b/tools/make-iso.sh index 3e92e6b7..71c5dfe8 100755 --- a/tools/make-iso.sh +++ b/tools/make-iso.sh @@ -7,4 +7,6 @@ cd $LUNA_ROOT fakeroot -u -s $LUNA_ROOT/.fakeroot -- tools/install.sh +genext2fs -d base -B 4096 -b 512 -L luna-rootfs -U -N 512 build/ext2fs.bin + fakeroot -u -i $LUNA_ROOT/.fakeroot -- mkbootimg luna.json Luna.iso