From 7792f4ce6b5e644c62c83f304bad03ae18668b81 Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Mon, 27 Feb 2023 14:24:19 +0000 Subject: [PATCH] Fix inheritance of environment build flags Resolves: #2144572 Signed-off-by: Robbie Harwood --- os-prober.spec | 8 ++++++-- rpminspect.dson | 6 ++++++ rpminspect.yaml | 13 ------------- 3 files changed, 12 insertions(+), 15 deletions(-) create mode 100644 rpminspect.dson delete mode 100644 rpminspect.yaml diff --git a/os-prober.spec b/os-prober.spec index 88ac5d8..5abf1ce 100644 --- a/os-prober.spec +++ b/os-prober.spec @@ -1,6 +1,6 @@ Name: os-prober Version: 1.77 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Probes disks on the system for installed operating systems # For more information about licensing, see copyright file. @@ -45,7 +45,7 @@ sed -i -e 's|grub-mount|grub2-mount|g' os-probes/common/50mounted-tests \ %build %set_build_flags -%make_build LDFLAGS="$LDFLAGS -fPIC" +%make_build LDFLAGS="$LDFLAGS -fPIC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" %install install -m 0755 -d %{buildroot}%{_bindir} @@ -90,6 +90,10 @@ fi %{_var}/lib/%{name} %changelog +* Mon Feb 27 2023 Robbie Harwood - 1.77-10 +- Fix inheritance of environment build flags +- Resolves: #2144572 + * Mon Aug 09 2021 Mohan Boddu - 1.77-9 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 diff --git a/rpminspect.dson b/rpminspect.dson new file mode 100644 index 0000000..f6ec3c2 --- /dev/null +++ b/rpminspect.dson @@ -0,0 +1,6 @@ +such inspections is such "javabytecode" is "off". + "changedfiles" is "off", + "filesize" is "off"? + "patches" is "off"! + "upstream" is off", + "annocheck" is "off" wow wow diff --git a/rpminspect.yaml b/rpminspect.yaml deleted file mode 100644 index 4c08189..0000000 --- a/rpminspect.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -inspections: - # Not a Java package - javabytecode: off - - # These just flag when things change "too much" - changedfiles: off - filesize: off - patches: off - upstream: off - - # https://bugzilla.redhat.com/show_bug.cgi?id=2010936 - annocheck: off