From: Herton R. Krzesinski herton@redhat.com

redhat: ignore known empty patches on the patches rpminspect test

Bugzilla: INTERNAL Upstream Status: RHEL-only

It's expected that linux-kernel-test.patch and patch-*-redhat.patch files can be empty, thus make them not trigger rpminspect invalid reports.

Signed-off-by: Herton R. Krzesinski herton@redhat.com

diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -481,13 +481,15 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check @rm $(TESTPATCH).tmp @cp $(TESTPATCH) $(SOURCES)/linux-kernel-test.patch @cat configs/flavors | while read flavor; do echo "Copying sources for $${flavor}"; [ -e $${flavor}_files ] && cp $${flavor}_files/* $(SOURCES); done + @sed -e "s/%%RPMKVERSION%%/$(RPMKVERSION)/" \ + -e "s/%%RPMKPATCHLEVEL%%/$(RPMKPATCHLEVEL)/" \ + rpminspect.yaml > $(SOURCES)/rpminspect.yaml @cp cpupower.* \ keys/rhel*.x509 \ kabi/check-kabi \ configs/$(PACKAGE_NAME)-*.config \ configs/partial*.config \ gating.yaml \ - rpminspect.yaml \ update_scripts.sh \ kvm_stat.logrotate \ mod-denylist.sh \ diff --git a/redhat/rpminspect.yaml b/redhat/rpminspect.yaml index blahblah..blahblah 100644 --- a/redhat/rpminspect.yaml +++ b/redhat/rpminspect.yaml @@ -19,3 +19,8 @@ emptyrpm: - kernel-zfcpdump - kernel-zfcpdump-devel-matched - kernel-zfcpdump-modules + +patches: + ignore_list: + - linux-kernel-test.patch + - patch-%%RPMKVERSION%%.%%RPMKPATCHLEVEL%%-redhat.patch

-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1758