diff options
| author | Alexander Hill <ahill@breadpudding.dev> | 2025-04-14 22:19:01 -0400 |
|---|---|---|
| committer | Alexander Hill <ahill@breadpudding.dev> | 2025-04-14 22:19:01 -0400 |
| commit | 6a9c9665a693a6922909f5aecb65f683a2447448 (patch) | |
| tree | 96015baefb9b472821d2a59e17210180a3ac9c93 | |
| parent | 814580185ec18223a5f755478306210739686376 (diff) | |
Booted with an initramfs!
| -rwxr-xr-x | build-bootstrap.sh | 2 | ||||
| -rwxr-xr-x | build-chroot.sh | 11 | ||||
| -rw-r--r-- | limine.conf | 5 | ||||
| -rw-r--r-- | linux.x86_64.config | 2 |
4 files changed, 11 insertions, 9 deletions
diff --git a/build-bootstrap.sh b/build-bootstrap.sh index a131e97..ddb8bf5 100755 --- a/build-bootstrap.sh +++ b/build-bootstrap.sh @@ -375,5 +375,5 @@ cd .. cd .. # Copy the necessary configuration files to the bootstrap -cp limine.conf $MAPLE/boot/EFI/BOOT/ +cp limine.conf $MAPLE/boot/ cp linux.$(uname -m).config $MAPLE/maple/
\ No newline at end of file diff --git a/build-chroot.sh b/build-chroot.sh index 8f4779d..3c9880d 100755 --- a/build-chroot.sh +++ b/build-chroot.sh @@ -431,11 +431,17 @@ LLVM=1 make -j $THREADS mrproper cp /maple/linux.$(uname -m).config .config LLVM=1 make -j $THREADS LLVM=1 make -j $THREADS install +LLVM=1 make -j $THREADS modules_install cd .. # kmod Build tar xf ../sources/kmod-*.tar* cd kmod-*/ +# FIXME: kmod's meson script attempts to invoke sh via the add_install_script +# and confuses muon, so it starts searching for sh in the current +# directory. As a workaround, we will tweak the invocation to point +# directly to /bin/sh. ~ahill +sed -i "s/add_install_script('sh'/add_install_script('\/bin\/sh'/" meson.build # NOTE: Might enable zstd later, but I want to make sure that the lack of # Facebook's software doesn't negatively impact the open source world. # ~ahill @@ -447,11 +453,6 @@ muon setup \ -Dzstd=disabled \ build muon samu -C build -# FIXME: kmod's meson script attempts to invoke sh via the add_install_script -# and confuses muon, so it starts searching for sh in the current -# directory. As a workaround, we will tweak the invocation to point -# directly to /bin/sh. ~ahill -sed -i "s/add_install_script('sh'/add_install_script('\/bin\/sh'/" meson.build muon -C build install cd .. diff --git a/limine.conf b/limine.conf index 5ff8cd3..9ecd281 100644 --- a/limine.conf +++ b/limine.conf @@ -2,5 +2,6 @@ timeout: 3 /Maple Linux protocol: linux -path: boot():/vmlinuz -module_string: root=/dev/vda2
\ No newline at end of file +kernel_path: boot():/vmlinuz +kernel_cmdline: root=/dev/vda2 earlyprintk=console,ttyS0,115200 console=ttyS0,115200 +module_path: boot():/initramfs
\ No newline at end of file diff --git a/linux.x86_64.config b/linux.x86_64.config index f4c79db..4258adf 100644 --- a/linux.x86_64.config +++ b/linux.x86_64.config @@ -30,7 +30,7 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set CONFIG_WERROR=y -CONFIG_LOCALVERSION="maple" +CONFIG_LOCALVERSION="-maple" CONFIG_LOCALVERSION_AUTO=y CONFIG_BUILD_SALT="" CONFIG_HAVE_KERNEL_GZIP=y |