diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2023-07-28 09:33:43 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2023-07-28 09:33:43 +0200 |
| commit | 1e0a8154eb55967f83c3fcec012a2dd6a9a22615 (patch) | |
| tree | d5e69ca0727310141e5264e6fb6db53aaf9f83b6 | |
| parent | 425fba5a9b56a6ba85b789287cbd2c0a1c7d13b9 (diff) | |
| download | i486tcc-linux-1e0a8154eb55967f83c3fcec012a2dd6a9a22615.tar.gz i486tcc-linux-1e0a8154eb55967f83c3fcec012a2dd6a9a22615.tar.bz2 | |
- updated kernel to 6.4.7
- fixed lua 5.1 issue in notion (parts where taking lua 5.1 from the host instead
of from build/stage1)
- forgot to build rdev on the host to patch kernel video mode
| -rw-r--r-- | configs/linux-config | 2 | ||||
| -rw-r--r-- | configs/versions | 2 | ||||
| -rwxr-xr-x | scripts/build.sh | 11 |
3 files changed, 13 insertions, 2 deletions
diff --git a/configs/linux-config b/configs/linux-config index b281529..e1defcb 100644 --- a/configs/linux-config +++ b/configs/linux-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.4.4 Kernel Configuration +# Linux/x86 6.4.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.1 20230714" CONFIG_CC_IS_GCC=y diff --git a/configs/versions b/configs/versions index 0ad6b80..360bd65 100644 --- a/configs/versions +++ b/configs/versions @@ -1,4 +1,4 @@ -LINUX_KERNEL_VERSION="6.4.3" +LINUX_KERNEL_VERSION="6.4.7" TINYCC_VERSION="85b27" MUSL_VERSION="1.2.3" _OKSH_VERSION="7.2" diff --git a/scripts/build.sh b/scripts/build.sh index 2e06545..23901ea 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -492,6 +492,9 @@ if [ ! -f "${BASE}/build/stage1/bin/notion" ]; then XRANDR_LDLIBS="" \ USE_XFT=0 \ LUA_DIR="${BASE}/build/stage1" \ + LUA_INCLUDES="-I${BASE}/build/stage1/include" \ + LUA_LIBS="${BASE}/build/stage1/lib/liblua.a" \ + LUA="${BASE}/build/stage1/bin/lua" \ LUAC="${BASE}/build/stage1/bin/luac" \ PRELOAD_MODULES=1 \ LUA_VERSION=5.1 PREFIX=/ ETCDIR=/etc/notion @@ -505,6 +508,9 @@ if [ ! -f "${BASE}/build/stage1/bin/notion" ]; then XRANDR_LDLIBS="" \ USE_XFT=0 \ LUA_DIR="${BASE}/build/stage1" \ + LUA_INCLUDES="-I${BASE}/build/stage1/include" \ + LUA_LIBS="${BASE}/build/stage1/lib/liblua.a" \ + LUA="${BASE}/build/stage1/bin/lua" \ LUAC="${BASE}/build/stage1/bin/luac" \ PRELOAD_MODULES=1 \ LUA_VERSION=5.1 PREFIX=/ ETCDIR=/etc/notion \ @@ -606,6 +612,11 @@ fi cd ../.. +# tools on the host +if [ ! -x "${BASE}/tools/rdev" ]; then + tcc -o tools/rdev tools/rdev.c +fi + # ramdisk if [ ! -f "${BASE}/ramdisk.img" ]; then |