Compare commits

..

No commits in common. "6211fb3cbd61779ac717febd994601a13c7fff5b" and "795e3b1989504a7013aaab4db79748a1f7e2d787" have entirely different histories.

4 changed files with 28 additions and 44 deletions

View File

@ -1,27 +0,0 @@
From 47d79f48c0f5d4b5ce02e33d54fb1954df41fb2f Mon Sep 17 00:00:00 2001
From: zhangyiru330 <zhangyiru3@huawei.com>
Date: Mon, 7 Mar 2022 14:32:49 +0800
Subject: [PATCH] Add support for DIM
---
pesign-repackage.spec.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pesign-repackage.spec.in b/pesign-repackage.spec.in
index 6dae3a9..8b4b550 100644
--- a/pesign-repackage.spec.in
+++ b/pesign-repackage.spec.in
@@ -138,6 +138,10 @@ for sig in "${sigs[@]}"; do
mkdir -p %buildroot/etc/ima/digest_lists.sig
cp $sig %buildroot/etc/ima/digest_lists.sig
;;
+ */etc/dim/digest_list/*)
+ mkdir -p %buildroot/etc/dim/digest_list
+ cp $sig %buildroot/etc/dim/digest_list
+ ;;
*.ko.sig)
/usr/lib/rpm/pesign/kernel-sign-file -i pkcs7 -s "$sig" sha256 "$cert" "$f"
;;
--
1.8.3.1

View File

@ -0,0 +1,26 @@
From b9006b66251441a10e1714e697cb45c2fb49a410 Mon Sep 17 00:00:00 2001
From: Roberto Sassu <roberto.sassu@huawei.com>
Date: Tue, 14 Jul 2020 17:11:10 +0200
Subject: [PATCH] Undefine __brp_digest_list in pesign-repackage.spec.in
---
pesign-repackage.spec.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pesign-repackage.spec.in b/pesign-repackage.spec.in
index 90ae17c..034f56c 100644
--- a/pesign-repackage.spec.in
+++ b/pesign-repackage.spec.in
@@ -174,7 +174,8 @@ popd
--directory=%buildroot "${rpms[@]}"
rpmbuild --define "%%buildroot %buildroot" --define "%%disturl $disturl" \
--define "%%_builddir $PWD" \
- --define "%_suse_insert_debug_package %%{nil}" -bb repackage.spec
+ --define "%_suse_insert_debug_package %%{nil}" \
+ --undefine "%%__brp_digest_list" -bb repackage.spec
# This is needed by the kernel packages. Ideally, we should not run _any_ brp
# checks, because the RPMs passed them once already
--
2.27.GIT

View File

@ -23,7 +23,7 @@ Summary: Macros and scripts to sign the kernel and bootloader
License: GPL-2.0-only
Group: Development/Tools/Other
Version: 10.1
Release: 4
Release: 0
Requires: fipscheck
%if 0%{?suse_version}
Requires: mozilla-nss-tools
@ -43,7 +43,7 @@ Patch2: Skip-processing-of-ghost-files-as-they-are-not-extra.patch
Patch3: Add-support-for-digest-lists.patch
Patch4: Don-t-set-files-variable-in-brp-99-pesign.patch
Patch5: Disable-building-debug-packages.patch
Patch6: Add-support-for-DIM.patch
Patch6: Undefine-__brp_digest_list-in-pesign-repackage.spec..patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
# suse-module-tools <= 15.0.10 contains modsign-verify
@ -88,14 +88,3 @@ fi
/usr/lib/rpm/*
%changelog
* Sun Apr 24 2022 zhengxiaoxiao <zhengxiaoxiao2@huawei.com> - 10.1-4
- Delete sensitive information
* Mon Mar 07 2022 wangyu <wangyu283@huawei.com> - 10.1-3
- Add Add-support-for-DIM.patch
* Wed Jul 22 2020 Roberto Sassu <roberto.sassu@huawei.com> - 10.1-2
- Add Require-nss-util-for-building-in-pesign-repackage.sp.patch
* Wed Jul 22 2020 Roberto Sassu <roberto.sassu@huawei.com> - 10.1-1
- Initial import

View File

@ -1,4 +0,0 @@
version_control: github
src_repo: openSUSE/pesign-obs-integration
tag_prefix: ^
seperator: .