From 4490b0f38c83e4785339fcbaccaa91d5fef04672 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 23 Mar 2024 19:32:09 -0400 Subject: [PATCH 1/3] linux6.6: fix module signing sign-file needs pkg-config to find libcrypto on cross, it is removed by make _mrproper_scripts, so copy it to XBPS_WRAPPERDIR before running that. failure symptom: /void-packages/srcpkgs/linux6.8/files/mv-debug: line 7: /builddir/linux6.8-6.8.1/scripts/sign-file: No such file or directory --- srcpkgs/linux6.6/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux6.6/template b/srcpkgs/linux6.6/template index 903bcb457a83c2..174016326fd16d 100644 --- a/srcpkgs/linux6.6/template +++ b/srcpkgs/linux6.6/template @@ -27,7 +27,7 @@ noshlibprovides=yes preserve=yes hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel - openssl-devel perl uboot-mkimage cpio pahole python3 zstd" + pkg-config openssl-devel perl uboot-mkimage cpio pahole python3 zstd" _kernver="${version}_${revision}" triggers="kernel-hooks" @@ -208,6 +208,9 @@ do_install() { mkdir -p ${hdrdest}/arch/${arch} cp -a arch/${arch}/include ${hdrdest}/arch/${arch} + # needed for mv-debug + cp scripts/sign-file "${XBPS_WRAPPERDIR}" + # Remove helper binaries built for host, # if generated files from the scripts/ directory need to be included, # they need to be copied to ${hdrdest} before this step @@ -311,7 +314,7 @@ do_install() { ( cd ${DESTDIR} export DESTDIR - export SIGN_FILE="${wrksrc}/scripts/sign-file sha512 ${wrksrc}/certs/signing_key.pem ${wrksrc}/certs/signing_key.x509" + export SIGN_FILE="${XBPS_WRAPPERDIR}/sign-file sha512 ${wrksrc}/certs/signing_key.pem ${wrksrc}/certs/signing_key.x509" find ./ -name '*.ko' -print0 | \ xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug ) From 1b2807f226f5df17bb1992fda526587d01374f9b Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 23 Mar 2024 19:33:53 -0400 Subject: [PATCH 2/3] linux6.7: fix module signing sign-file needs pkg-config to find libcrypto on cross, it is removed by make _mrproper_scripts, so copy it to XBPS_WRAPPERDIR before running that. failure symptom: /void-packages/srcpkgs/linux6.8/files/mv-debug: line 7: /builddir/linux6.8-6.8.1/scripts/sign-file: No such file or directory --- srcpkgs/linux6.7/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux6.7/template b/srcpkgs/linux6.7/template index 0e9800fdaedc2e..b49cb06112d271 100644 --- a/srcpkgs/linux6.7/template +++ b/srcpkgs/linux6.7/template @@ -27,7 +27,7 @@ noshlibprovides=yes preserve=yes hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel - openssl-devel perl uboot-mkimage cpio pahole python3 zstd" + pkg-config openssl-devel perl uboot-mkimage cpio pahole python3 zstd" _kernver="${version}_${revision}" triggers="kernel-hooks" @@ -211,6 +211,9 @@ do_install() { mkdir -p ${hdrdest}/arch/${arch} cp -a arch/${arch}/include ${hdrdest}/arch/${arch} + # needed for mv-debug + cp scripts/sign-file "${XBPS_WRAPPERDIR}" + # Remove helper binaries built for host, # if generated files from the scripts/ directory need to be included, # they need to be copied to ${hdrdest} before this step @@ -314,7 +317,7 @@ do_install() { ( cd ${DESTDIR} export DESTDIR - export SIGN_FILE="${wrksrc}/scripts/sign-file sha512 ${wrksrc}/certs/signing_key.pem ${wrksrc}/certs/signing_key.x509" + export SIGN_FILE="${XBPS_WRAPPERDIR}/sign-file sha512 ${wrksrc}/certs/signing_key.pem ${wrksrc}/certs/signing_key.x509" find ./ -name '*.ko' -print0 | \ xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug ) From 7e32bfed42fe768325dcfb030c09a1c0b196f1d2 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 23 Mar 2024 19:34:08 -0400 Subject: [PATCH 3/3] linux6.8: fix module signing sign-file needs pkg-config to find libcrypto on cross, it is removed by make _mrproper_scripts, so copy it to XBPS_WRAPPERDIR before running that. failure symptom: /void-packages/srcpkgs/linux6.8/files/mv-debug: line 7: /builddir/linux6.8-6.8.1/scripts/sign-file: No such file or directory --- srcpkgs/linux6.8/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux6.8/template b/srcpkgs/linux6.8/template index d060a08f883d4c..39857b710777c2 100644 --- a/srcpkgs/linux6.8/template +++ b/srcpkgs/linux6.8/template @@ -27,7 +27,7 @@ noshlibprovides=yes preserve=yes hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel - openssl-devel perl uboot-mkimage cpio pahole python3 zstd" + pkg-config openssl-devel perl uboot-mkimage cpio pahole python3 zstd" _kernver="${version}_${revision}" triggers="kernel-hooks" @@ -211,6 +211,9 @@ do_install() { mkdir -p ${hdrdest}/arch/${arch} cp -a arch/${arch}/include ${hdrdest}/arch/${arch} + # needed for mv-debug + cp scripts/sign-file "${XBPS_WRAPPERDIR}" + # Remove helper binaries built for host, # if generated files from the scripts/ directory need to be included, # they need to be copied to ${hdrdest} before this step @@ -314,7 +317,7 @@ do_install() { ( cd ${DESTDIR} export DESTDIR - export SIGN_FILE="${wrksrc}/scripts/sign-file sha512 ${wrksrc}/certs/signing_key.pem ${wrksrc}/certs/signing_key.x509" + export SIGN_FILE="${XBPS_WRAPPERDIR}/sign-file sha512 ${wrksrc}/certs/signing_key.pem ${wrksrc}/certs/signing_key.x509" find ./ -name '*.ko' -print0 | \ xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug )