commit 4ad1bfa7f72fbb81df6e62c87bf9c737cad608d2
parent 5884f3c18a27cdea3c9cbca76d2f31ea054d39ae
Author: Jan Pobříslo <ccx@te2000.cz>
Date: Sun, 18 Jun 2023 19:46:56 +0200
GNU patch, update readme
Diffstat:
24 files changed, 111 insertions(+), 70 deletions(-)
diff --git a/README b/README
@@ -79,18 +79,21 @@ Packaged software
* s6-portable-utils
* s6-rc
* skalibs
+* m4
+* flex
+* bison
+* patch
Work in progress
----------------
-* m4
-* flex
+* linux
+* gmp
+* libelf
Planned packages
----------------
-* bison
-* linux
* libretls
* curl
* git
diff --git a/downloadlist.sha256 b/downloadlist.sha256
@@ -3,6 +3,11 @@ dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3 2348200 https:/
e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 1419096 https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70 2953876 https://ftp.gnu.org/gnu/m4/m4-1.4.19.tar.gz
9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2 2817324 https://ftp.gnu.org/gnu/bison/bison-3.8.2.tar.xz
+ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd 783756 https://ftp.gnu.org/gnu/patch/patch-2.7.6.tar.xz
+
+# linux
+2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb 134728520 https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz
+d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a 1880612 https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.1.34.xz
# musl-cross-make
ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf 21490848 https://ftpmirror.gnu.org/gnu/binutils/binutils-2.33.1.tar.xz
diff --git a/files/busybox.config.1_12_0-8342-gaa4d303a3 b/files/busybox.config.1_12_0-8342-gaa4d303a3
@@ -426,7 +426,7 @@ CONFIG_DIFF=y
CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
CONFIG_FEATURE_DIFF_DIR=y
CONFIG_ED=y
-CONFIG_PATCH=y
+# CONFIG_PATCH is not set
CONFIG_SED=y
CONFIG_VI=y
CONFIG_FEATURE_VI_MAX_LEN=4096
diff --git a/genpkg.py b/genpkg.py
@@ -32,16 +32,16 @@ class SubmoduleInfo:
class FileInfo:
def __init__(self):
- self._sha256_cache = None
+ self._sha256_cache = {}
self._files_dir = Path('./files')
def __getitem__(self, key):
- if key in self.sha256_cache:
- return self.sha256_cache[key]
+ if key in self._sha256_cache:
+ return self._sha256_cache[key]
fp = self._files_dir / key
with fp.open('rb') as f:
file_hash = hashlib.file_digest(f, "sha256").hexdigest()
- self.sha256_cache[key] = file_hash
+ self._sha256_cache[key] = file_hash
if not (self._files_dir / "by-sha256" / file_hash).exists():
os.symlink("../" + key, str(self._files_dir / "by-sha256" / file_hash))
return file_hash
@@ -59,7 +59,7 @@ class Main:
self.env.globals["pkg_install_name"] = self.pkg_install_name
self.env.globals["pkg_install_dir"] = self.pkg_install_dir
self.env.globals["submodule"] = SubmoduleInfo()
- self.env.globals["files"] = SubmoduleInfo()
+ self.env.globals["files"] = FileInfo()
self.package_hashes = {}
self.rendering = []
diff --git a/packages/bison b/packages/bison
@@ -2,9 +2,9 @@
#+*
#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
-#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
-#+m4.924a391389646e3b9656fe13e899e31fa0903384dce76b65830edf7dbccf0557
-#+flex.cfcf27b6421ac626f667ed4c55d6a5c034555c320bafd06310edf6e849eb4b5f
+#+busybox.3baaa8dfd872514eb9ef62d28829ab78fc0d6391b2c8985285cd0b56702de575
+#+m4.51f0d643e0ceda317e09b61fdc659791a5965cf03d8575daa806001744ababa3
+#+flex.532c954cf9f0276e92267db4dccf8d3ad6f1aac3911744130cf720780c35ea56
#@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
autotools() {
diff --git a/packages/busybox b/packages/busybox
@@ -4,7 +4,7 @@
#+gnu-make.5a3ea32d78aa7a67390d110b9f44c88e8254bd8503a91a7ceef5ae7bc56d49d5
#+busybox.b9094196ca61dd443f1a2d734e8ab616adf15bd671d70d3df6166df7484763c0
#@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox
-#@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config
+#@sha256:955edd28faae9dd665f002c85466eef58ef8fd36d76d1f39eb974e22933478ab:busybox/.config
: ${JOBS:=1}
diff --git a/packages/default.environment b/packages/default.environment
@@ -1,14 +1,13 @@
-#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
+#+busybox.3baaa8dfd872514eb9ef62d28829ab78fc0d6391b2c8985285cd0b56702de575
#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
-#+execline.4380e0f4d2e3dbc4554ad187a2400173746e6b7905f5714e57e4ca0bd8dd1728
-#+s6.0acfa734097bf330b500ab13d011df5125d50af3f73e31763bed8c7359aa26de
-#+s6-rc.82010888589835401d602ab42e2a6114fe76eb9afc517d477a2c7d36d04c5e04
-#+s6-portable-utils.d80acaa1fa389e9e8c9d384b19c48157d4f5a8b1a116a570a5866dd6c1e613d2
-#+s6-linux-utils.7ea2f48cf8f8ecf36ee3bbf9b1e9c2e9dcc7bddd3c266d469d4d3bb35550d726
-#+s6-linux-init.4bed05368099fecd9f033f57ee5fc95bcdd6debfc0c30614e9b933b462bb7a75
-#+mdevd.324377b2f5f3a087d6b3a7cc6b6db03bf16a342cc7990011d4b62dcb2d449328
-#+s6-dns.91cc3d4afd51493b74adef73c831aa7c72fd927f1f044b8f2b3407986e8e87de
-#+s6-networking.232731abc6c89da986ed9e47e1c24fb43e7ecb6a0bbcd31e5ca476bf299e026b
-#+flex.cfcf27b6421ac626f667ed4c55d6a5c034555c320bafd06310edf6e849eb4b5f
-#+bison.1c72d1149e28aa1bb9103da2324a9ea370ba585621b0fc7f8595fc239f456c1e-
\ No newline at end of file
+#+execline.21e6c752c9787c1f3ef5849534e95afcbcac21ad47e063e6e643b63c44116152
+#+s6.f3af1ca04869156f3fe6ac15eb6e9a5c712f25f0bea01f645006968e93e10649
+#+s6-rc.5b23d19ea9d157841e05865ac4fbaf67b1b40e20a088e6c244f464e0e5b96cdb
+#+s6-portable-utils.1b91c4b28b51bc4813477df6e048d69afd2f10d1853f149a6a7ede7f257a0f65
+#+s6-linux-utils.097eb89c8ce6709aa0bb3079680f762d39fd0ac3415dc4207234cdf531a39482
+#+s6-linux-init.b0ea7eada170d8c4d66150d6ff86fd54f95cdec502cdd1968251d3329d426c3d
+#+mdevd.11f5a6edffa3e2936e88f7354a2c0b081fddb9a47a010cc7dc3baa7f1cd6da01
+#+s6-dns.540a47c3c6488c369e87a8995f5b1cc83ac52219d5ba1e8907c6ed652e2b0371
+#+s6-networking.ce384d8eae84f0151057a6da0dca8d5b4b8dca00e3fe83a0a5cd2c2fbc9f9785
+#+linux.26d655eb7e2e59b9f809ebd87e843c1184b0a50e14a4ec798c3da51789e8e8e4+
\ No newline at end of file
diff --git a/packages/execline b/packages/execline
@@ -2,8 +2,8 @@
#+*
#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
-#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
-#+skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba
+#+busybox.3baaa8dfd872514eb9ef62d28829ab78fc0d6391b2c8985285cd0b56702de575
+#+skalibs.d29ab008dc73d2a276a852f5089c0bfc08b9ad2915601c7a1e2dcba0d7f3a22c
#@git:85315b3e709f65781dd221fd3f13d3a989a748d4:execline
: ${JOBS:=1}
@@ -17,7 +17,7 @@ cd 'execline'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.d29ab008dc73d2a276a852f5089c0bfc08b9ad2915601c7a1e2dcba0d7f3a22c/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/flex b/packages/flex
@@ -2,8 +2,8 @@
#+*
#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
-#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
-#+m4.924a391389646e3b9656fe13e899e31fa0903384dce76b65830edf7dbccf0557
+#+busybox.3baaa8dfd872514eb9ef62d28829ab78fc0d6391b2c8985285cd0b56702de575
+#+m4.51f0d643e0ceda317e09b61fdc659791a5965cf03d8575daa806001744ababa3
#@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
autotools() {
diff --git a/packages/m4 b/packages/m4
@@ -2,7 +2,7 @@
#+*
#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
-#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
+#+busybox.3baaa8dfd872514eb9ef62d28829ab78fc0d6391b2c8985285cd0b56702de575
#@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
autotools() {
diff --git a/packages/mdevd b/packages/mdevd
@@ -2,9 +2,9 @@
#+*
#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
-#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
-#+skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba
-#+execline.4380e0f4d2e3dbc4554ad187a2400173746e6b7905f5714e57e4ca0bd8dd1728
+#+busybox.3baaa8dfd872514eb9ef62d28829ab78fc0d6391b2c8985285cd0b56702de575
+#+skalibs.d29ab008dc73d2a276a852f5089c0bfc08b9ad2915601c7a1e2dcba0d7f3a22c
+#+execline.21e6c752c9787c1f3ef5849534e95afcbcac21ad47e063e6e643b63c44116152
#@git:d9f63961ec01dc02131ad0967734ae1a058b27b8:mdevd
: ${JOBS:=1}
@@ -18,7 +18,7 @@ cd 'mdevd'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.d29ab008dc73d2a276a852f5089c0bfc08b9ad2915601c7a1e2dcba0d7f3a22c/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/s6 b/packages/s6
@@ -2,9 +2,10 @@
#+*
#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
-#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
-#+skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba
-#+execline.4380e0f4d2e3dbc4554ad187a2400173746e6b7905f5714e57e4ca0bd8dd1728
+#+busybox.3baaa8dfd872514eb9ef62d28829ab78fc0d6391b2c8985285cd0b56702de575
+#+patch.a094758d03eec448275361e97ea4dd3ebe9e627fefd30bb3a79f529571626f3c
+#+skalibs.d29ab008dc73d2a276a852f5089c0bfc08b9ad2915601c7a1e2dcba0d7f3a22c
+#+execline.21e6c752c9787c1f3ef5849534e95afcbcac21ad47e063e6e643b63c44116152
#@git:3e7acf5c35999492e7feeaa59616510bf9cc51ac:s6
#@sha256:627d1273036dc35239ba9dd1da45132e3bfce1ab8171dd27dc7952cdf09b698e:s6_clone3_newpid.patch
@@ -19,7 +20,7 @@ patch -up 1 -i ../s6_clone3_newpid.patch
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.d29ab008dc73d2a276a852f5089c0bfc08b9ad2915601c7a1e2dcba0d7f3a22c/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/s6-dns b/packages/s6-dns
@@ -2,8 +2,8 @@
#+*
#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
-#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
-#+skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba
+#+busybox.3baaa8dfd872514eb9ef62d28829ab78fc0d6391b2c8985285cd0b56702de575
+#+skalibs.d29ab008dc73d2a276a852f5089c0bfc08b9ad2915601c7a1e2dcba0d7f3a22c
#@git:4d081d9c2657ef40e770145f21328d37035dd774:s6-dns
: ${JOBS:=1}
@@ -17,7 +17,7 @@ cd 's6-dns'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.d29ab008dc73d2a276a852f5089c0bfc08b9ad2915601c7a1e2dcba0d7f3a22c/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/s6-linux-init b/packages/s6-linux-init
@@ -2,10 +2,10 @@
#+*
#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
-#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
-#+skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba
-#+execline.4380e0f4d2e3dbc4554ad187a2400173746e6b7905f5714e57e4ca0bd8dd1728
-#+s6.0acfa734097bf330b500ab13d011df5125d50af3f73e31763bed8c7359aa26de
+#+busybox.3baaa8dfd872514eb9ef62d28829ab78fc0d6391b2c8985285cd0b56702de575
+#+skalibs.d29ab008dc73d2a276a852f5089c0bfc08b9ad2915601c7a1e2dcba0d7f3a22c
+#+execline.21e6c752c9787c1f3ef5849534e95afcbcac21ad47e063e6e643b63c44116152
+#+s6.f3af1ca04869156f3fe6ac15eb6e9a5c712f25f0bea01f645006968e93e10649
#@git:42a91a98b780759257862642c764c2102237fea6:s6-linux-init
: ${JOBS:=1}
@@ -19,7 +19,7 @@ cd 's6-linux-init'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.d29ab008dc73d2a276a852f5089c0bfc08b9ad2915601c7a1e2dcba0d7f3a22c/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/s6-linux-utils b/packages/s6-linux-utils
@@ -2,8 +2,8 @@
#+*
#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
-#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
-#+skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba
+#+busybox.3baaa8dfd872514eb9ef62d28829ab78fc0d6391b2c8985285cd0b56702de575
+#+skalibs.d29ab008dc73d2a276a852f5089c0bfc08b9ad2915601c7a1e2dcba0d7f3a22c
#@git:964442539c3b5b7f6f13a17cbf391843ec93ce6f:s6-linux-utils
: ${JOBS:=1}
@@ -17,7 +17,7 @@ cd 's6-linux-utils'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.d29ab008dc73d2a276a852f5089c0bfc08b9ad2915601c7a1e2dcba0d7f3a22c/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/s6-networking b/packages/s6-networking
@@ -2,11 +2,11 @@
#+*
#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
-#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
-#+skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba
-#+execline.4380e0f4d2e3dbc4554ad187a2400173746e6b7905f5714e57e4ca0bd8dd1728
-#+s6.0acfa734097bf330b500ab13d011df5125d50af3f73e31763bed8c7359aa26de
-#+s6-dns.91cc3d4afd51493b74adef73c831aa7c72fd927f1f044b8f2b3407986e8e87de
+#+busybox.3baaa8dfd872514eb9ef62d28829ab78fc0d6391b2c8985285cd0b56702de575
+#+skalibs.d29ab008dc73d2a276a852f5089c0bfc08b9ad2915601c7a1e2dcba0d7f3a22c
+#+execline.21e6c752c9787c1f3ef5849534e95afcbcac21ad47e063e6e643b63c44116152
+#+s6.f3af1ca04869156f3fe6ac15eb6e9a5c712f25f0bea01f645006968e93e10649
+#+s6-dns.540a47c3c6488c369e87a8995f5b1cc83ac52219d5ba1e8907c6ed652e2b0371
#@git:68db8af7c26461d4477f482ecbc279729fa911e4:s6-networking
: ${JOBS:=1}
@@ -20,7 +20,7 @@ cd 's6-networking'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.d29ab008dc73d2a276a852f5089c0bfc08b9ad2915601c7a1e2dcba0d7f3a22c/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/s6-portable-utils b/packages/s6-portable-utils
@@ -2,8 +2,8 @@
#+*
#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
-#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
-#+skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba
+#+busybox.3baaa8dfd872514eb9ef62d28829ab78fc0d6391b2c8985285cd0b56702de575
+#+skalibs.d29ab008dc73d2a276a852f5089c0bfc08b9ad2915601c7a1e2dcba0d7f3a22c
#@git:536eea15284be9a257b6f97f971e0d8d4a7e437b:s6-portable-utils
: ${JOBS:=1}
@@ -17,7 +17,7 @@ cd 's6-portable-utils'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.d29ab008dc73d2a276a852f5089c0bfc08b9ad2915601c7a1e2dcba0d7f3a22c/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/s6-rc b/packages/s6-rc
@@ -2,10 +2,10 @@
#+*
#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
-#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
-#+skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba
-#+execline.4380e0f4d2e3dbc4554ad187a2400173746e6b7905f5714e57e4ca0bd8dd1728
-#+s6.0acfa734097bf330b500ab13d011df5125d50af3f73e31763bed8c7359aa26de
+#+busybox.3baaa8dfd872514eb9ef62d28829ab78fc0d6391b2c8985285cd0b56702de575
+#+skalibs.d29ab008dc73d2a276a852f5089c0bfc08b9ad2915601c7a1e2dcba0d7f3a22c
+#+execline.21e6c752c9787c1f3ef5849534e95afcbcac21ad47e063e6e643b63c44116152
+#+s6.f3af1ca04869156f3fe6ac15eb6e9a5c712f25f0bea01f645006968e93e10649
#@git:b79282b3746ff67c3c0df8aa32814b3688b91d4f:s6-rc
: ${JOBS:=1}
@@ -19,7 +19,7 @@ cd 's6-rc'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.101b5c7d53c6343cf4e949731f634bf2b8678c54d418f5fd15fb2bb8815626ba/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.d29ab008dc73d2a276a852f5089c0bfc08b9ad2915601c7a1e2dcba0d7f3a22c/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/skalibs b/packages/skalibs
@@ -2,7 +2,7 @@
#+*
#+musl-cross-make.cc90b3976df6e6d3994f5fb23caf6f5006163095721bb2251e57788402e27f34
#+gnu-make.b9f417c39ba8520d03b25e0f87427a9e4c5fb9ac5b74bfa04fc54ebd3f695d49
-#+busybox.dd17d438a607bf3cfb9ef1efeab47a9a5d30867d666837c8555872e63960743d
+#+busybox.3baaa8dfd872514eb9ef62d28829ab78fc0d6391b2c8985285cd0b56702de575
#@git:c555cd2ba1682f90fb5344d2865713fcd0f3c3e1:skalibs
: ${JOBS:=1}
diff --git a/templates/pkg/busybox b/templates/pkg/busybox
@@ -5,7 +5,7 @@
#+{{pkg_install_name("gnu-make:bootstrap")}}
#+{{pkg_install_name("busybox:bootstrap")}}
#@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox
-#@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config
+#@sha256:{{files["busybox.config.1_12_0-8342-gaa4d303a3"]}}:busybox/.config
: ${JOBS:=1}
diff --git a/templates/pkg/default.environment b/templates/pkg/default.environment
@@ -10,5 +10,4 @@
#+{{pkg_install_name("mdevd")}}
#+{{pkg_install_name("s6-dns")}}
#+{{pkg_install_name("s6-networking")}}
-#+{{pkg_install_name("flex")}}
-#+{{pkg_install_name("bison")}}
+#+{{pkg_install_name("linux")}}
diff --git a/templates/pkg/linux b/templates/pkg/linux
@@ -0,0 +1,26 @@
+{% extends "genlinks" %}
+{%- block script %}
+#+*
+#+{{pkg_install_name("busybox")}}
+#+{{pkg_install_name("gnu-make")}}
+#+{{pkg_install_name("musl-cross-make")}}
+#+{{pkg_install_name("flex")}}
+#+{{pkg_install_name("bison")}}
+#+{{pkg_install_name("patch")}}
+#@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:.
+#@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz
+#@sha256:{{files["linux-6.1.34-x86_64.config"]}}:linux-6.1/.config
+
+cd linux-6.1
+unxz -c < ../patch-6.1.34.xz | patch -p1 -N
+linux64 {{make}}
+
+installdir="$pthbs_destdir/{{versions}}/$pthbs_package"
+mkdir -p "$installdir"
+mv linux-6.1/Documentation "$installdir/doc"
+linux64 make modules_install install \
+ INSTALL_MOD_PATH="$installdir" \
+ INSTALL_MOD_STRIP=1 \
+ INSTALL_PATH="$installdir"/boot \
+ INSTALL_DTBS_PATH="$installdir/boot/dtbs"
+{% endblock %}
diff --git a/templates/pkg/patch b/templates/pkg/patch
@@ -0,0 +1,7 @@
+{% extends "autotools" %}
+{%- block extra_deps %}
+#@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
+{%- endblock %}
+{% block at_script %}
+autotools patch-2.7.6 --disable-nls --enable-static --disable-shared
+{% endblock %}
diff --git a/templates/pkg/s6 b/templates/pkg/s6
@@ -4,6 +4,7 @@
#+{{pkg_install_name("musl-cross-make")}}
#+{{pkg_install_name("gnu-make")}}
#+{{pkg_install_name("busybox")}}
+#+{{pkg_install_name("patch")}}
#+{{pkg_install_name("skalibs")}}
#+{{pkg_install_name("execline")}}
#@git:{{submodule.current.s6}}:s6
