tools: Generate the Ext2 filesystem using genext2fs instead

mkbootimg's filenames have some kind of bug...
This commit is contained in:
apio 2023-06-22 19:39:43 +02:00
parent 765df906fb
commit 393f3dfaca
Signed by: apio
GPG Key ID: B8A7D06E42258954
3 changed files with 5 additions and 4 deletions

View File

@ -11,7 +11,7 @@ steps:
image: ubuntu image: ubuntu
commands: commands:
- apt update - 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 - wget https://pub.cloudapio.eu/luna/toolchains/ci-toolchain-arm64.tar.gz --quiet
- tar xf ci-toolchain-arm64.tar.gz - tar xf ci-toolchain-arm64.tar.gz
- rm ci-toolchain-arm64.tar.gz - rm ci-toolchain-arm64.tar.gz

View File

@ -16,9 +16,8 @@
}, },
{ {
"type": "ext2", "type": "ext2",
"size": 2, "file": "build/ext2fs.bin",
"directory": "base", "name": "luna-rootfs"
"name": "sysroot"
} }
] ]
} }

View File

@ -7,4 +7,6 @@ cd $LUNA_ROOT
fakeroot -u -s $LUNA_ROOT/.fakeroot -- tools/install.sh 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 fakeroot -u -i $LUNA_ROOT/.fakeroot -- mkbootimg luna.json Luna.iso