pthbs

commit 47566c7f4a206f44f13ff3dd8176989a8f603220
parent 720d3920c96eb65be2adab8b4e9d9e57baa55f3d
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Thu, 22 Feb 2024 15:21:21 +0100

curl libressl, generate envdir in environments with PATH

Diffstat:
M
README
 | 
2
+-
M
command/pthbs-makegen
 | 
3
++-
M
packages/curl
 | 
1
+
M
packages/default.environment
 | 
2
+-
M
packages/userspace.environment
 | 
4
++--
M
templates/pkg/curl
 | 
1
+

6 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/README b/README
@@ -123,7 +123,7 @@ Packaged software
 * netbsd-curses
 * zsh
 * s6-networking
-* libretls
+* libressl
 
 Work in progress
 ~~~~~~~~~~~~~~~~
diff --git a/command/pthbs-makegen b/command/pthbs-makegen
@@ -83,7 +83,8 @@ function make_envfile(    n, envfile, envhash) {
 	}
 	printf "\n\t@%s", "printf "q("Creating environment for %s => %s\\n")" "q(FILENAME)" "q("$(VERSIONS)/env."envhash)
 	printf "\n\t%s", "if test -e "q("$(VERSIONS)/env."envhash)"; then rm -r "q("$(VERSIONS)/env."envhash)"; fi"
-	printf "\n\t%s", "mkdir -p "q("$(VERSIONS)/env."envhash)
+	printf "\n\t%s", "mkdir -p "q("$(VERSIONS)/env."envhash"/env")
+	printf "\n\t%s", "printf \"%s\\n\" >"q("$(VERSIONS)/env."envhash"/env/PATH")" "q("$(VERSIONS)/env."envhash)
 	for(n=1; n<=env_count; n++) {
 		printf "\n\t%s", "pthbs-link "q("$(VERSIONS)/"env[n])" "q("$(VERSIONS)/env."envhash)
 	}
diff --git a/packages/curl b/packages/curl
@@ -4,6 +4,7 @@
 #+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
 #+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
 #+m4.b4d536e5f08f9c11575bfc61d943c9714bc556ed473eedb0520288720ff13871
+#+libressl.a087ee244e4ac7ad15304e99e603fa31a783a58b671a7ce6add769036c525298
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 autotools() {
diff --git a/packages/default.environment b/packages/default.environment
@@ -24,7 +24,7 @@
 #+fileset.f6f04ce01f2f3903f917b62be00ae696e8692478b44f946528379ebbb426eea0
 #+logincaps.8e9f7e96eef8efbff3010abce4a360be2ab9c8675e2f90aaf4375bebf32e16f3
 #+snaprep.9fc58ee4729913adada7f715d37f7af5b6ef324f46e73b27ea939323b83c5a46
-#+curl.553ea6c5776b203a60ab36bc0261881bacc6f6e3c52290f324977fcf81ef0cb9
+#+curl.7134811bdafd819c8dca35c50b18885c3704765fe3220cfc125f27d1aafd31f9
 #+linux.c21eb54792cc5b7c4df9de554a3c4b1bd6f15cf18764d359b9dafaa017d6d863
 #+core-system-conf.ee44833f65709792d6a577809e1b59b2d21c647b8a9c34ca560c351bea6ddc85
 #+core-system-rc.d1343a44b2baa7d2732a7de0df109009c04d81dbe6d22964887f5af83598179c
diff --git a/packages/userspace.environment b/packages/userspace.environment
@@ -24,4 +24,4 @@
 #+fileset.f6f04ce01f2f3903f917b62be00ae696e8692478b44f946528379ebbb426eea0
 #+logincaps.8e9f7e96eef8efbff3010abce4a360be2ab9c8675e2f90aaf4375bebf32e16f3
 #+snaprep.9fc58ee4729913adada7f715d37f7af5b6ef324f46e73b27ea939323b83c5a46
-#+curl.553ea6c5776b203a60ab36bc0261881bacc6f6e3c52290f324977fcf81ef0cb9-
\ No newline at end of file
+#+curl.7134811bdafd819c8dca35c50b18885c3704765fe3220cfc125f27d1aafd31f9+
\ No newline at end of file
diff --git a/templates/pkg/curl b/templates/pkg/curl
@@ -1,5 +1,6 @@
 {% extends "autotools" %}
 {%- block extra_deps %}
+#+{{pkg_install_name("libressl")}}
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 {%- endblock %}
 {% block at_script %}