diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2023-07-25 18:59:12 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2023-07-25 18:59:12 +0200 |
| commit | b9e65f600b32af0d5bae95fd71d49dd34bf6e405 (patch) | |
| tree | ad5e6770a4a9db6d7dbfcf5c9d36465398b322c5 /scripts | |
| parent | 23db3d0b1788edf01e9060f77d009a3a671b62c5 (diff) | |
| download | i486tcc-linux-b9e65f600b32af0d5bae95fd71d49dd34bf6e405.tar.gz i486tcc-linux-b9e65f600b32af0d5bae95fd71d49dd34bf6e405.tar.bz2 | |
got notion building statically and preloaded modules, issues with precompiled lua code
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build.sh | 9 | ||||
| -rwxr-xr-x | scripts/create_root.sh | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index a6e700c..8a26754 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -482,13 +482,18 @@ if [ ! -f "${BASE}/build/stage1/bin/notion" ]; then tar xf "${BASE}/downloads/notion-${NOTION_VERSION}.tar.gz" cd "notion-${NOTION_VERSION}" patch -Np1 < "${BASE}/patches/notion-minimal.patch" -# sed -i "s|@@BASE@@|${BASE}|g" mod_tiling/ + sed -i "s|@@BASE@@|${BASE}|g" \ + mod_sm/Makefile notion/Makefile CC="${BASE}/build/stage1/bin/i386-tcc" \ + LDFLAGS="-static" \ make INCLUDE="-I${BASE}/src/stage1/notion-${NOTION_VERSION}" \ X11_INCLUDES="-I${BASE}/build/stage1/include" \ - X11_LIBS="-W,-static -L${BASE}/build/stage1/lib -lX11 -lXext -lX11 -W,-dynamic" \ + X11_LIBS="${BASE}/build/stage1/lib/libX11.a ${BASE}/build/stage1/lib/libXext.a ${BASE}/build/stage1/lib/libSM.a ${BASE}/build/stage1/lib/libICE.a ${BASE}/build/stage1/lib/libX11.a" \ USE_XFT=0 \ + PRELOAD_MODULES=1 \ LUA_VERSION=5.1 PREFIX=/ ETCDIR=/etc/notion + #make -j$CPUS DESTDIR="${BASE}/build/stage1" PREFIX=/ -j$CPUS install + cp "${BASE}/src/stage1/notion-435631f/notion/notion" "${BASE}/build/stage1/bin" cd .. else echo "stage1 notion exists" diff --git a/scripts/create_root.sh b/scripts/create_root.sh index fc30df0..f6cb8a8 100755 --- a/scripts/create_root.sh +++ b/scripts/create_root.sh @@ -26,7 +26,7 @@ test -f /dev/loop0 && losetup -d /dev/loop0 test -d "${ROOT}" && rmdir "${ROOT}" test -f root.img && rm -f root.img -dd if=/dev/zero of=root.img bs=512 count=128520 +dd if=/dev/zero of=root.img bs=512 count=257040 chmod 666 root.img losetup /dev/loop0 root.img mke2fs /dev/loop0 |