From bb7673487cdaa75950e79161d9dd6e41a7640a08 Mon Sep 17 00:00:00 2001 From: nettingsisyphus Date: Fri, 26 Mar 2021 21:09:17 +0800 Subject: [PATCH] exclude kernel source package files in digest list --- ...ernel-source-in-digest-list-building.patch | 37 +++++++++++++++++++ openEuler-rpm-config.spec | 6 ++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 exclude-kernel-source-in-digest-list-building.patch diff --git a/exclude-kernel-source-in-digest-list-building.patch b/exclude-kernel-source-in-digest-list-building.patch new file mode 100644 index 0000000..b7c3cf1 --- /dev/null +++ b/exclude-kernel-source-in-digest-list-building.patch @@ -0,0 +1,37 @@ +From b9d3749ef1890789407613868607341e6c4cb21c Mon Sep 17 00:00:00 2001 +From: Anakin Zhang +Date: Fri, 26 Mar 2021 21:05:13 +0800 +Subject: [PATCH] exclude kernel-source in digest list building + +Signed-off-by: Anakin Zhang +--- + brp-digest-list | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/brp-digest-list b/brp-digest-list +index c3b2156..87aef68 100644 +--- a/brp-digest-list ++++ b/brp-digest-list +@@ -41,7 +41,8 @@ gen_digest_lists -i M: -t metadata -f compact -d $DIGEST_LIST_DIR -i l:policy \ + -i F:/lib/modules \ + -i F:/usr/lib/modules \ + -i F:/lib/firmware \ +- -i F:/usr/lib/firmware ++ -i F:/usr/lib/firmware \ ++ -i E:/usr/src + + f="$DIGEST_LIST_DIR/0-metadata_list-compact-$(basename $BIN_PKG_FILES)" + [ -f $f ] || exit 0 +@@ -60,7 +61,8 @@ gen_digest_lists -i M: -t metadata -f compact -d $DIGEST_LIST_DIR.tlv \ + -i F:/lib/modules \ + -i F:/usr/lib/modules \ + -i F:/lib/firmware \ +- -i F:/usr/lib/firmware ++ -i F:/usr/lib/firmware \ ++ -i E:/usr/src + + f="$DIGEST_LIST_DIR.tlv/0-metadata_list-compact_tlv-$(basename $BIN_PKG_FILES)" + [ -f $f ] || exit 0 +-- +1.8.3.1 + diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index 162bb8d..96fb8f0 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -9,7 +9,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 18 +Release: 19 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -19,6 +19,7 @@ Source0: https://gitee.com/openeuler/openEuler-rpm-config/repository/arch 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: exclude-kernel-source-in-digest-list-building.patch Patch9000: openEuler-replace-openEuler-with-_vendor-macro.patch %if %{vendor} != openEuler && %{change_vendor} == 1 @@ -150,6 +151,9 @@ popd %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Fri Mar 26 2021 Anakin Zhang - 30-19 +- exclude kernel-source package files in digest list building + * Thu Mar 18 2021 shenyangyang - 30-18 - Change the name of spec to openEuler-rpm-spec and fix few bugs -- Gitee