From f51aa1bd32a3f0de3abc65d963005193be5b5971 Mon Sep 17 00:00:00 2001 From: Huaxin Lu Date: Wed, 19 Jun 2024 15:01:30 +0800 Subject: [PATCH] Add the pub key in openEuler RPM-PGP certificate to kernel --- kernel.spec | 5 ++++- process_pgp_certs.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel.spec b/kernel.spec index 0977ac7..9db366b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -11,7 +11,7 @@ %global upstream_sublevel 0 %global devel_release 209 %global maintenance_release .0.0 -%global pkg_release .117 +%global pkg_release .118 %define with_debuginfo 1 # Do not recompute the build-id of vmlinux in find-debuginfo.sh @@ -911,6 +911,9 @@ fi %endif %changelog +* Thu Jun 20 2024 luhuaxin - 5.10.0-209.0.0.118 +- Add the pub key in openEuler RPM-PGP certificate + * Wed Jun 19 2024 Jialin Zhang - 5.10.0-209.0.0.117 - !9092 v2 ksmbd: validate request buffer size in smb2_allocate_rsp_buf() - !9030 bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue diff --git a/process_pgp_certs.sh b/process_pgp_certs.sh index 87aae37..3f8cdf0 100644 --- a/process_pgp_certs.sh +++ b/process_pgp_certs.sh @@ -31,6 +31,6 @@ dd if=$CERT_2203_SPx.gpg of=$CERT_2203_SPx.subkey.gpg skip=903 bs=1c count=399 s # 22.03 use main key to sign, so we dont need to deal it. # merge all cert information -cat $CERT_2203_SPx.subkey.gpg $CERT_2203_SPx.userid.gpg $CERT_2203.gpg > $CERT_OUT +cat $CERT_2203_SPx.subkey.gpg $CERT_2203_SPx.userid.gpg $CERT_2203.gpg $CERT_2203_SPx.gpg > $CERT_OUT # cleanup rm -f RPM-GPG-KEY-openEuler-*