From 56051d2324fc0cff47a9697d7d616d8403d75299 Mon Sep 17 00:00:00 2001 From: aheirman <48590738+aheirman@users.noreply.github.com> Date: Sat, 6 Feb 2021 13:46:14 +0100 Subject: [PATCH] Rename to iglunix from lazybox --- .gitignore | 3 +++ chroot_fetch | 8 +++--- chroot_lazy => chroot_iglunix | 0 chroot_prepare_lazy => chroot_prepare_iglunix | 16 ++++++------ docker_init_clean | 18 ++++++------- docker_start_farm | 4 +-- dont_use_here/compile | 10 +++---- dont_use_here/inside_chroot | 26 +++++++++---------- 8 files changed, 44 insertions(+), 41 deletions(-) rename chroot_lazy => chroot_iglunix (100%) rename chroot_prepare_lazy => chroot_prepare_iglunix (86%) diff --git a/.gitignore b/.gitignore index 445177a..39cf873 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ root/ build/ docker_move_tar_load docker_delete_abyss +token + + diff --git a/chroot_fetch b/chroot_fetch index 4da698a..4f44475 100755 --- a/chroot_fetch +++ b/chroot_fetch @@ -14,8 +14,8 @@ root=$(pwd)/root/ for pkg in ${packages[@]};do echo "$pkg" - source ${root}/lazybox/pkgs/${pkg}/build.sh - cd ${root}/lazybox/pkgs/${pkg}/ + source ${root}/iglunix/pkgs/${pkg}/build.sh + cd ${root}/iglunix/pkgs/${pkg}/ #Only needed if you want to clean #sudo rm -rf src if test -d "src"; then @@ -38,10 +38,10 @@ done echo "------------------" echo "Temporary packages" echo "------------------" -mkdir ${root}/lazybox/tmp_pkgs/ +mkdir ${root}/iglunix/tmp_pkgs/ #echo "ibara baseutils" -#cd ${root}/lazybox/tmp_pkgs/ +#cd ${root}/iglunix/tmp_pkgs/ #git clone https://github.com/ibara/baseutils.git echo "------------------------------------" diff --git a/chroot_lazy b/chroot_iglunix similarity index 100% rename from chroot_lazy rename to chroot_iglunix diff --git a/chroot_prepare_lazy b/chroot_prepare_iglunix similarity index 86% rename from chroot_prepare_lazy rename to chroot_prepare_iglunix index 24823f3..941dea8 100755 --- a/chroot_prepare_lazy +++ b/chroot_prepare_iglunix @@ -22,7 +22,7 @@ if true; then sudo rm -rf ./root/bin sudo rm -rf ./root/sbin sudo rm -rf ./root/usr - sudo rm -rf ./root/lazybox + sudo rm -rf ./root/iglunix sudo rm -rf ./root/etc fi @@ -33,10 +33,10 @@ mkdir root/usr mkdir root/usr/sbin mkdir root/etc -docker cp $1:/lazybox/pkgs/llvm/out/llvm.11.0.1.tar.xz ./root/llvm.tar.xz -docker cp $1:/lazybox/pkgs/musl/out/musl-dev.1.2.2.tar.xz ./root/musl-dev.tar.xz -docker cp $1:/lazybox/pkgs/musl/out/musl.1.2.2.tar.xz ./root/musl.tar.xz -docker cp $1:/lazybox/pkgs/bmake/out/bmake.20210110.tar.xz ./root/bmake.tar.xz +docker cp $1:/iglunix/pkgs/llvm/out/llvm.11.0.1.tar.xz ./root/llvm.tar.xz +docker cp $1:/iglunix/pkgs/musl/out/musl-dev.1.2.2.tar.xz ./root/musl-dev.tar.xz +docker cp $1:/iglunix/pkgs/musl/out/musl.1.2.2.tar.xz ./root/musl.tar.xz +docker cp $1:/iglunix/pkgs/bmake/out/bmake.20210110.tar.xz ./root/bmake.tar.xz cd ./root ROOT=$(pwd) @@ -58,7 +58,7 @@ mv toybox-x86_64 ./bin/toybox echo "" #--- -git clone https://github.com/Ella-0/lazybox.git +git clone https://github.com/iglunix/iglunix.git #---- @@ -87,7 +87,7 @@ echo "Starting chroot_fetch" echo "Need to compile a lex file in om4, because of a circular dependency with flex" #For the other attempt at fixing this circular dependency see inside_chroot -cd ${ROOT}/lazybox/pkgs/om4/src/om4-*/ +cd ${ROOT}/iglunix/pkgs/om4/src/om4-*/ lex ./tokenizer.l sudo chroot ${ROOT} /bin/busybox --install -s @@ -102,7 +102,7 @@ echo "Starting networking configuration" echo "---------------------------------" RANDOM=$$ -HOSTNAME="lazybox-$RANDOM" +HOSTNAME="iglunix-$RANDOM" echo "Hostname: ${HOSTNAME}" mkdir ${ROOT}/etc echo "$HOSTNAME" > ${ROOT}/etc/hostname diff --git a/docker_init_clean b/docker_init_clean index 52cf41c..fb7d0ed 100755 --- a/docker_init_clean +++ b/docker_init_clean @@ -3,9 +3,9 @@ #Stop & remove all the old docker service rm my_compile_farm || true -docker image rm local:lazy_abyss || true +docker image rm local:iglunix_abyss || true rm image_name || true -rm lazy_abyss.tar || true +rm iglunix_abyss.tar || true echo "Cleaned and ready for the first/next attempt!" #Create new modified container @@ -22,14 +22,14 @@ if false then docker run -d -p 5000:5000 --name my_registry registry:2 echo "Created my_registry" - docker commit updated_abyss localhost:5000/lazy_abyss - echo "Created localhost:5000:lazy_abyss" - docker push localhost:5000/lazy_abyss - echo "pushed localhost:5000:lazy_abyss" + docker commit updated_abyss localhost:5000/iglunix_abyss + echo "Created localhost:5000:iglunix_abyss" + docker push localhost:5000/iglunix_abyss + echo "pushed localhost:5000:iglunix_abyss" else - docker commit updated_abyss local:lazy_abyss - docker save -o ./lazy_abyss.tar local:lazy_abyss - echo "Move this tar to all nodes, then \"docker load -i lazy_abyss.tar\"" + docker commit updated_abyss local:iglunix_abyss + docker save -o ./iglunix_abyss.tar local:iglunix_abyss + echo "Move this tar to all nodes, then \"docker load -i iglunix_abyss.tar\"" fi diff --git a/docker_start_farm b/docker_start_farm index d11ca31..90fc8ee 100755 --- a/docker_start_farm +++ b/docker_start_farm @@ -6,12 +6,12 @@ For use with a dcoker registry docker service create --name my_compile_farm \ --network my_docker_overlay_net \ --replicas 2\ - localhost:5000/lazy_abyss /bootup_script + localhost:5000/iglunix_abyss /bootup_script else docker service create --name my_compile_farm \ --network my_docker_overlay_net \ --replicas 2\ - local:lazy_abyss /bootup_script + local:iglunix_abyss /bootup_script fi diff --git a/dont_use_here/compile b/dont_use_here/compile index 52063be..a58ad26 100755 --- a/dont_use_here/compile +++ b/dont_use_here/compile @@ -4,7 +4,7 @@ export PATH="/usr/lib/distcc/bin:$PATH" export DISTCC_HOSTS="localhost 10.0.1.57/10" export DISTCC_CMDLIST="/distccd_cmd_list" -git clone https://github.com/Ella-0/lazybox.git +git clone https://github.com/iglunix/iglunix.git #--- @@ -20,14 +20,14 @@ rm /bin/ln #--- -cd lazybox/pkgs/llvm -../../lazypkg.sh +cd iglunix/pkgs/llvm +../../iglupkg.sh cd ../musl -../../lazypkg.sh +../../iglupkg.sh cd ../mksh -../../lazypkg.sh +../../iglupkg.sh diff --git a/dont_use_here/inside_chroot b/dont_use_here/inside_chroot index 68f02eb..92760f1 100755 --- a/dont_use_here/inside_chroot +++ b/dont_use_here/inside_chroot @@ -8,8 +8,8 @@ compile_packages (){ for pkg in $n_packages; do echo "Going to build: $pkg" - cd /lazybox/pkgs/${pkg}/ - ../../lazypkg.sh + cd /iglunix/pkgs/${pkg}/ + ../../iglupkg.sh tar -xf out/${pkg}.*.tar.xz -C / tar -xf out/${pkg}-dev.*.tar.xz -C / 2> /dev/null tar -xf out/${pkg}-doc.*.tar.xz -C / 2> /dev/null @@ -44,7 +44,7 @@ echo "root:x:0:root" > /etc/group # Stage 1 #--------- #Apply the only headers patch for linux, we can't build it yet... -patch /lazybox/pkgs/linux/build.sh /linux_header_only_patch +patch /iglunix/pkgs/linux/build.sh /linux_header_only_patch #Stub lex printf "#!/bin/sh\necho lex go brr\n" > /usr/bin/lex chmod +x /usr/bin/lex @@ -64,13 +64,13 @@ compile_packages #Samurai -cd /lazybox/pkgs/samurai +cd /iglunix/pkgs/samurai cd src/samurai-*/ clang *.c -o samu -cp /lazybox/pkgs/samurai/out/samurai/bin/samu /usr/bin -cd /lazybox/pkgs/samurai +cp /iglunix/pkgs/samurai/out/samurai/bin/samu /usr/bin +cd /iglunix/pkgs/samurai -../../lazypkg.sh +../../iglupkg.sh rm /usr/bin/samu tar -xf out/samurai.*.tar.xz -C / @@ -85,12 +85,12 @@ compile_packages #--------- # Libre ssl, a slight problem # lible ssl needs cmake, but cmake needs libre ssl. :( -cd /lazybox/pkgs/libressl +cd /iglunix/pkgs/libressl cd src/libressl-*/ ./configure --prefix=/usr && make -j12 && make install cd ../.. -cd /lazybox/pkgs/cmake +cd /iglunix/pkgs/cmake cd src/cmake-*/ ./bootstrap \ --prefix=/usr \ @@ -106,8 +106,8 @@ cd ../.. #NOTE: we recompile mksh, because now we have curl and it can download the man page! #We remove the linux headers only patch -patch -R /lazybox/pkgs/linux/build.sh /linux_header_only_patch -packages="cmake libressl busybox toybox libffi python ca-certificates curl zlib expat kati gettext-tiny git netbsd-curses kakoune mksh linux lazybox llvm musl tiny-linux-bootloader" +patch -R /iglunix/pkgs/linux/build.sh /linux_header_only_patch +packages="cmake libressl busybox toybox libffi python ca-certificates curl zlib expat kati gettext-tiny git netbsd-curses kakoune mksh linux iglunix llvm musl tiny-linux-bootloader" compile_packages echo "finished" @@ -127,13 +127,13 @@ exit # om4 and flex have a circular dependency # NOTE: THIS DOES NOT WORK # The lex file in om4 is compiled on the host :( -# Solution: see prepare_chroot_lazy +# Solution: see prepare_chroot_iglunix # PLAN: # build https://github.com/ibara/baseutils lex # build om4 # b uild flex # rm baseutils lex -cd /lazybox/tmp_pkgs/baseutils +cd /iglunix/tmp_pkgs/baseutils make -C libopenbsd make -C lex cp lex /usr/bin