* Re: [PR PATCH] [Updated] linux6.{6..8}: sign-file utility requires pkg-config
2024-03-23 23:36 [PR PATCH] linux6.{6..8}: sign-file utility requires pkg-config classabbyamp
2024-03-24 0:36 ` classabbyamp
@ 2024-03-25 2:52 ` classabbyamp
2024-03-25 22:41 ` [PR PATCH] [Merged]: linux6.{6..8}: fix module signing classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: classabbyamp @ 2024-03-25 2:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 818 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages linux-sign-file
https://github.com/void-linux/void-packages/pull/49491
linux6.{6..8}: sign-file utility requires pkg-config
so it can find libcrypto: https://github.com/torvalds/linux/blob/2dde18cd1d8fac735875f2e4987f11817cc0bc2c/scripts/Makefile#L25-L26
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
```
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/49491.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-linux-sign-file-49491.patch --]
[-- Type: text/x-diff, Size: 5621 bytes --]
From 4490b0f38c83e4785339fcbaccaa91d5fef04672 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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 <void@placeviolette.net>
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 <void@placeviolette.net>
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
)
^ permalink raw reply [flat|nested] 4+ messages in thread