Skip to content

Commit f61c604

Browse files
DoridianDoridian
authored
Adjust kernel public key name (#531)
1 parent 5c217f6 commit f61c604

File tree

10 files changed

+50
-20
lines changed

10 files changed

+50
-20
lines changed

‎linux-cachyos-bmq/PKGBUILD

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,11 @@ prepare() {
470470
_sign_modules() {
471471
msg2 "Signing modules in $1"
472472
local sign_script="${srcdir}/${_srcname}/scripts/sign-file"
473-
local sign_key="${srcdir}/${_srcname}/$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
474-
local sign_cert="$(echo "$sign_key" | sed 's/\.pem$/.x509/')"
473+
local sign_key="$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
474+
if [[ ! "$sign_key" =~ ^/ ]]; then
475+
sign_key="${srcdir}/${_srcname}/${sign_key}"
476+
fi
477+
local sign_cert="${srcdir}/${_srcname}/certs/signing_key.x509"
475478
local hash_algo="$(grep -Po 'CONFIG_MODULE_SIG_HASH="\K[^"]*' "${srcdir}/${_srcname}/.config")"
476479

477480
find "$1" -type f -name '*.ko' -print -exec \

‎linux-cachyos-bore/PKGBUILD

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,11 @@ prepare() {
470470
_sign_modules() {
471471
msg2 "Signing modules in $1"
472472
local sign_script="${srcdir}/${_srcname}/scripts/sign-file"
473-
local sign_key="${srcdir}/${_srcname}/$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
474-
local sign_cert="$(echo "$sign_key" | sed 's/\.pem$/.x509/')"
473+
local sign_key="$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
474+
if [[ ! "$sign_key" =~ ^/ ]]; then
475+
sign_key="${srcdir}/${_srcname}/${sign_key}"
476+
fi
477+
local sign_cert="${srcdir}/${_srcname}/certs/signing_key.x509"
475478
local hash_algo="$(grep -Po 'CONFIG_MODULE_SIG_HASH="\K[^"]*' "${srcdir}/${_srcname}/.config")"
476479

477480
find "$1" -type f -name '*.ko' -print -exec \

‎linux-cachyos-deckify/PKGBUILD

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,8 +471,11 @@ prepare() {
471471
_sign_modules() {
472472
msg2 "Signing modules in $1"
473473
local sign_script="${srcdir}/${_srcname}/scripts/sign-file"
474-
local sign_key="${srcdir}/${_srcname}/$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
475-
local sign_cert="$(echo "$sign_key" | sed 's/\.pem$/.x509/')"
474+
local sign_key="$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
475+
if [[ ! "$sign_key" =~ ^/ ]]; then
476+
sign_key="${srcdir}/${_srcname}/${sign_key}"
477+
fi
478+
local sign_cert="${srcdir}/${_srcname}/certs/signing_key.x509"
476479
local hash_algo="$(grep -Po 'CONFIG_MODULE_SIG_HASH="\K[^"]*' "${srcdir}/${_srcname}/.config")"
477480

478481
find "$1" -type f -name '*.ko' -print -exec \

‎linux-cachyos-eevdf/PKGBUILD

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,11 @@ prepare() {
470470
_sign_modules() {
471471
msg2 "Signing modules in $1"
472472
local sign_script="${srcdir}/${_srcname}/scripts/sign-file"
473-
local sign_key="${srcdir}/${_srcname}/$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
474-
local sign_cert="$(echo "$sign_key" | sed 's/\.pem$/.x509/')"
473+
local sign_key="$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
474+
if [[ ! "$sign_key" =~ ^/ ]]; then
475+
sign_key="${srcdir}/${_srcname}/${sign_key}"
476+
fi
477+
local sign_cert="${srcdir}/${_srcname}/certs/signing_key.x509"
475478
local hash_algo="$(grep -Po 'CONFIG_MODULE_SIG_HASH="\K[^"]*' "${srcdir}/${_srcname}/.config")"
476479

477480
find "$1" -type f -name '*.ko' -print -exec \

‎linux-cachyos-hardened/PKGBUILD

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,11 @@ prepare() {
470470
_sign_modules() {
471471
msg2 "Signing modules in $1"
472472
local sign_script="${srcdir}/${_srcname}/scripts/sign-file"
473-
local sign_key="${srcdir}/${_srcname}/$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
474-
local sign_cert="$(echo "$sign_key" | sed 's/\.pem$/.x509/')"
473+
local sign_key="$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
474+
if [[ ! "$sign_key" =~ ^/ ]]; then
475+
sign_key="${srcdir}/${_srcname}/${sign_key}"
476+
fi
477+
local sign_cert="${srcdir}/${_srcname}/certs/signing_key.x509"
475478
local hash_algo="$(grep -Po 'CONFIG_MODULE_SIG_HASH="\K[^"]*' "${srcdir}/${_srcname}/.config")"
476479

477480
find "$1" -type f -name '*.ko' -print -exec \

‎linux-cachyos-lts/PKGBUILD

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,8 +472,11 @@ prepare() {
472472
_sign_modules() {
473473
msg2 "Signing modules in $1"
474474
local sign_script="${srcdir}/${_srcname}/scripts/sign-file"
475-
local sign_key="${srcdir}/${_srcname}/$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
476-
local sign_cert="$(echo "$sign_key" | sed 's/\.pem$/.x509/')"
475+
local sign_key="$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
476+
if [[ ! "$sign_key" =~ ^/ ]]; then
477+
sign_key="${srcdir}/${_srcname}/${sign_key}"
478+
fi
479+
local sign_cert="${srcdir}/${_srcname}/certs/signing_key.x509"
477480
local hash_algo="$(grep -Po 'CONFIG_MODULE_SIG_HASH="\K[^"]*' "${srcdir}/${_srcname}/.config")"
478481

479482
find "$1" -type f -name '*.ko' -print -exec \

‎linux-cachyos-rc/PKGBUILD

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,8 +532,11 @@ prepare() {
532532
_sign_modules() {
533533
msg2 "Signing modules in $1"
534534
local sign_script="${srcdir}/${_srcname}/scripts/sign-file"
535-
local sign_key="${srcdir}/${_srcname}/$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
536-
local sign_cert="$(echo "$sign_key" | sed 's/\.pem$/.x509/')"
535+
local sign_key="$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
536+
if [[ ! "$sign_key" =~ ^/ ]]; then
537+
sign_key="${srcdir}/${_srcname}/${sign_key}"
538+
fi
539+
local sign_cert="${srcdir}/${_srcname}/certs/signing_key.x509"
537540
local hash_algo="$(grep -Po 'CONFIG_MODULE_SIG_HASH="\K[^"]*' "${srcdir}/${_srcname}/.config")"
538541

539542
find "$1" -type f -name '*.ko' -print -exec \

‎linux-cachyos-rt-bore/PKGBUILD

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,11 @@ prepare() {
470470
_sign_modules() {
471471
msg2 "Signing modules in $1"
472472
local sign_script="${srcdir}/${_srcname}/scripts/sign-file"
473-
local sign_key="${srcdir}/${_srcname}/$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
474-
local sign_cert="$(echo "$sign_key" | sed 's/\.pem$/.x509/')"
473+
local sign_key="$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
474+
if [[ ! "$sign_key" =~ ^/ ]]; then
475+
sign_key="${srcdir}/${_srcname}/${sign_key}"
476+
fi
477+
local sign_cert="${srcdir}/${_srcname}/certs/signing_key.x509"
475478
local hash_algo="$(grep -Po 'CONFIG_MODULE_SIG_HASH="\K[^"]*' "${srcdir}/${_srcname}/.config")"
476479

477480
find "$1" -type f -name '*.ko' -print -exec \

‎linux-cachyos-server/PKGBUILD

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,11 @@ prepare() {
470470
_sign_modules() {
471471
msg2 "Signing modules in $1"
472472
local sign_script="${srcdir}/${_srcname}/scripts/sign-file"
473-
local sign_key="${srcdir}/${_srcname}/$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
474-
local sign_cert="$(echo "$sign_key" | sed 's/\.pem$/.x509/')"
473+
local sign_key="$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
474+
if [[ ! "$sign_key" =~ ^/ ]]; then
475+
sign_key="${srcdir}/${_srcname}/${sign_key}"
476+
fi
477+
local sign_cert="${srcdir}/${_srcname}/certs/signing_key.x509"
475478
local hash_algo="$(grep -Po 'CONFIG_MODULE_SIG_HASH="\K[^"]*' "${srcdir}/${_srcname}/.config")"
476479

477480
find "$1" -type f -name '*.ko' -print -exec \

‎linux-cachyos/PKGBUILD

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,8 +532,11 @@ prepare() {
532532
_sign_modules() {
533533
msg2 "Signing modules in $1"
534534
local sign_script="${srcdir}/${_srcname}/scripts/sign-file"
535-
local sign_key="${srcdir}/${_srcname}/$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
536-
local sign_cert="$(echo "$sign_key" | sed 's/\.pem$/.x509/')"
535+
local sign_key="$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
536+
if [[ ! "$sign_key" =~ ^/ ]]; then
537+
sign_key="${srcdir}/${_srcname}/${sign_key}"
538+
fi
539+
local sign_cert="${srcdir}/${_srcname}/certs/signing_key.x509"
537540
local hash_algo="$(grep -Po 'CONFIG_MODULE_SIG_HASH="\K[^"]*' "${srcdir}/${_srcname}/.config")"
538541

539542
find "$1" -type f -name '*.ko' -print -exec \

0 commit comments

Comments
 (0)