mrrl

Minimal Reliable Reproducible Linux
git clone https://ccx.te2000.cz/git/mrrl
Log | Files | Refs | Submodules | README

commit c3c4f987a8edeb448ffbcd66e07cebdf603b1060
parent c8373d097536c6bca037ed530b6cd9333f0b317a
Author: ccx <ccx@te2000.cz>
Date:   Fri, 31 May 2024 20:20:09 +0000

Remove explicit patching of s6

Diffstat:
Mpackages/applyuidgid-caps | 2+-
Mpackages/containers | 2+-
Mpackages/containers.environment | 14+++++++-------
Mpackages/default.environment | 38+++++++++++++++++++-------------------
Mpackages/execline | 6+++---
Mpackages/kernel.environment | 4++--
Mpackages/libelf-compat | 2+-
Mpackages/linux | 2+-
Mpackages/logincaps | 4++--
Mpackages/mdevd | 8++++----
Mpackages/mdevd.environment | 8++++----
Mpackages/nosuid | 2+-
Mpackages/pidns_run | 2+-
Mpackages/s6 | 8++++----
Mpackages/s6-dns | 6+++---
Mpackages/s6-linux-init | 10+++++-----
Mpackages/s6-linux-utils | 6+++---
Mpackages/s6-networking | 12++++++------
Mpackages/s6-portable-utils | 6+++---
Mpackages/s6-rc | 10+++++-----
Mpackages/safelink | 2+-
Mpackages/skalibs | 2+-
Mpackages/spawn-pty | 2+-
Mpackages/system-config | 16++++++++--------
Mpackages/system-config-init | 16++++++++--------
Mpackages/system-config-rc | 6+++---
Mpackages/userspace.environment | 32++++++++++++++++----------------
Mtemplates/pkg/s6 | 4----
28 files changed, 114 insertions(+), 118 deletions(-)

