mrrl

commit aaf4c972d2b7e94fba1a02f21fcd3d65b5e8359b
parent b0eee9a4e6f21a84577d11675c8b68f10130e57e
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Thu, 29 May 2025 13:12:55 +0000

Do not needlessly set arch/personality

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

9 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/templates/linux b/templates/linux
@@ -26,9 +26,9 @@ unxz -c < '../patch-{{ patch_version }}.xz' | patch -p1 -N
 {% endif -%}
 patch -p1 -N <../noobjtool.patch
 cp -v ../linux.config .config
-linux64 make olddefconfig
+{{ linux_arch_personality|default('') }} make olddefconfig
 diff -u ../linux.config .config || true
-linux64 {{make}} \
+{{ linux_arch_personality|default('') }} {{make}} \
 	V=1 \
 	HOSTLDFLAGS="-static -L$pthbs_build_environment/library" \
 	HOSTCFLAGS="-L$pthbs_build_environment/library"
@@ -37,7 +37,7 @@ installdir="$pthbs_destdir/{{versions}}/$pthbs_package"
 mkdir -p "$installdir/doc/linux" "$installdir/boot"
 cp -v .config "$installdir/config"
 mv Documentation/* "$installdir/doc/linux"
-linux64 make modules_install install \
+{{ linux_arch_personality|default('') }} make modules_install install \
 	INSTALL_MOD_PATH="$installdir" \
 	INSTALL_MOD_STRIP=1 \
 	INSTALL_PATH="$installdir"/boot \
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.333fd2e284d1530889db5295c29fca5f9db2d6e8a7a4a7ca4e33cecb564990b4-
\ No newline at end of file
+#+linux.ba9e328ef8f4c691461b95166e9edf9386e55a4af90a81118326c628e3e8b68e+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux
@@ -21,9 +21,9 @@ cd 'linux-6.1'
 unxz -c < '../patch-6.1.34.xz' | patch -p1 -N
 patch -p1 -N <../noobjtool.patch
 cp -v ../linux.config .config
-linux64 make olddefconfig
+ make olddefconfig
 diff -u ../linux.config .config || true
-linux64 make -j${JOBS:-1} -l$((1+${JOBS:-1})) \
+ make -j${JOBS:-1} -l$((1+${JOBS:-1})) \
 	V=1 \
 	HOSTLDFLAGS="-static -L$pthbs_build_environment/library" \
 	HOSTCFLAGS="-L$pthbs_build_environment/library"
@@ -32,7 +32,7 @@ installdir="$pthbs_destdir//home/ccx/versions/$pthbs_package"
 mkdir -p "$installdir/doc/linux" "$installdir/boot"
 cp -v .config "$installdir/config"
 mv Documentation/* "$installdir/doc/linux"
-linux64 make modules_install install \
+ make modules_install install \
 	INSTALL_MOD_PATH="$installdir" \
 	INSTALL_MOD_STRIP=1 \
 	INSTALL_PATH="$installdir"/boot \
diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest
@@ -19,9 +19,9 @@ export CPATH="$pthbs_build_environment/include"
 cd 'linux-6.15'
 patch -p1 -N <../noobjtool.patch
 cp -v ../linux.config .config
-linux64 make olddefconfig
+ make olddefconfig
 diff -u ../linux.config .config || true
-linux64 make -j${JOBS:-1} -l$((1+${JOBS:-1})) \
+ make -j${JOBS:-1} -l$((1+${JOBS:-1})) \
 	V=1 \
 	HOSTLDFLAGS="-static -L$pthbs_build_environment/library" \
 	HOSTCFLAGS="-L$pthbs_build_environment/library"
@@ -30,7 +30,7 @@ installdir="$pthbs_destdir//home/ccx/versions/$pthbs_package"
 mkdir -p "$installdir/doc/linux" "$installdir/boot"
 cp -v .config "$installdir/config"
 mv Documentation/* "$installdir/doc/linux"
-linux64 make modules_install install \
+ make modules_install install \
 	INSTALL_MOD_PATH="$installdir" \
 	INSTALL_MOD_STRIP=1 \
 	INSTALL_PATH="$installdir"/boot \
diff --git a/variants/ccx-x86_64/vm.environment b/variants/ccx-x86_64/vm.environment
@@ -1,2 +1,2 @@
 #!/usr/bin/env pthbs-build
-#+linux-qemu-guest.ed187736439b7d90daab75a7afe96dd343d72f9fd6c450772c175f5d9d1347f2-
\ No newline at end of file
+#+linux-qemu-guest.73b3a66be26bb0c0efa211f1782c4a8d6998a9e8c56176d899512b3336bd1715+
\ No newline at end of file
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.5adc78399e0abbdedbf4412f196ce93ad4292ae8e770d3f68488e7f2bf54f037-
\ No newline at end of file
+#+linux.d71e86e942886d3c92c5ca9ed5add9ff8457d1decc60e9163a2f1046c23112f5+
\ No newline at end of file
diff --git a/variants/root-x86_64/linux b/variants/root-x86_64/linux
@@ -21,9 +21,9 @@ cd 'linux-6.1'
 unxz -c < '../patch-6.1.34.xz' | patch -p1 -N
 patch -p1 -N <../noobjtool.patch
 cp -v ../linux.config .config
-linux64 make olddefconfig
+ make olddefconfig
 diff -u ../linux.config .config || true
-linux64 make -j${JOBS:-1} -l$((1+${JOBS:-1})) \
+ make -j${JOBS:-1} -l$((1+${JOBS:-1})) \
 	V=1 \
 	HOSTLDFLAGS="-static -L$pthbs_build_environment/library" \
 	HOSTCFLAGS="-L$pthbs_build_environment/library"
@@ -32,7 +32,7 @@ installdir="$pthbs_destdir//versions/$pthbs_package"
 mkdir -p "$installdir/doc/linux" "$installdir/boot"
 cp -v .config "$installdir/config"
 mv Documentation/* "$installdir/doc/linux"
-linux64 make modules_install install \
+ make modules_install install \
 	INSTALL_MOD_PATH="$installdir" \
 	INSTALL_MOD_STRIP=1 \
 	INSTALL_PATH="$installdir"/boot \
diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest
@@ -19,9 +19,9 @@ export CPATH="$pthbs_build_environment/include"
 cd 'linux-6.15'
 patch -p1 -N <../noobjtool.patch
 cp -v ../linux.config .config
-linux64 make olddefconfig
+ make olddefconfig
 diff -u ../linux.config .config || true
-linux64 make -j${JOBS:-1} -l$((1+${JOBS:-1})) \
+ make -j${JOBS:-1} -l$((1+${JOBS:-1})) \
 	V=1 \
 	HOSTLDFLAGS="-static -L$pthbs_build_environment/library" \
 	HOSTCFLAGS="-L$pthbs_build_environment/library"
@@ -30,7 +30,7 @@ installdir="$pthbs_destdir//versions/$pthbs_package"
 mkdir -p "$installdir/doc/linux" "$installdir/boot"
 cp -v .config "$installdir/config"
 mv Documentation/* "$installdir/doc/linux"
-linux64 make modules_install install \
+ make modules_install install \
 	INSTALL_MOD_PATH="$installdir" \
 	INSTALL_MOD_STRIP=1 \
 	INSTALL_PATH="$installdir"/boot \
diff --git a/variants/root-x86_64/vm.environment b/variants/root-x86_64/vm.environment
@@ -1,2 +1,2 @@
 #!/usr/bin/env pthbs-build
-#+linux-qemu-guest.397272d894d1bebc318254d2529111bd90d36ffd54a27c89a743a4d0e6d35053-
\ No newline at end of file
+#+linux-qemu-guest.55c250a7b6dbfc1b71b4d8f6983502c2a2dc606b50025483996f9e0d719a42bc+
\ No newline at end of file