# HG changeset patch # User ellis # Date 1703998989 18000 # Node ID 21e3a05f8c27b7322ebd3b4bd798e98109a41129 # Parent 1fa1b579bb0987c56c0cd4ec4b233fbac04e6070 > diff -r 1fa1b579bb09 -r 21e3a05f8c27 makefile --- a/makefile Sat Dec 30 23:55:53 2023 -0500 +++ b/makefile Sun Dec 31 00:03:09 2023 -0500 @@ -101,7 +101,7 @@ ### Tree-sitter Langs TS_LANGS_TARGET:=build/src/ts-langs -ts-langs-install:scripts/ts-install-langs.sh # this requires sudo for now +ts-langs-install:scripts/ts-install-langs.sh $< ### Comp COMP_TARGET:=build/src/$(SRC) @@ -151,7 +151,7 @@ dist/rocksdb:rocksdb $(D); mkdir -pv $@ cp -rf $(ROCKSDB_TARGET)/include/* $@ - cp -f $(ROCKSDB_TARGET)/librocksdb.{so,dylib}* $@ + cp -f $(ROCKSDB_TARGET)/librocksdb.* $@ dist/rust:rust-build $(D); cd $(RUST_TARGET) && x dist diff -r 1fa1b579bb09 -r 21e3a05f8c27 virt/build-alpine-base.sh --- a/virt/build-alpine-base.sh Sat Dec 30 23:55:53 2023 -0500 +++ b/virt/build-alpine-base.sh Sun Dec 31 00:03:09 2023 -0500 @@ -1,6 +1,6 @@ #!/usr/bin/env bash id=$(buildah from --pull alpine:latest) -buildah run --net host $id apk add --no-cache gnupg openssh mercurial wireguard-tools +buildah run --net host $id apk add --no-cache openssh mercurial wireguard-tools buildah config --annotation alpine $id buildah config --author='Richard Westhaver' $id buildah commit $id alpine-base diff -r 1fa1b579bb09 -r 21e3a05f8c27 virt/build-demo.sh --- a/virt/build-demo.sh Sat Dec 30 23:55:53 2023 -0500 +++ b/virt/build-demo.sh Sun Dec 31 00:03:09 2023 -0500 @@ -1,12 +1,8 @@ #!/usr/bin/env bash id=$(buildah from alpine-base) +buildah copy $id etc/skel /etc/skel +buildah run $id adduser demo -D buildah config --workingdir /home/demo $id buildah config -l=demo $id -buildah run $id adduser demo -buildah copy $id dist/sbcl /home/demo/sbcl -buildah copy $id dist/fasl/ /home/demo/fasl -buildah copy $id dist/rocksdb/librocksdb.so /usr/local/lib/ -# buildah copy $id dist/tree-sitter/grammar/* /usr/local/share/tree-sitter/ -# cleanup # buildah config --entrypoint buildah commit $id demo