diff --git a/packages/applyuidgid-caps b/packages/applyuidgid-caps @@ -2,7 +2,7 @@ #+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 -#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f +#+skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a #+libcap.3528f93ae9873fceae62855cb7c0fa521ac2c3cfabe71bf58ba01483136bf5fd #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c diff --git a/packages/containers b/packages/containers @@ -2,7 +2,7 @@ #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 #+zsh.2ff36a2aed3e11c13386bad0938fa166a6824f8b03b238a97b2922bca3678b2c #+pthbs-banginstall.0190099d7db974b8ac922bc571bb572989f6a7e1018400f466173a158a98224c -#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449 +#+execline.70f92114a71a2949f770fa2771b69b3b89b42b65cffb3247fbf2119614967ab5 #@git:846ebdb1a0f1fd9168bd2cab98699ce1406c69cd:containers : ${JOBS:=1} diff --git a/packages/containers.environment b/packages/containers.environment @@ -1,16 +1,16 @@ #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 #+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded -#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449 -#+s6.601377d341f6ee04ca2bdcdaad42df0e04456f07206dd56ba36556bd13956a22 -#+s6-portable-utils.4c31c00a77c0b995e5d5fc4b802707b47e39e5b930a0ca22141802682d9ce592 -#+s6-linux-utils.1061454b63433995a826b1dd134a1d9f36486f9dabb108325157e6541b6f50a7 +#+execline.70f92114a71a2949f770fa2771b69b3b89b42b65cffb3247fbf2119614967ab5 +#+s6.b7c8cb4824eba8c3514f501454d6f43d6ef97a666a668a37dd45b19ba5871100 +#+s6-portable-utils.a43d2649a87aa0f33e3ac7f22403dda81b5912d7b793b1d7876f3b6d842dd324 +#+s6-linux-utils.a4874e462c911cfd79f63a86b3a14a268ed2e10ae30706cbfa50e2937d1151a3 #+zsh.2ff36a2aed3e11c13386bad0938fa166a6824f8b03b238a97b2922bca3678b2c #+confz.208d2a701777a5703ca126f9fee4220610a9fb2b5241c5850d66a92bc0e682b2 -#+containers.9413687dafb3cb8e62ce26406af1da0451d5306505ba2d5003fd454926a0da68 +#+containers.6a19c27caf25c0011e68edddd603e97e45d66bdad44a9994cd1bce527a508c1f #+xbps.9831b74b8d46bb8c240d6ba606b13d3a80d67804ddbce5e828bef08377d0f9b0 #+zstd.ab99ab40fa027a935e6012884c3988d7161dc0c6ff10c06566c0a92c694bca07 #+apk-tools.c9cdb867562a26201a1618e0b1bf2147e6cee6aff1a6901909ee911a4462327a #+alpine-keys.c541ae09189f19994476df864795dd7c26486939981309be95de258ab1554fa1 #+getent.15c11d87a5194766f1ba7b78feac3b77792756cfb12a84c5f5d0f2c7c1cfd25d #+fileset.a274be52a358efbef7f42628a36ff98464608ab67d3bd4382323d60f9b854697 -#+pidns_run.1b51b40570a993155e0dc1de2efb01d15f2852180272e763630b9500ea475846- \ No newline at end of file +#+pidns_run.801b24b70139ecff4432a98d85cc479baa4224a49c5fe12076b791a321ac1e01+ \ No newline at end of file diff --git a/packages/default.environment b/packages/default.environment @@ -1,7 +1,7 @@ -#+system-config.029d3d6c581660834f9c9367ed9d92f9d9cd82746ec7d7efdccbd20974509378 -#+system-config-rc.1949f009633052b4858196dba185b41362e310d23ca8e590b27d4f8577dcdbd9 +#+system-config.5f52ec88f4f2f8d1c66bf4c35819c975b735d474a4141e96f2b0830c76ef3b98 +#+system-config-rc.12a72e25f369ffa706776f881792593f9ac5ee95e9f7423d9c811cb9a1c2f70c #+system-config-scripts.67e57dfdf150bbd6e0b01d5ca3fa89f0547997a8adb2c12f7e4d67602acb161a -#+system-config-init.377ddb982ea105a7473205a3eb8097e26687b9f801450c8313e2ec01dc6344a8 +#+system-config-init.23a01ede58f75c5638a0a28ba19e63c6a90ff5dbc7d799aa5f4d2a8c27678f65 #+system-config-zsh.7500a7c1af8c349cd87493d5f6e2fe5c31148b42d11103154ecca654e6326ba5 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 @@ -11,23 +11,23 @@ #+flex.1ec95ce5516c7871d0757dc9ffc02f3a8795a765ad7936c23a6e2688e7d3afd0 #+bison.fed01ec0597b5f4443ca53edb88e09263e1edbec32cb3bdc2d7c8642c295ab64 #+rsync.b356835b04c5d49533ce9cd7660fd7d61f50d1c1d527b123f46e3eb2f25d3989 -#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449 -#+s6.601377d341f6ee04ca2bdcdaad42df0e04456f07206dd56ba36556bd13956a22 -#+s6-rc.8de8b5eb1d1b72185b4693b874cb5477b49997800e95ab5a3035fb957e588147 -#+s6-portable-utils.4c31c00a77c0b995e5d5fc4b802707b47e39e5b930a0ca22141802682d9ce592 -#+s6-linux-utils.1061454b63433995a826b1dd134a1d9f36486f9dabb108325157e6541b6f50a7 -#+s6-linux-init.3c55d2440534aba76b2ed07fe4b33f82b8eb20372f5f0ebc9f539ebe6ebb8847 -#+mdevd.784288d5ae7ddbed20396021e0a8be1518d386381d1141c5d3ec8b1796b6463b -#+s6-dns.0e04114b7f9f8118d544eb4f9e2f67dc31ae9d098d5bca7c82eec5711807b6d7 +#+execline.70f92114a71a2949f770fa2771b69b3b89b42b65cffb3247fbf2119614967ab5 +#+s6.b7c8cb4824eba8c3514f501454d6f43d6ef97a666a668a37dd45b19ba5871100 +#+s6-rc.456d312e5472776c96ad5765c069f6e675a30103431d58a9cc9b7fdfcd88ae74 +#+s6-portable-utils.a43d2649a87aa0f33e3ac7f22403dda81b5912d7b793b1d7876f3b6d842dd324 +#+s6-linux-utils.a4874e462c911cfd79f63a86b3a14a268ed2e10ae30706cbfa50e2937d1151a3 +#+s6-linux-init.f8213565c54c5a4c5a2c88d721da8f33904d4b410341c35681ae5e8d42f41ad1 +#+mdevd.0dcdf8e2047a2e9d5da64ce73f1f27deb417133fa43d1ae511bd1558ebe9b115 +#+s6-dns.20518cba57d18cac6cdc54c533a419b9375c815a57d881c3174f76b9262751e1 #+libressl.712d293b92e9b1beb4a8b5905c45ea20cab64e3ddd9796f9c2781577f04771ab -#+s6-networking.09cc6b051d87cc67eaa6878833b4934be6b14735f3e5f855e4e63274609df811 +#+s6-networking.374cb3dd9bf6f0e6919750ce78f1581419d6b73a5eb31bbe0a8325042d054708 #+zsh.2ff36a2aed3e11c13386bad0938fa166a6824f8b03b238a97b2922bca3678b2c #+pthbs-banginstall.0190099d7db974b8ac922bc571bb572989f6a7e1018400f466173a158a98224c #+aat.bbab9c74688b933e314ebcfd721c558b60dfbff973a9be3735750d93504ba2ef #+confz.208d2a701777a5703ca126f9fee4220610a9fb2b5241c5850d66a92bc0e682b2 -#+containers.9413687dafb3cb8e62ce26406af1da0451d5306505ba2d5003fd454926a0da68 +#+containers.6a19c27caf25c0011e68edddd603e97e45d66bdad44a9994cd1bce527a508c1f #+fileset.a274be52a358efbef7f42628a36ff98464608ab67d3bd4382323d60f9b854697 -#+logincaps.a7749e55bc75b551e1725e3ad3d5d60de5ad36b56574c2fd9e36b163e301be12 +#+logincaps.87a17c76e4fc309d55a47abd2102b25a9bc3b87ac59f3bd0051f08ce9afc737c #+snaprep.4f1281cfb76562b94e47b6c021584d870be9c2900bd8d52db40848f58b5f7812 #+curl.b82f818e85570a561ca20ca417adba2f1c3214ef5c3e01626c0a4aa099b90f0c #+git.1839db7305bbee32d184adc0ece64d40ab58132d3c7749b426c4d680659bd4eb @@ -37,7 +37,7 @@ #+getconf.d16039d91561f2bb7f430eb2250f1e7c03d59ddeea80a9c55c21e293fb528fd9 #+iconv.0b381a2e57a5e7b3df6b6a68d72230eec4e5ef2f6a460509c94d3d502fe1f2cf #+libcap.3528f93ae9873fceae62855cb7c0fa521ac2c3cfabe71bf58ba01483136bf5fd -#+applyuidgid-caps.25f0135c22be3d3dcd34e06378e41b98cdc5201319131e99da81ae2af1af7767 -#+nosuid.0e8db424c6fe3c4f9543a126159dc59afc81fc28df33e5287121d28f71c574b5 -#+spawn-pty.e94a519d34a637d5fe414c4ee679553a3d88379220a91fd829a81d4a92e87535 -#+safelink.b5608f8fa5323d8da3360249d11c514def4c576fa0c0a625c2ca3ec13bcb66e7- \ No newline at end of file +#+applyuidgid-caps.fe109b95cac5af0f41bba16226eca0676403a4feb28d19fb8e99f7da963eb7db +#+nosuid.043751ada878991cd21fb39bd6185243f18d379283e9ae31bfc5c008294f898d +#+spawn-pty.852b5f65e2bb9d2ce02dd3831d10a0906f65b664759633ca7b6f23a9074441d9 +#+safelink.ed982768fcc22ce38687fc638d09eabc5df4081548f797241c1f16e7935913aa+ \ No newline at end of file diff --git a/packages/execline b/packages/execline @@ -2,8 +2,8 @@ #+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 -#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f -#@git:85315b3e709f65781dd221fd3f13d3a989a748d4:execline +#+skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a +#@git:793dc09daa859b94c69b2f6d9e45e4abf0300069:execline : ${JOBS:=1} prefix=/versions/$pthbs_package @@ -14,7 +14,7 @@ cd 'execline' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f/sysdeps' \ + --with-sysdeps='/versions/skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/kernel.environment b/packages/kernel.environment @@ -1 +1 @@ -#+linux.0350c0ccd1cd73a2cfe37bade5c9d268db7d264ce389b726ad4eb97729eeccab- \ No newline at end of file +#+linux.0f97bde1424375302f7aeb92ca25e0fbf98e15e2b2bfaa49eb3c9b27b5eed351+ \ No newline at end of file diff --git a/packages/libelf-compat b/packages/libelf-compat @@ -2,7 +2,7 @@ #+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 -#@git:3e7acf5c35999492e7feeaa59616510bf9cc51ac:s6 +#@git:9bf94d170fd0d5540be8c6337f53ed71dbca268a:s6 #@sha256:627d1273036dc35239ba9dd1da45132e3bfce1ab8171dd27dc7952cdf09b698e:s6_clone3_newpid.patch #@untar:-j:sha256:4496d6cec9644cda8006ead15e17e500629ce30fe85ab2f2052a77ba43a1358d:. diff --git a/packages/linux b/packages/linux @@ -7,7 +7,7 @@ #+flex.1ec95ce5516c7871d0757dc9ffc02f3a8795a765ad7936c23a6e2688e7d3afd0 #+bison.fed01ec0597b5f4443ca53edb88e09263e1edbec32cb3bdc2d7c8642c295ab64 #+rsync.b356835b04c5d49533ce9cd7660fd7d61f50d1c1d527b123f46e3eb2f25d3989 -#+libelf-compat.fe3d8e94f9889f2bda4206cd33dfeefb1a44c67d68cd513b067472696a706582 +#+libelf-compat.192f3413736b61c6127bb367475f12a3ef052420fb740797580acc4af19a3c33 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz #@sha256:cb8081499f316acdc7b31b486b8d68afd68094db8f420aba0eab2c3e8de13888:linux.config diff --git a/packages/logincaps b/packages/logincaps @@ -2,9 +2,9 @@ #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 #+zsh.2ff36a2aed3e11c13386bad0938fa166a6824f8b03b238a97b2922bca3678b2c #+pthbs-banginstall.0190099d7db974b8ac922bc571bb572989f6a7e1018400f466173a158a98224c -#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449 +#+execline.70f92114a71a2949f770fa2771b69b3b89b42b65cffb3247fbf2119614967ab5 #+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 -#+safelink.b5608f8fa5323d8da3360249d11c514def4c576fa0c0a625c2ca3ec13bcb66e7 +#+safelink.ed982768fcc22ce38687fc638d09eabc5df4081548f797241c1f16e7935913aa #@git:383268a05102bcc80a0fc5eef599ed2fe6019edc:logincaps : ${JOBS:=1} diff --git a/packages/mdevd b/packages/mdevd @@ -2,9 +2,9 @@ #+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 -#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f -#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449 -#@git:d9f63961ec01dc02131ad0967734ae1a058b27b8:mdevd +#+skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a +#+execline.70f92114a71a2949f770fa2771b69b3b89b42b65cffb3247fbf2119614967ab5 +#@git:5f93d0e7f6cf53a39184e36d47ca30251c5d38ac:mdevd : ${JOBS:=1} prefix=/versions/$pthbs_package @@ -15,7 +15,7 @@ cd 'mdevd' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f/sysdeps' \ + --with-sysdeps='/versions/skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/mdevd.environment b/packages/mdevd.environment @@ -1,5 +1,5 @@ #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 -#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449 -#+s6.601377d341f6ee04ca2bdcdaad42df0e04456f07206dd56ba36556bd13956a22 +#+execline.70f92114a71a2949f770fa2771b69b3b89b42b65cffb3247fbf2119614967ab5 +#+s6.b7c8cb4824eba8c3514f501454d6f43d6ef97a666a668a37dd45b19ba5871100 #+mdev-scripts.309c255116529a5765b684b3ea34c9447c64fa14e5cefd0fd85dcd6b16aa81b2 -#+mdevd.784288d5ae7ddbed20396021e0a8be1518d386381d1141c5d3ec8b1796b6463b- \ No newline at end of file +#+mdevd.0dcdf8e2047a2e9d5da64ce73f1f27deb417133fa43d1ae511bd1558ebe9b115+ \ No newline at end of file diff --git a/packages/nosuid b/packages/nosuid @@ -2,7 +2,7 @@ #+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 -#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f +#+skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a #@sha256:d53f929459d390275a98f948b570697c03b55384fd2536b8a5d72950d194c0c4:nosuid.c name=nosuid diff --git a/packages/pidns_run b/packages/pidns_run @@ -2,7 +2,7 @@ #+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 -#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f +#+skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a #@sha256:c7be49de876eea64554e2e46bcaa7059083bcd6210c5007fd9030e0a6e57a0dd:pidns_run.c name=pidns_run diff --git a/packages/s6 b/packages/s6 @@ -3,9 +3,9 @@ #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 #+patch.c2f2ffe5c9b78dce8f2a1adeca76c83dd548ffcabed790bfb6e886e9d27474bb -#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f -#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449 -#@git:3e7acf5c35999492e7feeaa59616510bf9cc51ac:s6 +#+skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a +#+execline.70f92114a71a2949f770fa2771b69b3b89b42b65cffb3247fbf2119614967ab5 +#@git:9bf94d170fd0d5540be8c6337f53ed71dbca268a:s6 #@sha256:627d1273036dc35239ba9dd1da45132e3bfce1ab8171dd27dc7952cdf09b698e:s6_clone3_newpid.patch #@sha256:64488d8562a4e98a3b299f095bb2550cff6a3d743dc2b9c5aaeea03e5b83ec33:s6_ftrigr_max.patch @@ -21,7 +21,7 @@ patch -up 1 -i ../s6_ftrigr_max.patch --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f/sysdeps' \ + --with-sysdeps='/versions/skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a/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.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 -#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f -#@git:4d081d9c2657ef40e770145f21328d37035dd774:s6-dns +#+skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a +#@git:33e4b9d9137b5dbb02a087956f1558ef30647aea:s6-dns : ${JOBS:=1} prefix=/versions/$pthbs_package @@ -14,7 +14,7 @@ cd 's6-dns' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f/sysdeps' \ + --with-sysdeps='/versions/skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a/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.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 -#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f -#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449 -#+s6.601377d341f6ee04ca2bdcdaad42df0e04456f07206dd56ba36556bd13956a22 -#@git:42a91a98b780759257862642c764c2102237fea6:s6-linux-init +#+skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a +#+execline.70f92114a71a2949f770fa2771b69b3b89b42b65cffb3247fbf2119614967ab5 +#+s6.b7c8cb4824eba8c3514f501454d6f43d6ef97a666a668a37dd45b19ba5871100 +#@git:28787fc0512f8df17809c1a0507da2bfed552082:s6-linux-init : ${JOBS:=1} prefix=/versions/$pthbs_package @@ -16,7 +16,7 @@ cd 's6-linux-init' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f/sysdeps' \ + --with-sysdeps='/versions/skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a/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.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 -#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f -#@git:964442539c3b5b7f6f13a17cbf391843ec93ce6f:s6-linux-utils +#+skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a +#@git:4ac235b523cd1b50bd681e31c8241a2b8bdd3060:s6-linux-utils : ${JOBS:=1} prefix=/versions/$pthbs_package @@ -14,7 +14,7 @@ cd 's6-linux-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f/sysdeps' \ + --with-sysdeps='/versions/skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a/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,12 +2,12 @@ #+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 -#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f -#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449 -#+s6.601377d341f6ee04ca2bdcdaad42df0e04456f07206dd56ba36556bd13956a22 -#+s6-dns.0e04114b7f9f8118d544eb4f9e2f67dc31ae9d098d5bca7c82eec5711807b6d7 +#+skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a +#+execline.70f92114a71a2949f770fa2771b69b3b89b42b65cffb3247fbf2119614967ab5 +#+s6.b7c8cb4824eba8c3514f501454d6f43d6ef97a666a668a37dd45b19ba5871100 +#+s6-dns.20518cba57d18cac6cdc54c533a419b9375c815a57d881c3174f76b9262751e1 #+libressl.712d293b92e9b1beb4a8b5905c45ea20cab64e3ddd9796f9c2781577f04771ab -#@git:68db8af7c26461d4477f482ecbc279729fa911e4:s6-networking +#@git:45079bf5ed511a3260aedc905bca3c1f15488986:s6-networking : ${JOBS:=1} prefix=/versions/$pthbs_package @@ -18,7 +18,7 @@ cd 's6-networking' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f/sysdeps' \ + --with-sysdeps='/versions/skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a/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.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 -#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f -#@git:536eea15284be9a257b6f97f971e0d8d4a7e437b:s6-portable-utils +#+skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a +#@git:00ad09ecf7ad44e32c3cc54819bbf50e944fd4f9:s6-portable-utils : ${JOBS:=1} prefix=/versions/$pthbs_package @@ -14,7 +14,7 @@ cd 's6-portable-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f/sysdeps' \ + --with-sysdeps='/versions/skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a/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,12 +2,12 @@ #+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 -#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f -#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449 -#+s6.601377d341f6ee04ca2bdcdaad42df0e04456f07206dd56ba36556bd13956a22 +#+skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a +#+execline.70f92114a71a2949f770fa2771b69b3b89b42b65cffb3247fbf2119614967ab5 +#+s6.b7c8cb4824eba8c3514f501454d6f43d6ef97a666a668a37dd45b19ba5871100 #+patch.c2f2ffe5c9b78dce8f2a1adeca76c83dd548ffcabed790bfb6e886e9d27474bb #@sha256:e921297e3411e3b4eb53d1b25601d21b1843dc89cbb9a967e7bab2605c1426ad:s6-rc_fdholder_max.patch -#@git:b79282b3746ff67c3c0df8aa32814b3688b91d4f:s6-rc +#@git:1d7cff92374a0f8f4a914d2e81de23088cf1fbd9:s6-rc : ${JOBS:=1} prefix=/versions/$pthbs_package @@ -19,7 +19,7 @@ patch -up 1 -i ../s6-rc_fdholder_max.patch --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f/sysdeps' \ + --with-sysdeps='/versions/skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/safelink b/packages/safelink @@ -2,7 +2,7 @@ #+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 -#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f +#+skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a #@sha256:4c8df9ba4d6a4a7e9042ef03e3dbf893636785f42e55391c4e4cefcb632b2467:safelink.c name=safelink diff --git a/packages/skalibs b/packages/skalibs @@ -2,7 +2,7 @@ #+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 -#@git:c555cd2ba1682f90fb5344d2865713fcd0f3c3e1:skalibs +#@git:4dcf9fa0521a1c4243c28fb2f657d8029317e55e:skalibs : ${JOBS:=1} diff --git a/packages/spawn-pty b/packages/spawn-pty @@ -2,7 +2,7 @@ #+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 -#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f +#+skalibs.a98901a2d19b3799a9c481e2be46a14642d670d9724480b81988486c71eba15a #@sha256:a6779ebb826c5e48d1023f113d5f370fe9f90788a6c5bdd05234efdcb2850ea7:spawn-pty.c name=spawn-pty diff --git a/packages/system-config b/packages/system-config @@ -5,15 +5,15 @@ #+aat.bbab9c74688b933e314ebcfd721c558b60dfbff973a9be3735750d93504ba2ef #+fileset.a274be52a358efbef7f42628a36ff98464608ab67d3bd4382323d60f9b854697 #+rsync.b356835b04c5d49533ce9cd7660fd7d61f50d1c1d527b123f46e3eb2f25d3989 -#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449 +#+execline.70f92114a71a2949f770fa2771b69b3b89b42b65cffb3247fbf2119614967ab5 #+kbd.4d0b59602cb299724eca17b59bddd6fbb1a72ad73b0103801da528856c31d461 -#+mdevd.784288d5ae7ddbed20396021e0a8be1518d386381d1141c5d3ec8b1796b6463b -#+s6-linux-utils.1061454b63433995a826b1dd134a1d9f36486f9dabb108325157e6541b6f50a7 -#+s6-rc.8de8b5eb1d1b72185b4693b874cb5477b49997800e95ab5a3035fb957e588147 -#+s6.601377d341f6ee04ca2bdcdaad42df0e04456f07206dd56ba36556bd13956a22 +#+mdevd.0dcdf8e2047a2e9d5da64ce73f1f27deb417133fa43d1ae511bd1558ebe9b115 +#+s6-linux-utils.a4874e462c911cfd79f63a86b3a14a268ed2e10ae30706cbfa50e2937d1151a3 +#+s6-rc.456d312e5472776c96ad5765c069f6e675a30103431d58a9cc9b7fdfcd88ae74 +#+s6.b7c8cb4824eba8c3514f501454d6f43d6ef97a666a668a37dd45b19ba5871100 #+zsh.2ff36a2aed3e11c13386bad0938fa166a6824f8b03b238a97b2922bca3678b2c #+system-config-scripts.67e57dfdf150bbd6e0b01d5ca3fa89f0547997a8adb2c12f7e4d67602acb161a -#+logincaps.a7749e55bc75b551e1725e3ad3d5d60de5ad36b56574c2fd9e36b163e301be12 +#+logincaps.87a17c76e4fc309d55a47abd2102b25a9bc3b87ac59f3bd0051f08ce9afc737c #@git:91e0efcb53600671030136b92b4796c1707408a5:system-config def_prefix() { @@ -52,8 +52,8 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/versions/env.c745f518390382f3f91dbc47bcbc3f1e3bdfb3fda10d58169e8d0affcd12ab5e' \ - 'pthbs_path_mdevd=/versions/env.2520c81d8057b01a4e46848ee7f7c00096441b5a1b213327694f4aa88bb59b0e' \ + 'pthbs_path_containers=/versions/env.34cab953469a8b87d79f1bfdf36f8362dd3b4847da99199ba414e3b4e06cd086' \ + 'pthbs_path_mdevd=/versions/env.0b5f61260c340a16bc2833a0cb79d77c0d1b9b60fcb91561b5cc3a5dfcf127fd' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all sort -u build/execfile | while IFS= read exename; do diff --git a/packages/system-config-init b/packages/system-config-init @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 -#+s6.601377d341f6ee04ca2bdcdaad42df0e04456f07206dd56ba36556bd13956a22 -#+s6-rc.8de8b5eb1d1b72185b4693b874cb5477b49997800e95ab5a3035fb957e588147 -#+s6-portable-utils.4c31c00a77c0b995e5d5fc4b802707b47e39e5b930a0ca22141802682d9ce592 -#+s6-linux-init.3c55d2440534aba76b2ed07fe4b33f82b8eb20372f5f0ebc9f539ebe6ebb8847 -#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449 -#+system-config-rc.1949f009633052b4858196dba185b41362e310d23ca8e590b27d4f8577dcdbd9 - -s6rcdb=/versions/system-config-rc.1949f009633052b4858196dba185b41362e310d23ca8e590b27d4f8577dcdbd9/config/s6-rc-db +#+s6.b7c8cb4824eba8c3514f501454d6f43d6ef97a666a668a37dd45b19ba5871100 +#+s6-rc.456d312e5472776c96ad5765c069f6e675a30103431d58a9cc9b7fdfcd88ae74 +#+s6-portable-utils.a43d2649a87aa0f33e3ac7f22403dda81b5912d7b793b1d7876f3b6d842dd324 +#+s6-linux-init.f8213565c54c5a4c5a2c88d721da8f33904d4b410341c35681ae5e8d42f41ad1 +#+execline.70f92114a71a2949f770fa2771b69b3b89b42b65cffb3247fbf2119614967ab5 +#+system-config-rc.12a72e25f369ffa706776f881792593f9ac5ee95e9f7423d9c811cb9a1c2f70c + +s6rcdb=/versions/system-config-rc.12a72e25f369ffa706776f881792593f9ac5ee95e9f7423d9c811cb9a1c2f70c/config/s6-rc-db prefix=/versions/$pthbs_package pkgdir="$pthbs_destdir/$prefix" diff --git a/packages/system-config-rc b/packages/system-config-rc @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 #+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded -#+s6-rc.8de8b5eb1d1b72185b4693b874cb5477b49997800e95ab5a3035fb957e588147 +#+s6-rc.456d312e5472776c96ad5765c069f6e675a30103431d58a9cc9b7fdfcd88ae74 #+fileset.a274be52a358efbef7f42628a36ff98464608ab67d3bd4382323d60f9b854697 -#+system-config.029d3d6c581660834f9c9367ed9d92f9d9cd82746ec7d7efdccbd20974509378 +#+system-config.5f52ec88f4f2f8d1c66bf4c35819c975b735d474a4141e96f2b0830c76ef3b98 def_prefix() { prefix=/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/versions/system-config.029d3d6c581660834f9c9367ed9d92f9d9cd82746ec7d7efdccbd20974509378/config/s6-rc-source +src=/versions/system-config.5f52ec88f4f2f8d1c66bf4c35819c975b735d474a4141e96f2b0830c76ef3b98/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" diff --git a/packages/userspace.environment b/packages/userspace.environment @@ -6,23 +6,23 @@ #+flex.1ec95ce5516c7871d0757dc9ffc02f3a8795a765ad7936c23a6e2688e7d3afd0 #+bison.fed01ec0597b5f4443ca53edb88e09263e1edbec32cb3bdc2d7c8642c295ab64 #+rsync.b356835b04c5d49533ce9cd7660fd7d61f50d1c1d527b123f46e3eb2f25d3989 -#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449 -#+s6.601377d341f6ee04ca2bdcdaad42df0e04456f07206dd56ba36556bd13956a22 -#+s6-rc.8de8b5eb1d1b72185b4693b874cb5477b49997800e95ab5a3035fb957e588147 -#+s6-portable-utils.4c31c00a77c0b995e5d5fc4b802707b47e39e5b930a0ca22141802682d9ce592 -#+s6-linux-utils.1061454b63433995a826b1dd134a1d9f36486f9dabb108325157e6541b6f50a7 -#+s6-linux-init.3c55d2440534aba76b2ed07fe4b33f82b8eb20372f5f0ebc9f539ebe6ebb8847 -#+mdevd.784288d5ae7ddbed20396021e0a8be1518d386381d1141c5d3ec8b1796b6463b -#+s6-dns.0e04114b7f9f8118d544eb4f9e2f67dc31ae9d098d5bca7c82eec5711807b6d7 +#+execline.70f92114a71a2949f770fa2771b69b3b89b42b65cffb3247fbf2119614967ab5 +#+s6.b7c8cb4824eba8c3514f501454d6f43d6ef97a666a668a37dd45b19ba5871100 +#+s6-rc.456d312e5472776c96ad5765c069f6e675a30103431d58a9cc9b7fdfcd88ae74 +#+s6-portable-utils.a43d2649a87aa0f33e3ac7f22403dda81b5912d7b793b1d7876f3b6d842dd324 +#+s6-linux-utils.a4874e462c911cfd79f63a86b3a14a268ed2e10ae30706cbfa50e2937d1151a3 +#+s6-linux-init.f8213565c54c5a4c5a2c88d721da8f33904d4b410341c35681ae5e8d42f41ad1 +#+mdevd.0dcdf8e2047a2e9d5da64ce73f1f27deb417133fa43d1ae511bd1558ebe9b115 +#+s6-dns.20518cba57d18cac6cdc54c533a419b9375c815a57d881c3174f76b9262751e1 #+libressl.712d293b92e9b1beb4a8b5905c45ea20cab64e3ddd9796f9c2781577f04771ab -#+s6-networking.09cc6b051d87cc67eaa6878833b4934be6b14735f3e5f855e4e63274609df811 +#+s6-networking.374cb3dd9bf6f0e6919750ce78f1581419d6b73a5eb31bbe0a8325042d054708 #+zsh.2ff36a2aed3e11c13386bad0938fa166a6824f8b03b238a97b2922bca3678b2c #+pthbs-banginstall.0190099d7db974b8ac922bc571bb572989f6a7e1018400f466173a158a98224c #+aat.bbab9c74688b933e314ebcfd721c558b60dfbff973a9be3735750d93504ba2ef #+confz.208d2a701777a5703ca126f9fee4220610a9fb2b5241c5850d66a92bc0e682b2 -#+containers.9413687dafb3cb8e62ce26406af1da0451d5306505ba2d5003fd454926a0da68 +#+containers.6a19c27caf25c0011e68edddd603e97e45d66bdad44a9994cd1bce527a508c1f #+fileset.a274be52a358efbef7f42628a36ff98464608ab67d3bd4382323d60f9b854697 -#+logincaps.a7749e55bc75b551e1725e3ad3d5d60de5ad36b56574c2fd9e36b163e301be12 +#+logincaps.87a17c76e4fc309d55a47abd2102b25a9bc3b87ac59f3bd0051f08ce9afc737c #+snaprep.4f1281cfb76562b94e47b6c021584d870be9c2900bd8d52db40848f58b5f7812 #+curl.b82f818e85570a561ca20ca417adba2f1c3214ef5c3e01626c0a4aa099b90f0c #+git.1839db7305bbee32d184adc0ece64d40ab58132d3c7749b426c4d680659bd4eb @@ -32,7 +32,7 @@ #+getconf.d16039d91561f2bb7f430eb2250f1e7c03d59ddeea80a9c55c21e293fb528fd9 #+iconv.0b381a2e57a5e7b3df6b6a68d72230eec4e5ef2f6a460509c94d3d502fe1f2cf #+libcap.3528f93ae9873fceae62855cb7c0fa521ac2c3cfabe71bf58ba01483136bf5fd -#+applyuidgid-caps.25f0135c22be3d3dcd34e06378e41b98cdc5201319131e99da81ae2af1af7767 -#+nosuid.0e8db424c6fe3c4f9543a126159dc59afc81fc28df33e5287121d28f71c574b5 -#+spawn-pty.e94a519d34a637d5fe414c4ee679553a3d88379220a91fd829a81d4a92e87535 -#+safelink.b5608f8fa5323d8da3360249d11c514def4c576fa0c0a625c2ca3ec13bcb66e7- \ No newline at end of file +#+applyuidgid-caps.fe109b95cac5af0f41bba16226eca0676403a4feb28d19fb8e99f7da963eb7db +#+nosuid.043751ada878991cd21fb39bd6185243f18d379283e9ae31bfc5c008294f898d +#+spawn-pty.852b5f65e2bb9d2ce02dd3831d10a0906f65b664759633ca7b6f23a9074441d9 +#+safelink.ed982768fcc22ce38687fc638d09eabc5df4081548f797241c1f16e7935913aa+ \ No newline at end of file diff --git a/templates/pkg/s6 b/templates/pkg/s6 @@ -7,15 +7,11 @@ #+{{pkg_install_name("skalibs")}} #+{{pkg_install_name("execline")}} #@git:{{submodule.current.s6}}:s6 -#@sha256:{{files["s6_clone3_newpid.patch"]}}:s6_clone3_newpid.patch -#@sha256:{{files["s6_ftrigr_max.patch"]}}:s6_ftrigr_max.patch : ${JOBS:=1} prefix={{versions}}/$pthbs_package cd s6 -patch -up 1 -i ../s6_clone3_newpid.patch -patch -up 1 -i ../s6_ftrigr_max.patch ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \