mrrl

commit a772f415273ff0e756b1d0ddc6cbd4022c64b9af
parent 447254d1aa6809ebb3f34aa372d7fb696bb97f61
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Sat,  3 May 2025 15:45:02 +0000

Create directory for kernel image

Diffstat:
M
templates/pkg/linux
 | 
6
++++--
M
variants/ccx-x86_64/kernel.environment
 | 
4
++--
M
variants/ccx-x86_64/linux
 | 
4
++--
M
variants/root-x86_64/kernel.environment
 | 
4
++--
M
variants/root-x86_64/linux
 | 
4
++--

5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/templates/pkg/linux b/templates/pkg/linux
@@ -27,9 +27,8 @@ diff -u ../linux.config .config || true
 linux64 {{make}}
 
 installdir="$pthbs_destdir/{{versions}}/$pthbs_package"
-mkdir -p "$installdir"
+mkdir -p "$installdir/doc" "$installdir/boot"
 cp -v .config "$installdir/config"
-mkdir -p "$installdir/doc"
 mv Documentation/* "$installdir/doc"
 linux64 make modules_install install \
 	INSTALL_MOD_PATH="$installdir" \
@@ -37,3 +36,6 @@ linux64 make modules_install install \
 	INSTALL_PATH="$installdir"/boot \
 	INSTALL_DTBS_PATH="$installdir/boot/dtbs"
 {% endblock %}
+{% block rules %}
+$2 == "boot" { link($0); next }
+{% endblock -%}
diff --git a/variants/ccx-x86_64/kernel.environment b/variants/ccx-x86_64/kernel.environment
@@ -1,2 +1,2 @@
 #!/usr/bin/env pthbs-build
-#+linux.345c2e29180a611baa04258ff02e9fb1678b91b67c4db4cf2b24de2dbcb7b6e7-
\ No newline at end of file
+#+linux.b56063db4f3011b84b966b07cdc02315029d49dde4f7e8b2750cc32c5b022e2d+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux
@@ -26,9 +26,8 @@ diff -u ../linux.config .config || true
 linux64 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
 installdir="$pthbs_destdir//home/ccx/versions/$pthbs_package"
-mkdir -p "$installdir"
+mkdir -p "$installdir/doc" "$installdir/boot"
 cp -v .config "$installdir/config"
-mkdir -p "$installdir/doc"
 mv Documentation/* "$installdir/doc"
 linux64 make modules_install install \
 	INSTALL_MOD_PATH="$installdir" \
@@ -57,6 +56,7 @@ function link(src) {
 $1!="."{exit 1}
 
 
+$2 == "boot" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
 
diff --git a/variants/root-x86_64/kernel.environment b/variants/root-x86_64/kernel.environment
@@ -1,2 +1,2 @@
 #!/usr/bin/env pthbs-build
-#+linux.c2c84e3ac28bfa3efd26dad0f78bccfda349a5b1cf2fb90c296b755d38850f65-
\ No newline at end of file
+#+linux.dd3155e94b4911b4ff4c0f7a26847572395a8efe8dfaa9a990272a620aec954a+
\ No newline at end of file
diff --git a/variants/root-x86_64/linux b/variants/root-x86_64/linux
@@ -26,9 +26,8 @@ diff -u ../linux.config .config || true
 linux64 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
 installdir="$pthbs_destdir//versions/$pthbs_package"
-mkdir -p "$installdir"
+mkdir -p "$installdir/doc" "$installdir/boot"
 cp -v .config "$installdir/config"
-mkdir -p "$installdir/doc"
 mv Documentation/* "$installdir/doc"
 linux64 make modules_install install \
 	INSTALL_MOD_PATH="$installdir" \
@@ -57,6 +56,7 @@ function link(src) {
 $1!="."{exit 1}
 
 
+$2 == "boot" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }