commit 911405b6d1b32bd9c809905a5d98b16b008fc848
parent 9b22e5dee1c5386414bc7760c5935c623fd851a0
Author: ccx <ccx@te2000.cz>
Date: Tue, 27 Feb 2024 00:34:18 +0000
ZSH configuration
Diffstat:
17 files changed, 95 insertions(+), 45 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -77,3 +77,6 @@
[submodule "sources/patchelf"]
path = sources/patchelf
url = https://github.com/NixOS/patchelf
+[submodule "sources/zsh_config"]
+ path = sources/zsh_config
+ url = ./sources/zsh_config
diff --git a/packages/aat b/packages/aat
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
-#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
-#+pthbs-banginstall.0c36ee9e849ec904e79d6e494a50da7aee79326ead075106431aebddd9a7f5ef
+#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89
+#+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a
#@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
: ${JOBS:=1}
diff --git a/packages/confz b/packages/confz
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
-#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
-#+pthbs-banginstall.0c36ee9e849ec904e79d6e494a50da7aee79326ead075106431aebddd9a7f5ef
+#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89
+#+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a
#@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz
: ${JOBS:=1}
diff --git a/packages/containers b/packages/containers
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
-#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
-#+pthbs-banginstall.0c36ee9e849ec904e79d6e494a50da7aee79326ead075106431aebddd9a7f5ef
+#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89
+#+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a
#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403
#@git:e1e16c08f53d80d08f0ce9e405115fd650270e6b:containers
diff --git a/packages/core-system-conf b/packages/core-system-conf
@@ -2,8 +2,8 @@
#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
#+diffutils.150138a6d189b794fc15df8b9fecb23cc66b970dbc7f83ccd3c099a4397f9ebd
#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
-#+aat.83aa17b8710a0aec5f2197195ade9b26f66e0b6a68f1498e4f0fec0acc982827
-#+fileset.d559f3bf6cc7a7f798a1af9f61a32688b8ae33b25e960639834255285575fa73
+#+aat.3755b6e4a470de8a2a513edc2acc19850cf61686fc29eee5b2b19eb017537055
+#+fileset.7f6a6b2ec33161bfccb65a4bc5da89ba5554e90267cd88c836b37aa9ee8a3815
#@git:68c2ffd5f266f0c27e3d0b9038872088235659f5:core-system-conf
: ${JOBS:=1}
diff --git a/packages/core-system-init b/packages/core-system-init
@@ -5,9 +5,9 @@
#+s6-portable-utils.9ea66f89d317d6a7cac3f951d7ee459ba5c3c47df2e89093a1463732a19e907f
#+s6-linux-init.4b18086bfddc7f6aeebb0f97e68029819cd495ec5a2abd7c1524c045c2adc576
#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403
-#+core-system-rc.392e6f19f9592ee8cdc25c42026deb51acf9778563c5951c0f3d13f8254931f7
+#+core-system-rc.234a637acbc3636c8bc014f4c5e6ff827b3306bee66437b3e8e163a7d0ba2637
-s6rcdb=/versions/core-system-rc.392e6f19f9592ee8cdc25c42026deb51acf9778563c5951c0f3d13f8254931f7/s6-rc-db
+s6rcdb=/versions/core-system-rc.234a637acbc3636c8bc014f4c5e6ff827b3306bee66437b3e8e163a7d0ba2637/s6-rc-db
prefix=/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/packages/core-system-rc b/packages/core-system-rc
@@ -2,10 +2,10 @@
#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423
#+s6-rc.ec922b3bc760fbf1f8cbcf92d4a8644dd22161e7efcb6f33433c441b17c91b04
-#+fileset.d559f3bf6cc7a7f798a1af9f61a32688b8ae33b25e960639834255285575fa73
-#+core-system-conf.41c8c5fd3c819a28eef71a119b19044af282166dc388e363d1671bfb99e7fc5a
+#+fileset.7f6a6b2ec33161bfccb65a4bc5da89ba5554e90267cd88c836b37aa9ee8a3815
+#+core-system-conf.be2d03329f9df3a613d4eb90fa9896cd7cc27ee9405aac5cd9e30ea2286105d7
-conf=/versions/core-system-conf.41c8c5fd3c819a28eef71a119b19044af282166dc388e363d1671bfb99e7fc5a/core-system-conf
+conf=/versions/core-system-conf.be2d03329f9df3a613d4eb90fa9896cd7cc27ee9405aac5cd9e30ea2286105d7/core-system-conf
prefix=/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
mkdir -p "$pkgdir/s6-rc-source"
diff --git a/packages/core-system-scripts b/packages/core-system-scripts
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
-#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
-#+pthbs-banginstall.0c36ee9e849ec904e79d6e494a50da7aee79326ead075106431aebddd9a7f5ef
+#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89
+#+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a
#@git:98fabf6dffa7a3a7850f1797f557e181b7e8460f:core-system-scripts
: ${JOBS:=1}
diff --git a/packages/default.environment b/packages/default.environment
@@ -16,18 +16,18 @@
#+s6-dns.36233ab3b402030208dcbeedfcbaeb98b548361c4f50d4b8b74fc384ddeed87c
#+libressl.76e45b2a0a4c2fa4edd91693c31a203f799174f01d7d89bd010b8a655e9f2061
#+s6-networking.f562a19100efca2d688e007e771484e82dfa551588f5e64573a00416ca02abee
-#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
-#+pthbs-banginstall.0c36ee9e849ec904e79d6e494a50da7aee79326ead075106431aebddd9a7f5ef
-#+aat.83aa17b8710a0aec5f2197195ade9b26f66e0b6a68f1498e4f0fec0acc982827
-#+confz.7b280bc8cb3d418373229b4e17bd54ab0a1f98a95a9b5942d777bd46dc7c3d89
-#+containers.37f021525d12f1ef84f1f4efdc092ac98beffffb07189dbcd4f1969c4fb5db28
-#+fileset.d559f3bf6cc7a7f798a1af9f61a32688b8ae33b25e960639834255285575fa73
-#+logincaps.c2dd7ebf56d5e34435f92980287e394e06e961b75bb2fedf7d74e90cdb4e02bd
-#+snaprep.b1f70988bfd13a33964a1bcaaca7cc5d86e998a3b24eb57e6bb25b58de3a2915
+#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89
+#+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a
+#+aat.3755b6e4a470de8a2a513edc2acc19850cf61686fc29eee5b2b19eb017537055
+#+confz.d5eb5a104bf41e55404021581654a18d25c5e8640497466344b90f7c9ac5ebd9
+#+containers.3054ec7c0031b57c78ecb3772939d7c6583215a4ee531839a4a43207cf56c13f
+#+fileset.7f6a6b2ec33161bfccb65a4bc5da89ba5554e90267cd88c836b37aa9ee8a3815
+#+logincaps.627f74c39489a69ac09eda17c226e0a7f2f23dbd96fc28c43509cb43fbef45e8
+#+snaprep.ee69abcfc934bf80914a0110b77f0a30992bccdab92559dbbae7ca1f599f0ae7
#+curl.8f6539d068fe09350886ef5c00e60544453c021d9683575ecefbc8a0d65b4fec
#+git.48d7679b6bed977d6f110d7094b217bb1994c35cc43987fcf7cc64d0958c71b9
#+linux.c5fe89bcf8fcccecb1d966791fc3fdf15cce0225905b6421064a25d5a961ddb4
-#+core-system-conf.41c8c5fd3c819a28eef71a119b19044af282166dc388e363d1671bfb99e7fc5a
-#+core-system-rc.392e6f19f9592ee8cdc25c42026deb51acf9778563c5951c0f3d13f8254931f7
-#+core-system-scripts.faf544fe4a24fa75357273b052305196df9c889aba9bddbcba92da92f1ed688c
-#+core-system-init.6d4fc441751e8d7a2686ea291675688e8562dd7547c8abeb8006c5a2bf68e177-
\ No newline at end of file
+#+core-system-conf.be2d03329f9df3a613d4eb90fa9896cd7cc27ee9405aac5cd9e30ea2286105d7
+#+core-system-rc.234a637acbc3636c8bc014f4c5e6ff827b3306bee66437b3e8e163a7d0ba2637
+#+core-system-scripts.b7fda104b06e30b612a2c5fb72e6da9c9fb94c70ac3ad75dc213a8f6f79df706
+#+core-system-init.a5291a86711164b991cb91d266f59f382e7d3d49e40e95eb849b12bd4ae350bd+
\ No newline at end of file
diff --git a/packages/fileset b/packages/fileset
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
-#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
-#+pthbs-banginstall.0c36ee9e849ec904e79d6e494a50da7aee79326ead075106431aebddd9a7f5ef
+#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89
+#+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a
#@git:4cced2cb91b19ebb648b803cfdcc936148cd6f94:fileset
: ${JOBS:=1}
diff --git a/packages/logincaps b/packages/logincaps
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
-#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
-#+pthbs-banginstall.0c36ee9e849ec904e79d6e494a50da7aee79326ead075106431aebddd9a7f5ef
+#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89
+#+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a
#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403
#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
#@git:b8c706e2a24a12ec3854d41e777e4b8840f98be2:logincaps
diff --git a/packages/pthbs-banginstall b/packages/pthbs-banginstall
@@ -1,6 +1,6 @@
#!/usr/bin/env pthbs-build
#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
-#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
+#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89
#@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
installdir="$pthbs_destdir//versions/$pthbs_package"
diff --git a/packages/snaprep b/packages/snaprep
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
-#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
-#+pthbs-banginstall.0c36ee9e849ec904e79d6e494a50da7aee79326ead075106431aebddd9a7f5ef
+#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89
+#+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a
#@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
: ${JOBS:=1}
diff --git a/packages/userspace.environment b/packages/userspace.environment
@@ -16,13 +16,13 @@
#+s6-dns.36233ab3b402030208dcbeedfcbaeb98b548361c4f50d4b8b74fc384ddeed87c
#+libressl.76e45b2a0a4c2fa4edd91693c31a203f799174f01d7d89bd010b8a655e9f2061
#+s6-networking.f562a19100efca2d688e007e771484e82dfa551588f5e64573a00416ca02abee
-#+zsh.2e16af2498aac0d46b225021cfb2ba54bb375f77366a29130c68f69aa07b15b8
-#+pthbs-banginstall.0c36ee9e849ec904e79d6e494a50da7aee79326ead075106431aebddd9a7f5ef
-#+aat.83aa17b8710a0aec5f2197195ade9b26f66e0b6a68f1498e4f0fec0acc982827
-#+confz.7b280bc8cb3d418373229b4e17bd54ab0a1f98a95a9b5942d777bd46dc7c3d89
-#+containers.37f021525d12f1ef84f1f4efdc092ac98beffffb07189dbcd4f1969c4fb5db28
-#+fileset.d559f3bf6cc7a7f798a1af9f61a32688b8ae33b25e960639834255285575fa73
-#+logincaps.c2dd7ebf56d5e34435f92980287e394e06e961b75bb2fedf7d74e90cdb4e02bd
-#+snaprep.b1f70988bfd13a33964a1bcaaca7cc5d86e998a3b24eb57e6bb25b58de3a2915
+#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89
+#+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a
+#+aat.3755b6e4a470de8a2a513edc2acc19850cf61686fc29eee5b2b19eb017537055
+#+confz.d5eb5a104bf41e55404021581654a18d25c5e8640497466344b90f7c9ac5ebd9
+#+containers.3054ec7c0031b57c78ecb3772939d7c6583215a4ee531839a4a43207cf56c13f
+#+fileset.7f6a6b2ec33161bfccb65a4bc5da89ba5554e90267cd88c836b37aa9ee8a3815
+#+logincaps.627f74c39489a69ac09eda17c226e0a7f2f23dbd96fc28c43509cb43fbef45e8
+#+snaprep.ee69abcfc934bf80914a0110b77f0a30992bccdab92559dbbae7ca1f599f0ae7
#+curl.8f6539d068fe09350886ef5c00e60544453c021d9683575ecefbc8a0d65b4fec
#+git.48d7679b6bed977d6f110d7094b217bb1994c35cc43987fcf7cc64d0958c71b9
\ No newline at end of file
diff --git a/packages/zsh b/packages/zsh
@@ -5,6 +5,7 @@
#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423
#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9
#+netbsd-curses.9f6c8437de9bc082a51cb44c88ec317d1822028750b8724ff24b802f41b99b39
+#@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
#@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
build_env_static() {
@@ -57,11 +58,29 @@ check_static() {
build_env_static
cd zsh-5.9
-autotools_config --enable-libc-musl --enable-static --disable-shared --disable-locale
+autotools_config \
+ --enable-static --disable-shared \
+ --enable-libc-musl --disable-locale \
+ --enable-cap \
+ --enable-maildir-support \
+ --enable-datadir="/versions/$pthbs_package" \
+ --enable-datarootdir="/versions/$pthbs_package" \
+ --enable-etcdir="/versions/$pthbs_package/etc" \
+ --enable-scriptdir="/versions/$pthbs_package/zsh/scripts" \
+ --enable-site-scriptdir="/versions/$pthbs_package/zsh/site-scripts" \
+ --enable-fndir="/versions/$pthbs_package/zsh/functions" \
+ --enable-site-fndir="/versions/$pthbs_package/zsh/site-functions" \
+ --enable-runhelpdir="/versions/$pthbs_package/zsh/help"
+
sed -Ee '/name=zsh\/(files|stat|system|zselect|zutil|regex|net\/socket|net\/tcp) /s/link=[^ ]+/link=static/' -i config.modules
cat config.modules
+
make -j${JOBS:-1} -l$((1+${JOBS:-1}))
+
+cat Src/zshpaths.h
make DESTDIR="$pthbs_destdir" install
+mv -v ../zsh_config/etc "$pthbs_destdir//versions/$pthbs_package/"
+mv -v ../zsh_config/zsh-functions/* "$pthbs_destdir//versions/$pthbs_package/zsh/site-functions/"
check_static command/zsh
@@ -70,6 +89,8 @@ cd "$pthbs_destdir/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
BEGIN {
x["./command/zsh"]=1
+ x["./man/man1/zsh.1"]=1
+ x["./man/man1/zshall.1"]=1
}
function r1(s) {
@@ -88,6 +109,7 @@ function link(src) {
$1!="."{exit 1}
+ $2 == "zsh" { link($0); next }
$2 == "command" { link($0); next }
$2 == "bin" { link(s1("command", $0)); next }
diff --git a/sources/zsh_config b/sources/zsh_config
@@ -0,0 +1 @@
+Subproject commit c73505cc47870bd09e8e204d98ac5976e0d4cb52
diff --git a/templates/pkg/zsh b/templates/pkg/zsh
@@ -1,19 +1,43 @@
{% extends "autotools" %}
{%- block extra_deps %}
#+{{pkg_install_name("netbsd-curses")}}
+#@git:{{submodule.current["zsh_config"]}}:zsh_config
#@untar:-J:{{downloads["zsh-5.9.tar.xz"]}}:.
{%- endblock %}
{% block at_script %}
build_env_static
cd zsh-5.9
-autotools_config --enable-libc-musl --enable-static --disable-shared --disable-locale
+autotools_config \
+ --enable-static --disable-shared \
+ --enable-libc-musl --disable-locale \
+ --enable-cap \
+ --enable-maildir-support \
+ --enable-datadir="{{versions}}/$pthbs_package" \
+ --enable-datarootdir="{{versions}}/$pthbs_package" \
+ --enable-etcdir="{{versions}}/$pthbs_package/etc" \
+ --enable-scriptdir="{{versions}}/$pthbs_package/zsh/scripts" \
+ --enable-site-scriptdir="{{versions}}/$pthbs_package/zsh/site-scripts" \
+ --enable-fndir="{{versions}}/$pthbs_package/zsh/functions" \
+ --enable-site-fndir="{{versions}}/$pthbs_package/zsh/site-functions" \
+ --enable-runhelpdir="{{versions}}/$pthbs_package/zsh/help"
+
sed -Ee '/name=zsh\/(files|stat|system|zselect|zutil|regex|net\/socket|net\/tcp) /s/link=[^ ]+/link=static/' -i config.modules
cat config.modules
+
{{make}}
+
+cat Src/zshpaths.h
make DESTDIR="$pthbs_destdir" install
+mv -v ../zsh_config/etc "$pthbs_destdir/{{versions}}/$pthbs_package/"
+mv -v ../zsh_config/zsh-functions/* "$pthbs_destdir/{{versions}}/$pthbs_package/zsh/site-functions/"
check_static command/zsh
{% endblock %}
{% block genlinks_begin %}
x["./command/zsh"]=1
+ x["./man/man1/zsh.1"]=1
+ x["./man/man1/zshall.1"]=1
{% endblock %}
+{% block rules %}
+ $2 == "zsh" { link($0); next }
+{% endblock -%}
