pthbs_genpkgpy

commit 898352564b99a70b49ee1b319f6a9d2267d7e68d
parent 7b42f222a07f29d9da1059ee152a58626731307c
Author: ccx <ccx@te2000.cz>
Date:   Tue, 27 Feb 2024 01:51:03 +0000

Remove kernel from default environment

Diffstat:
M
packages/core-system-conf
 | 
4
++--
M
packages/core-system-init
 | 
4
++--
M
packages/core-system-rc
 | 
6
+++---
M
packages/default.environment
 | 
15
+++++++--------
M
packages/fileset
 | 
2
+-
M
packages/userspace.environment
 | 
2
+-
M
templates/pkg/default.environment
 | 
4
++--

7 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/packages/core-system-conf b/packages/core-system-conf
@@ -3,8 +3,8 @@
 #+diffutils.150138a6d189b794fc15df8b9fecb23cc66b970dbc7f83ccd3c099a4397f9ebd
 #+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
 #+aat.455972291ac5d9a314e7cc1b7f9b5578da91e9004342d676370d48058662dd69
-#+fileset.a3906d61697609cb9fb9a093f0c94078edba4097da0fa342ba1e9b1cd493003d
-#@git:68c2ffd5f266f0c27e3d0b9038872088235659f5:core-system-conf
+#+fileset.1193c4c671fb88d1cfbd5d1f9f7c17f644036cba45dc7ebd8a54947f229a1e8f
+#@git:d4d8812908e64ae0e8ca233bfeef7e028d77acec:core-system-conf
 
 : ${JOBS:=1}
 prefix=/versions/$pthbs_package
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.56833ddc76163f55e3a9b5057e2e8333b03529d40d5a82d516d0cf7bc0fad35e
+#+core-system-rc.6c6ac9b904defaeff43f12e47f24e480127b4cda30d77b03d9e9395158e948d8
 
-s6rcdb=/versions/core-system-rc.56833ddc76163f55e3a9b5057e2e8333b03529d40d5a82d516d0cf7bc0fad35e/s6-rc-db
+s6rcdb=/versions/core-system-rc.6c6ac9b904defaeff43f12e47f24e480127b4cda30d77b03d9e9395158e948d8/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.a3906d61697609cb9fb9a093f0c94078edba4097da0fa342ba1e9b1cd493003d
-#+core-system-conf.9697f29d331e0ea50101e42f176c0d2db6387292559b079c2a8bdf8431a25716
+#+fileset.1193c4c671fb88d1cfbd5d1f9f7c17f644036cba45dc7ebd8a54947f229a1e8f
+#+core-system-conf.c68e0aacdcac8003484d99f9bc753d1b0b41d4d9874b1ee68dbd2e4611a9d18f
 
-conf=/versions/core-system-conf.9697f29d331e0ea50101e42f176c0d2db6387292559b079c2a8bdf8431a25716/core-system-conf
+conf=/versions/core-system-conf.c68e0aacdcac8003484d99f9bc753d1b0b41d4d9874b1ee68dbd2e4611a9d18f/core-system-conf
 prefix=/versions/$pthbs_package
 pkgdir="$pthbs_destdir/$prefix"
 mkdir -p "$pkgdir/s6-rc-source"
diff --git a/packages/default.environment b/packages/default.environment
@@ -1,3 +1,7 @@
+#+core-system-conf.c68e0aacdcac8003484d99f9bc753d1b0b41d4d9874b1ee68dbd2e4611a9d18f
+#+core-system-rc.6c6ac9b904defaeff43f12e47f24e480127b4cda30d77b03d9e9395158e948d8
+#+core-system-scripts.ee523efb83b205613798c4b7b55b7553201a688a256cc685087e31c750c69f1c
+#+core-system-init.d36150f0a64b242c658bd2f53883ee951f849c0323614fc42d0dfae0d029e997
 #+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
 #+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
 #+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa
