mrrl

commit 5c719d83ed5e8aa1acac81aa0588f5db9e1f8bc8
parent b2f2e5edcab647be9709433eb193df1dc456848e
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Sat, 29 Nov 2025 14:23:17 +0000

Update genlinks matches

Diffstat:
M
templates/genlinks
 | 
28
++++++++++++++--------------
M
templates/linux
 | 
4
++--
M
templates/pkg/alpine-keys
 | 
2
+-
M
templates/pkg/ca-certificates-wip-donotuse
 | 
2
+-
M
templates/pkg/xbps
 | 
2
+-
M
templates/pkg/zsh
 | 
2
+-

6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/templates/genlinks b/templates/genlinks
@@ -31,27 +31,27 @@ $1!="."{exit 1}
 
 {% block genlinks_rules -%}
 {% endblock genlinks_rules %}
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
+$2 == "{{configdir}}" { link($0); next }
+$2 == "{{keysdir}}" { link($0); next }
+$2 == "{{zshdir}}" { link($0); next }
 $2 == "env" { link($0); next }
-$2 == "command" { link($0); next }
-$2 == "bin" { link(s1("command", $0)); next }
+$2 == "{{bindir}}" { link($0); next }
+$2 == "bin" { link(s1("{{bindir}}", $0)); next }
 
-$2 == "library.so" { link($0); next }
-$2 == "library" { link($0); next }
-$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
-$2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "{{dynlibdir}}" { link($0); next }
+$2 == "{{libdir}}" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("{{libdir}}", $0)); next }
+$2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("{{dynlibdir}}", $0)); next }
 
 $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
 
-$2 == "man" { link($0); next }
-$2 == "info" { link($0); next }
-$2 == "doc" { link($0); next }
+$2 == "{{mandir}}" { link($0); next }
+$2 == "{{infodir}}" { link($0); next }
+$2 == "{{docdir}}" { link($0); next }
 $2 == "icons" { link($0); next }
 $2 == "terminfo" { link($0); next }
-$2 == "data" { link($0); next }
-$2 == "include" { link($0); next }
+$2 == "{{datadir}}" { link($0); next }
+$2 == "{{includedir}}" { link($0); next }
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/templates/linux b/templates/linux
@@ -64,13 +64,13 @@ ls -lhA "$module_dir"
 
 {% endblock install %}
 {% block genlinks_rules %}
-$2 == "boot" { link($0); next }
+$2 == "{{kernel_image_path}}" { link($0); next }
 $2 == "lib" && $3 == "modules" { exit 3 }  # make sure kernel modules do not mix with userspace libraries
 function mod_path(s) {
 	sub("^[.]/{{kernel_mod_path}}/lib/", "./{{kernel_mod_path}}/", s)
 	return s
 }
-$2 == "kernel" && $3 == "lib" && $4 == "modules" { link(mod_path($0)); next }
+$2 == "{{kernel_mod_path}}" && $3 == "lib" && $4 == "modules" { link(mod_path($0)); next }
 {% endblock genlinks_rules -%}
 {% block genlinks_begin %}
 	kernel_name="{{ assertion(patch_version|default(tarball_version + ".0", True)) }}"
diff --git a/templates/pkg/alpine-keys b/templates/pkg/alpine-keys
@@ -11,5 +11,5 @@ mv keys "${dest}/{{keysdir}}/alpine"
 	x["./{{keysdir}}/alpine/alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub"]=1
 {% endblock %}
 {% block genlinks_rules %}
-$2 == "keys" { link($0); next }
+$2 == "{{keysdir}}" { link($0); next }
 {% endblock -%}
diff --git a/templates/pkg/ca-certificates-wip-donotuse b/templates/pkg/ca-certificates-wip-donotuse
@@ -19,7 +19,7 @@ done
 
 {% endblock %}
 {% block genlinks_rules %}
-$2 == "config" { link($0); next }
+$2 == "{{configdir}}" { link($0); next }
 {% endblock -%}
 {% block genlinks_begin %}
 	x["./{{ssldir}}/certs/ISRG_Root_X1.crt"]=1
diff --git a/templates/pkg/xbps b/templates/pkg/xbps
@@ -56,5 +56,5 @@ mv -v "$pthbs_destdir/var/db/xbps/{{keysdir}}" "$dest/{{keysdir}}/void"
 	x["./{{bindir}}/xbps-install.static"]=1
 {% endblock %}
 {% block genlinks_rules %}
-$2 == "keys" { link($0); next }
+$2 == "{{keysdir}}" { link($0); next }
 {% endblock -%}
diff --git a/templates/pkg/zsh b/templates/pkg/zsh
@@ -57,6 +57,6 @@ check_static command/zsh
 	x["./{{mandir}}/man1/zshall.1"]=1
 {% endblock %}
 {% block genlinks_rules %}
-$2 == "zsh" { link($0); next }
+$2 == "{{zshdir}}" { link($0); next }
 $2 == ".env-template" { link($0); next }
 {% endblock -%}