1.1--- a/containers/Containerfile.box	Sun May 26 19:00:09 2024 +0000
     1.2+++ b/containers/Containerfile.box	Sun May 26 21:11:52 2024 +0000
     1.3@@ -13,11 +13,11 @@
     1.4 RUN hg clone https://vc.compiler.company/comp/core
     1.5 WORKDIR infra
     1.6 RUN mkdir .stash
     1.7-RUN scripts/get-sk.sh
     1.8+RUN sh scripts/get-sk.sh
     1.9 ENV CARGO_HOME="/usr/local/share/cargo"
    1.10 ENV RUSTUP_HOME="/usr/local/share/rustup"
    1.11 # stage1
    1.12-RUN .stash/sk make rustup-install
    1.13+RUN .stash/sk make rustup
    1.14 ENV PATH="$PATH:/usr/local/share/cargo/bin"
    1.15 RUN rustup update
    1.16 # dev rustc components
    1.17@@ -28,14 +28,15 @@
    1.18 # RUN sh scripts/install-sbcl-pack.sh
    1.19 # RUN sh scripts/install-rocksdb-pack.sh
    1.20 # RUN sh scripts/install-cargo-tools.sh
    1.21+RUN .stash/sk make sbcl
    1.22+RUN .stash/sk make quicklisp
    1.23 RUN .stash/sk make sbcl-install
    1.24-RUN .stash/sk make quicklisp-install
    1.25-RUN make tree-sitter-install
    1.26-RUN make tree-sitter-langs-install
    1.27-RUN make emacs-build-mini
    1.28-RUN make emacs-install
    1.29+RUN .stash/sk make tree-sitter
    1.30+RUN .stash/sk make tree-sitter-langs
    1.31+RUN .stash/sk make emacs-mini
    1.32+RUN .stash/sk make emacs-install
    1.33 RUN .stash/sk make rocksdb
    1.34-RUN make rocksdb-install
    1.35+RUN .stash/sk make rocksdb-install
    1.36 #ADD etc/sbclrc /etc/sbclrc
    1.37 #COPY etc/skel/ /etc/skel/
    1.38 #ADD etc/shells /etc/

     2.1--- a/makefile	Sun May 26 19:00:09 2024 +0000
     2.2+++ b/makefile	Sun May 26 21:11:52 2024 +0000
     2.3@@ -41,16 +41,16 @@
     2.4 LINUX_TARGET:=linux-$(LINUX_VERSION)
     2.5 linux:$(LINUX_TARGET) linux-config;
     2.6 $(LINUX_TARGET):scripts/get-linux.sh;
     2.7-	mkdir -pv build/$@
     2.8-	gpg --export autosigner@ torvalds@ gregkh@ > build/$@/keyring.gpg
     2.9-	$< $(LINUX_VERSION) build build/$@/keyring.gpg
    2.10+	mkdir -pv .stash/$@
    2.11+	gpg --export autosigner@ torvalds@ gregkh@ > .stash/$@/keyring.gpg
    2.12+	$< $(LINUX_VERSION) build .stash/$@/keyring.gpg
    2.13 	cd build && unxz $@.tar.xz && tar -xvf $@.tar $(LINUX_TARGET)
    2.14 linux-config:$(LINUX_TARGET);
    2.15-	cd build/$< && make mrproper -j && zcat /proc/config.gz > .config && yes N | make localmodconfig
    2.16-clean-linux::;rm -rf build/$(LINUX_TARGET)
    2.17+	cd .stash/$< && make mrproper -j && zcat /proc/config.gz > .config && yes N | make localmodconfig
    2.18+clean-linux::;rm -rf .stash/$(LINUX_TARGET)
    2.19 
    2.20 ### Emacs
    2.21-EMACS_TARGET:=build/src/emacs
    2.22+EMACS_TARGET:=.stash/src/emacs
    2.23 EMACS_DIST:=$(D)/src/emacs
    2.24 $(EMACS_TARGET):scripts/get-emacs.sh $(B);
    2.25 	$<
    2.26@@ -65,7 +65,7 @@
    2.27 	cd $< && make install
    2.28 
    2.29 ### RocksDB
    2.30-ROCKSDB_TARGET:=build/src/rocksdb
    2.31+ROCKSDB_TARGET:=.stash/src/rocksdb
    2.32 $(ROCKSDB_TARGET):scripts/get-rocksdb.sh $(B)
    2.33 	$<
    2.34 rocksdb:$(ROCKSDB_TARGET)
    2.35@@ -80,7 +80,7 @@
    2.36 	cd $< && make install-shared && cp -r include/* /usr/local/include/
    2.37 
    2.38 ### Nushell
    2.39-NUSHELL_TARGET:=build/src/nushell
    2.40+NUSHELL_TARGET:=.stash/src/nushell
    2.41 $(NUSHELL_TARGET):scripts/get-nushell.sh;$<
    2.42 nushell:$(NUSHELL_TARGET)
    2.43 # build without clipboard to avoid errors at runtime in container env
    2.44@@ -89,7 +89,7 @@
    2.45 nushell-install:$(NUSHELL_TARGET) nushell-build
    2.46 	cd $< && ./scripts/install-all.sh
    2.47 ### SBCL
    2.48-SBCL_TARGET:=build/src/sbcl
    2.49+SBCL_TARGET:=.stash/src/sbcl
    2.50 SBCL_VERSION:=2.4.5
    2.51 $(SBCL_TARGET):scripts/get-sbcl.sh $(B)
    2.52 	$<
    2.53@@ -117,10 +117,10 @@
    2.54 sbcl-install:sbcl-build;cd $(SBCL_TARGET) && INSTALL_ROOT=/usr/local sh install.sh
    2.55 clean-sbcl:$(SBCL_TARGET);cd $(SBCL_TARGET) && ./clean.sh
    2.56 
    2.57-build/quicklisp.lisp:$(B);cd $< && curl -O https://beta.quicklisp.org/quicklisp.lisp
    2.58-quicklisp-install:scripts/quicklisp-install.sh build/quicklisp.lisp;$<
    2.59+.stash/quicklisp.lisp:$(B);cd $< && curl -O https://beta.quicklisp.org/quicklisp.lisp
    2.60+quicklisp-install:scripts/quicklisp-install.sh .stash/quicklisp.lisp;$<
    2.61 
    2.62-STUMPWM_TARGET:=build/src/stumpwm
    2.63+STUMPWM_TARGET:=.stash/src/stumpwm
    2.64 $(STUMPWM_TARGET):scripts/get-stumpwm.sh $(B);$<
    2.65 stumpwm:$(STUMPWM_TARGET);
    2.66 stumpwm-build:stumpwm;
    2.67@@ -128,7 +128,7 @@
    2.68 stumpwm-install:stumpwm-build;
    2.69 	cd $(STUMPWM_TARGET) && make install
    2.70 ### Rust
    2.71-RUST_TARGET:=build/src/rust
    2.72+RUST_TARGET:=.stash/src/rust
    2.73 $(RUST_TARGET):scripts/get-rust.sh $(B);$<
    2.74 rust:$(RUST_TARGET)
    2.75 rust-install-x:rust;
    2.76@@ -145,7 +145,7 @@
    2.77 cargo-tools-install:scripts/install-cargo-tools.sh
    2.78 	$<
    2.79 ### Tree-sitter
    2.80-TREE_SITTER_TARGET:=build/src/tree-sitter
    2.81+TREE_SITTER_TARGET:=.stash/src/tree-sitter
    2.82 $(TREE_SITTER_TARGET):scripts/get-tree-sitter.sh
    2.83 	$<
    2.84 tree-sitter:$(TREE_SITTER_TARGET)
    2.85@@ -153,17 +153,17 @@
    2.86 tree-sitter-install:$(TREE_SITTER_TARGET) tree-sitter-build
    2.87 
    2.88 ### Tree-sitter Langs
    2.89-TREE_SITTER_LANGS_TARGET:=build/src/tree-sitter-langs
    2.90+TREE_SITTER_LANGS_TARGET:=.stash/src/tree-sitter-langs
    2.91 tree-sitter-langs-install:scripts/tree-sitter-install-langs.sh
    2.92 	$<
    2.93 ### Etc
    2.94-ETC_TARGET:=build/etc
    2.95+ETC_TARGET:=.stash/etc
    2.96 $(ETC_TARGET):scripts/get-etc.sh
    2.97 	$<
    2.98 etc:$(ETC_TARGET)
    2.99 
   2.100 ### Code
   2.101-CODE_TARGET:=build/src/$(SRC)
   2.102+CODE_TARGET:=.stash/src/$(SRC)
   2.103 $(CODE_TARGET):scripts/get-code.sh $(B)
   2.104 	$< $(SRC)
   2.105 code:$(CODE_TARGET)
   2.106@@ -182,7 +182,7 @@
   2.107 dist/linux:linux $(D);
   2.108 
   2.109 dist/rocksdb:$(D) rocksdb;
   2.110-	cd build/src && \
   2.111+	cd .stash/src && \
   2.112 	tar -I 'zstd' -cf ../../$</rocksdb.tar.zst rocksdb/include/* rocksdb/librocksdb.*
   2.113 
   2.114 CORE_SRC?=/usr/local/src/core

     3.1--- a/skelfile	Sun May 26 19:00:09 2024 +0000
     3.2+++ b/skelfile	Sun May 26 21:11:52 2024 +0000
     3.3@@ -21,7 +21,7 @@
     3.4  (emacs (src) #$./scripts/get-emacs.sh$#
     3.5         #$cd .stash/src/emacs && ./autogen.sh$#
     3.6         #$./scripts/build-emacs.sh$#)
     3.7- (emacs-mini (src)
     3.8+ (emacs-mini (src) #$./scripts/get-emacs.sh$#
     3.9              #$cd .stash/src/emacs && ./autogen.sh$#
    3.10              #$./scripts/build-emacs-mini.sh$#)
    3.11  (rocksdb (src) #$scripts/get-rocksdb.sh$#
    3.12@@ -39,6 +39,7 @@
    3.13  (stumpwm (src) #$./scripts/get-stumpwm.sh$#
    3.14           #$cd .stash/src/stumpwm && ./autogen.sh && ./configure && make$#)
    3.15  (tree-sitter (src) #$./scripts/get-tree-sitter.sh$#)
    3.16+ (tree-sitter-langs (src) #$./scripts/tree-sitter-install-langs.sh$#)
    3.17  (linux () #$mkdir -pv .stash/src/linux$#
    3.18         #$gpg --export autosigner@ torvalds@ gregkh@ > .stash/src/linux/keyring.gpg$#
    3.19         #$./scripts/get-linux.sh $(uname -r | cut -d- -f1) .stash .stash/src/linux/keyring.gpg$#
    3.20@@ -48,4 +49,9 @@
    3.21         zcat /proc/config.gz > .config && yes N | make localmodconfig$#)
    3.22  (clean () #$rm -rvf .stash$#)
    3.23  (rust () #$scripts/get-rust.sh$#)
    3.24- (rustup () #$curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y$#))
    3.25+ (rustup () #$curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y$#)
    3.26+ (sbcl-install () #$cd .stash/src/sbcl && INSTALL_ROOT=/usr/local sh install.sh$#)
    3.27+ (emacs-install () #$cd .stash/src/emacs && make install)
    3.28+ (rocksdb-install () #$cd .stash/src/rocksdb && make install-shared &&
    3.29+                  cp -r include/* /usr/local/include/$#)
    3.30+ (stumpwm-install () #$cd .stash/src/stumpwm && make install))