@@ -21,13 +25,8 @@
 #+aat.455972291ac5d9a314e7cc1b7f9b5578da91e9004342d676370d48058662dd69
 #+confz.d494f10b651c49ab09a9759710c3998adb568b50a5512bf116119bf906c3b07d
 #+containers.89dbab49932aced8f0977728839ad737649360739b0551e8755966801f26cd09
-#+fileset.a3906d61697609cb9fb9a093f0c94078edba4097da0fa342ba1e9b1cd493003d
+#+fileset.1193c4c671fb88d1cfbd5d1f9f7c17f644036cba45dc7ebd8a54947f229a1e8f
 #+logincaps.5f7ebf75103348236fbc1f50a7085e448c3a59e3ad92be1ccceb81dea976e4df
 #+snaprep.dba09cb13b0367665897131b2fdf9deba65ea321dc2fc8e30a1dbe57fd794d8d
 #+curl.8f6539d068fe09350886ef5c00e60544453c021d9683575ecefbc8a0d65b4fec
-#+git.48d7679b6bed977d6f110d7094b217bb1994c35cc43987fcf7cc64d0958c71b9
-#+linux.c5fe89bcf8fcccecb1d966791fc3fdf15cce0225905b6421064a25d5a961ddb4
-#+core-system-conf.9697f29d331e0ea50101e42f176c0d2db6387292559b079c2a8bdf8431a25716
-#+core-system-rc.56833ddc76163f55e3a9b5057e2e8333b03529d40d5a82d516d0cf7bc0fad35e
-#+core-system-scripts.ee523efb83b205613798c4b7b55b7553201a688a256cc685087e31c750c69f1c
-#+core-system-init.79b95068031a7cf14ca64c82219867cb37ecef0eaabfc7fe40dcd75ec7beaf9d-
\ No newline at end of file
+#+git.48d7679b6bed977d6f110d7094b217bb1994c35cc43987fcf7cc64d0958c71b9+
\ No newline at end of file
diff --git a/packages/fileset b/packages/fileset
@@ -2,7 +2,7 @@
 #+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
 #+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89
 #+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a
-#@git:4cced2cb91b19ebb648b803cfdcc936148cd6f94:fileset
+#@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset
 
 : ${JOBS:=1}
 prefix=/versions/$pthbs_package
diff --git a/packages/userspace.environment b/packages/userspace.environment
@@ -21,7 +21,7 @@
 #+aat.455972291ac5d9a314e7cc1b7f9b5578da91e9004342d676370d48058662dd69
 #+confz.d494f10b651c49ab09a9759710c3998adb568b50a5512bf116119bf906c3b07d
 #+containers.89dbab49932aced8f0977728839ad737649360739b0551e8755966801f26cd09
-#+fileset.a3906d61697609cb9fb9a093f0c94078edba4097da0fa342ba1e9b1cd493003d
+#+fileset.1193c4c671fb88d1cfbd5d1f9f7c17f644036cba45dc7ebd8a54947f229a1e8f
 #+logincaps.5f7ebf75103348236fbc1f50a7085e448c3a59e3ad92be1ccceb81dea976e4df
 #+snaprep.dba09cb13b0367665897131b2fdf9deba65ea321dc2fc8e30a1dbe57fd794d8d
 #+curl.8f6539d068fe09350886ef5c00e60544453c021d9683575ecefbc8a0d65b4fec
diff --git a/templates/pkg/default.environment b/templates/pkg/default.environment
@@ -1,6 +1,6 @@
-{% include "pkg/userspace.environment" %}
-{% include "pkg/kernel.environment" %}
 #+{{pkg_install_name("core-system-conf")}}
 #+{{pkg_install_name("core-system-rc")}}
 #+{{pkg_install_name("core-system-scripts")}}
 #+{{pkg_install_name("core-system-init")}}
+{% include "pkg/userspace.environment" %}{#
+{% include "pkg/kernel.environment" %} #}