custom/rpm-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!59 exclude kernel-source package files in digest list

Browse Source 
From: @nettingsisyphus
Reviewed-by: @zhujianwei001
Signed-off-by: @zhujianwei001
This commit is contained in:
openeuler-ci-bot 2021-04-20 21:06:39 +08:00 committed by Gitee
commit 1590f1db6d
2 changed files with 80 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
exclude-kernel-source-and-EFI-files-in-digest-list-building.patch Normal file
View File

@ -0,0 +1,74 @@
From 85e9f95d163eb3daa75add855be3208472c51850 Mon Sep 17 00:00:00 2001
From: Anakin Zhang <benjamin93@163.com>
Date: Thu, 8 Apr 2021 19:09:00 +0800
Subject: [PATCH] exclude kernel source and EFI files in digest list building
Signed-off-by: Anakin Zhang <benjamin93@163.com>
---
brp-digest-list | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/brp-digest-list b/brp-digest-list
index c3b2156..e698b7a 100644
--- a/brp-digest-list
+++ b/brp-digest-list
@@ -8,8 +8,6 @@ if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
exit 0
fi
-
-
# Create temporary file listing files in the manifest
#[ -n "$TMPDIR" ] || TMPDIR="/tmp"
TMPDIR="/tmp"
@@ -34,6 +32,8 @@ mkdir -p $DIGEST_LIST_DIR.sig
gen_digest_lists -i M: -t metadata -f compact -d $DIGEST_LIST_DIR -i l:policy \
-i i: -o add -p -1 -m immutable -i L:$BIN_PKG_FILES -i u: \
-A $RPM_BUILD_ROOT -i e: \
+ -i E:/usr/src \
+ -i E:/boot/efi \
-i F:/lib \
-i F:/usr/lib \
-i F:/lib64 \
@@ -43,16 +43,18 @@ gen_digest_lists -i M: -t metadata -f compact -d $DIGEST_LIST_DIR -i l:policy \
-i F:/lib/firmware \
-i F:/usr/lib/firmware
-f="$DIGEST_LIST_DIR/0-metadata_list-compact-$(basename $BIN_PKG_FILES)"
-[ -f $f ] || exit 0
+DIGEST_LIST_PATH="$DIGEST_LIST_DIR/0-metadata_list-compact-$(basename $BIN_PKG_FILES)"
+[ -f $DIGEST_LIST_PATH ] || exit 0
-chmod 644 $f
-echo $f
+chmod 644 $DIGEST_LIST_PATH
+echo $DIGEST_LIST_PATH
# Generate TLV digest list to check metadata
gen_digest_lists -i M: -t metadata -f compact -d $DIGEST_LIST_DIR.tlv \
-i l:policy -i i: -o add -p -1 -m immutable -i L:$BIN_PKG_FILES -i u: \
-T -A $RPM_BUILD_ROOT -i e: \
+ -i E:/usr/src \
+ -i E:/boot/efi \
-i F:/lib \
-i F:/usr/lib \
-i F:/lib64 \
@@ -62,11 +64,11 @@ gen_digest_lists -i M: -t metadata -f compact -d $DIGEST_LIST_DIR.tlv \
-i F:/lib/firmware \
-i F:/usr/lib/firmware
-f="$DIGEST_LIST_DIR.tlv/0-metadata_list-compact_tlv-$(basename $BIN_PKG_FILES)"
-[ -f $f ] || exit 0
+DIGEST_LIST_TLV_PATH="$DIGEST_LIST_DIR.tlv/0-metadata_list-compact_tlv-$(basename $BIN_PKG_FILES)"
+[ -f $DIGEST_LIST_TLV_PATH ] || exit 0
-chmod 644 $f
-echo $f
+chmod 644 $DIGEST_LIST_TLV_PATH
+echo $DIGEST_LIST_TLV_PATH
if [[ "$(basename $BIN_PKG_FILES)" =~ "digest-list-tools" && \
! $(basename $BIN_PKG_FILES) =~ "debug" ]]; then
--
1.8.3.1

8
openEuler-rpm-config.spec
View File

@ -3,7 +3,7 @@
Name: %{vendor}-rpm-config
Version: 30
Release: 20
Release: 21
License: GPL+
Summary: specific rpm configuration files
URL: https://gitee.com/openeuler/openEuler-rpm-config
@ -14,7 +14,8 @@ Patch0: fix-error-message-for-kmodtool.patch
Patch1: 0001-1-Add-riscv64-to-golang_arches.patch
Patch2: Fix-a-typo-in-brp-digest-list.patch
Patch3: change-the-openEuler-to-generic-for-common-use.patch
Patch4: openEuler-remove-fexceptions.patch
Patch4: openEuler-remove-fexceptions.patch
Patch5: exclude-kernel-source-and-EFI-files-in-digest-list-building.patch
Provides: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: python2-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release}
@ -111,6 +112,9 @@ mkdir -p %{buildroot}%{_fileattrsdir}
%{_rpmconfigdir}/macros.d/macros.kmp
%changelog
* Thu Apr 8 2021 Anakin Zhang <benjamin93@163.com> - 30-21
- exclude kernel source and EFI files in digest list building
* Mon Mar 29 2021 shenyangyang <shenyangyang4@huawei.com> - 30-20
- Patched missing patch that remove fexceptions