From 4b88b5a6f056265ffae87c69414aaf82473bbd7c Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 11 Jan 2021 17:47:13 +1100 Subject: [PATCH] Do a bit of renaming so things are versioned --- .gitmodules | 5 ++++- rootfs.sh | 17 ++++++----------- sysa/after.kaem.run | 6 ++---- sysa/sed-1.18 | 1 + sysa/{sed.kaem => sed-1.18.kaem} | 0 sysa/{tcc-0.9.26p1 => tcc-0.9.26} | 0 sysa/tcc.kaem | 13 +++++++------ 7 files changed, 20 insertions(+), 22 deletions(-) create mode 160000 sysa/sed-1.18 rename sysa/{sed.kaem => sed-1.18.kaem} (100%) rename sysa/{tcc-0.9.26p1 => tcc-0.9.26} (100%) diff --git a/.gitmodules b/.gitmodules index f69523f..dcb71ab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,7 +14,7 @@ path = sysa/nyacc url = https://git.savannah.gnu.org/git/nyacc.git [submodule "sysa/tcc-0.9.26p1"] - path = sysa/tcc-0.9.26p1 + path = sysa/tcc-0.9.26 url = https://gitlab.com/janneke/tinycc [submodule "sysa/mescc-tools-patched"] path = sysa/mescc-tools-patched @@ -22,3 +22,6 @@ [submodule "sysa/tcc-0.9.27"] path = sysa/tcc-0.9.27 url = git://repo.or.cz/tinycc.git +[submodule "sysa/sed-1.18"] + path = sysa/sed-1.18 + url = git://git.savannah.gnu.org/sed/sed-history.git diff --git a/rootfs.sh b/rootfs.sh index 3681d04..09007c8 100755 --- a/rootfs.sh +++ b/rootfs.sh @@ -62,11 +62,11 @@ mkdir tmp/after/mes/{bin,m2} # tcc cp tcc.kaem tmp/after/ -cp -r tcc-0.9.26p1 tmp/after/ +cp -r tcc-0.9.26 tmp/after/ cp -r tcc-0.9.27 tmp/after/ touch tmp/after/tcc-0.9.27/config.h -touch tmp/after/tcc-0.9.26p1/config.h -pushd tmp/after/tcc-0.9.26p1 +touch tmp/after/tcc-0.9.26/config.h +pushd tmp/after/tcc-0.9.26 ln -s ../mes/module . ln -s ../mes/mes . ln -s /after/lib x86-mes @@ -75,13 +75,9 @@ popd mkdir -p ../sources -# sed -url=ftp://ftp.gnu.org/gnu/sed/sed-1.18.tar.gz -pushd ../sources -wget --continue "$url" -popd -cp sed.kaem tmp/after -tar -C tmp/after -xf ../sources/$(basename $url) +# sed 1.18 +cp sed-1.18.kaem tmp/after +cp -r sed-1.18 tmp/after # General cleanup find tmp -name .git -exec rm -rf \; @@ -101,4 +97,3 @@ cd ../.. # Cleanup sudo umount sysa/tmp - diff --git a/sysa/after.kaem.run b/sysa/after.kaem.run index a53a179..9c80b03 100755 --- a/sysa/after.kaem.run +++ b/sysa/after.kaem.run @@ -46,11 +46,9 @@ cd .. kaem --file mes.kaem # Part 6: tcc -cd tcc-0.9.26p1 -kaem --file ../tcc.kaem -cd .. +kaem --file tcc.kaem # Part 7: sed cd sed-1.18 -kaem --file ../sed.kaem +kaem --file ../sed-1.18.kaem cd .. diff --git a/sysa/sed-1.18 b/sysa/sed-1.18 new file mode 160000 index 0000000..cff4df5 --- /dev/null +++ b/sysa/sed-1.18 @@ -0,0 +1 @@ +Subproject commit cff4df55786bae5f4f0c042a13d30cd1a962040c diff --git a/sysa/sed.kaem b/sysa/sed-1.18.kaem similarity index 100% rename from sysa/sed.kaem rename to sysa/sed-1.18.kaem diff --git a/sysa/tcc-0.9.26p1 b/sysa/tcc-0.9.26 similarity index 100% rename from sysa/tcc-0.9.26p1 rename to sysa/tcc-0.9.26 diff --git a/sysa/tcc.kaem b/sysa/tcc.kaem index 4207479..0e1dca4 100755 --- a/sysa/tcc.kaem +++ b/sysa/tcc.kaem @@ -15,6 +15,7 @@ MES_SOURCE=${MES_PREFIX} MES=/after/bin/mes # Initial tcc +cd tcc-0.9.26 ${MES} --no-auto-compile -e main /after/bin/mescc.scm -- \ -S \ -o tcc.s \ @@ -81,7 +82,7 @@ mes-tcc -ar cr ${libdir}/tcc/libtcc1.a libtcc1.o mes-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 lib/posix/getopt.c mes-tcc -ar cr ${libdir}/libgetopt.a getopt.o -cd ../tcc-0.9.26p1 +cd ../tcc-0.9.26 # boot0 (ref comments here for all boot*) # compile @@ -127,7 +128,7 @@ boot0-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc- boot0-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-3.o unified-libc-3.c boot0-tcc -ar cr ${libdir}/libc+gnu.a unified-libc-1.o unified-libc-2.o unified-libc-3.o cp ${libdir}/libc+gnu.a ${libdir}/libc.a -cd ../tcc-0.9.26p1 +cd ../tcc-0.9.26 # Test boot0 boot0-tcc -version @@ -173,7 +174,7 @@ boot1-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc- boot1-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-3.o unified-libc-3.c boot1-tcc -ar cr ${libdir}/libc+gnu.a unified-libc-1.o unified-libc-2.o unified-libc-3.o cp ${libdir}/libc+gnu.a ${libdir}/libc.a -cd ../tcc-0.9.26p1 +cd ../tcc-0.9.26 # Test boot1 boot1-tcc -version @@ -220,7 +221,7 @@ boot2-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc- boot2-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-3.o unified-libc-3.c boot2-tcc -ar cr ${libdir}/libc+gnu.a unified-libc-1.o unified-libc-2.o unified-libc-3.o cp ${libdir}/libc+gnu.a ${libdir}/libc.a -cd ../tcc-0.9.26p1 +cd ../tcc-0.9.26 # Test boot2 boot2-tcc -version @@ -267,7 +268,7 @@ boot3-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc- boot3-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-3.o unified-libc-3.c boot3-tcc -ar cr ${libdir}/libc+gnu.a unified-libc-1.o unified-libc-2.o unified-libc-3.o cp ${libdir}/libc+gnu.a ${libdir}/libc.a -cd ../tcc-0.9.26p1 +cd ../tcc-0.9.26 # Test boot3 boot3-tcc -version @@ -314,7 +315,7 @@ boot4-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc- boot4-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-3.o unified-libc-3.c boot4-tcc -ar cr ${libdir}/libc+gnu.a unified-libc-1.o unified-libc-2.o unified-libc-3.o cp ${libdir}/libc+gnu.a ${libdir}/libc.a -cd ../tcc-0.9.26p1 +cd ../tcc-0.9.26 # Test boot4 boot4-tcc -version