diff --git a/Ports/packages.yml b/Ports/packages.yml index d346f785..98fe68f2 100644 --- a/Ports/packages.yml +++ b/Ports/packages.yml @@ -63,6 +63,10 @@ packages: subdir: 'Ports' tools_required: - host-llvm + pkgs_required: + - liblemon + - liblemongui + - mlibc configure: - args: ['cp', '-r', '@THIS_SOURCE_DIR@/.', '@THIS_BUILD_DIR@'] build: diff --git a/Scripts/buildinitrd.sh b/Scripts/buildinitrd.sh index 14035ae6..5e84cc84 100755 --- a/Scripts/buildinitrd.sh +++ b/Scripts/buildinitrd.sh @@ -8,8 +8,9 @@ cd "$LEMOND" set -e -cp Resources/* Initrd/ -cp -L ~/.local/share/lemon/sysroot/system/lib/libc.so* ~/.local/share/lemon/sysroot/system/lib/libc++*.so* ~/.local/share/lemon/sysroot/system/lib/libunwind.so* ~/.local/share/lemon/sysroot/system/lib/ld.so* ~/.local/share/lemon/sysroot/system/lib/libfreetype.so* ~/.local/share/lemon/sysroot/system/lib/libpthread.so* ~/.local/share/lemon/sysroot/system/lib/librt.so* ~/.local/share/lemon/sysroot/system/lib/libdl.so* Initrd/ # Only copy crucial libraries +mkdir -p Initrd/ +cp -ru Resources/* Initrd/ +cp -L Build//sysroot/system/lib/libc.so* Build//sysroot/system/lib/libc++*.so* Build//sysroot/system/lib/libunwind.so* Build//sysroot/system/lib/ld.so* Build//sysroot/system/lib/libfreetype.so* Build//sysroot/system/lib/libpthread.so* Build//sysroot/system/lib/librt.so* Build//sysroot/system/lib/libdl.so* Initrd/ # Only copy crucial libraries cp Build/sysroot/system/bin/lsh Initrd/ # Create a backup of LSh on the ramdisk for FTerm cp Build/packages/lemon-utils/system/bin/* Initrd/ # Create a backup of LemonUtils on the ramdisk for FTerm diff --git a/mlibc b/mlibc index 2a9197e6..f34c4d1f 160000 --- a/mlibc +++ b/mlibc @@ -1 +1 @@ -Subproject commit 2a9197e6e8177dfd9516fefb366b6ed90338894b +Subproject commit f34c4d1ffbc095c10974c859378ddc47f2ea0743