andrius
/
live-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do a bit of renaming so things are versioned

This commit is contained in:
fosslinux 2021-01-11 17:47:13 +11:00
parent 039b8ad658
commit 4b88b5a6f0
7 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitmodules vendored
View File

@ -14,7 +14,7 @@
path = sysa/nyacc path = sysa/nyacc
url = https://git.savannah.gnu.org/git/nyacc.git url = https://git.savannah.gnu.org/git/nyacc.git
[submodule "sysa/tcc-0.9.26p1"] [submodule "sysa/tcc-0.9.26p1"]
path = sysa/tcc-0.9.26p1 path = sysa/tcc-0.9.26
url = https://gitlab.com/janneke/tinycc url = https://gitlab.com/janneke/tinycc
[submodule "sysa/mescc-tools-patched"] [submodule "sysa/mescc-tools-patched"]
path = sysa/mescc-tools-patched path = sysa/mescc-tools-patched
@ -22,3 +22,6 @@
[submodule "sysa/tcc-0.9.27"] [submodule "sysa/tcc-0.9.27"]
path = sysa/tcc-0.9.27 path = sysa/tcc-0.9.27
url = git://repo.or.cz/tinycc.git 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

17
rootfs.sh
View File

@ -62,11 +62,11 @@ mkdir tmp/after/mes/{bin,m2}
# tcc # tcc
cp tcc.kaem tmp/after/ 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/ cp -r tcc-0.9.27 tmp/after/
touch tmp/after/tcc-0.9.27/config.h touch tmp/after/tcc-0.9.27/config.h
touch tmp/after/tcc-0.9.26p1/config.h touch tmp/after/tcc-0.9.26/config.h
pushd tmp/after/tcc-0.9.26p1 pushd tmp/after/tcc-0.9.26
ln -s ../mes/module . ln -s ../mes/module .
ln -s ../mes/mes . ln -s ../mes/mes .
ln -s /after/lib x86-mes ln -s /after/lib x86-mes
@ -75,13 +75,9 @@ popd
mkdir -p ../sources mkdir -p ../sources
# sed # sed 1.18
url=ftp://ftp.gnu.org/gnu/sed/sed-1.18.tar.gz cp sed-1.18.kaem tmp/after
pushd ../sources cp -r sed-1.18 tmp/after
wget --continue "$url"
popd
cp sed.kaem tmp/after
tar -C tmp/after -xf ../sources/$(basename $url)
# General cleanup # General cleanup
find tmp -name .git -exec rm -rf \; find tmp -name .git -exec rm -rf \;
@ -101,4 +97,3 @@ cd ../..
# Cleanup # Cleanup
sudo umount sysa/tmp sudo umount sysa/tmp

6
sysa/after.kaem.run
View File

@ -46,11 +46,9 @@ cd ..
kaem --file mes.kaem kaem --file mes.kaem
# Part 6: tcc # Part 6: tcc
cd tcc-0.9.26p1 kaem --file tcc.kaem
kaem --file ../tcc.kaem
cd ..
# Part 7: sed # Part 7: sed
cd sed-1.18 cd sed-1.18
kaem --file ../sed.kaem kaem --file ../sed-1.18.kaem
cd .. cd ..

1
sysa/sed-1.18 Submodule

@ -0,0 +1 @@
Subproject commit cff4df55786bae5f4f0c042a13d30cd1a962040c

0
sysa/sed.kaem → sysa/sed-1.18.kaem
View File

0
sysa/tcc-0.9.26p1 → sysa/tcc-0.9.26
View File

13
sysa/tcc.kaem
View File

@ -15,6 +15,7 @@ MES_SOURCE=${MES_PREFIX}
MES=/after/bin/mes MES=/after/bin/mes
# Initial tcc # Initial tcc
cd tcc-0.9.26
${MES} --no-auto-compile -e main /after/bin/mescc.scm -- \ ${MES} --no-auto-compile -e main /after/bin/mescc.scm -- \
-S \ -S \
-o tcc.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 -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 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*) # boot0 (ref comments here for all boot*)
# compile # 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 -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 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 cp ${libdir}/libc+gnu.a ${libdir}/libc.a
cd ../tcc-0.9.26p1 cd ../tcc-0.9.26
# Test boot0 # Test boot0
boot0-tcc -version 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 -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 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 cp ${libdir}/libc+gnu.a ${libdir}/libc.a
cd ../tcc-0.9.26p1 cd ../tcc-0.9.26
# Test boot1 # Test boot1
boot1-tcc -version 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 -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 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 cp ${libdir}/libc+gnu.a ${libdir}/libc.a
cd ../tcc-0.9.26p1 cd ../tcc-0.9.26
# Test boot2 # Test boot2
boot2-tcc -version 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 -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 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 cp ${libdir}/libc+gnu.a ${libdir}/libc.a
cd ../tcc-0.9.26p1 cd ../tcc-0.9.26
# Test boot3 # Test boot3
boot3-tcc -version 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 -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 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 cp ${libdir}/libc+gnu.a ${libdir}/libc.a
cd ../tcc-0.9.26p1 cd ../tcc-0.9.26
# Test boot4 # Test boot4
boot4-tcc -version boot4-tcc -version