[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7246/8267] rpm: Disable perl dependency generation

[Emmanuele Bassi <ebassi src gnome org>]

commit 05a60766561f659c9be307953cd5cb267f83c63b
Author: Mark Hatle <mark hatle windriver com>
Date:   Tue Aug 15 16:41:57 2017 -0500

    rpm: Disable perl dependency generation
    
    When rpmdeps files a perl script, it attempts to determine what it provides
    and what it requires.  Often the requires are incorrect, within the context
    of Wind River Linux.  This results in an error that DNF is unable to install
    a package due to one or more unresolved dependencies.
    
    In RPM5 we had disabled this behavior, the alternative is to require that all
    perl scripts be 'complete', in that they only require things they absolutely
    need and that OE provides.  If we ever enforce that, this commit can be
    reverted.  Until they fall back to prior behavior (which also matches ipkg
    and deb style packages.)
    
    (From OE-Core rev: 99376f602c997fec96dbb28ddbe3fa5f68fde2c3)
    
    (From OE-Core rev: 586875cea5769fea7d17bae2677eab72e4fc7e31)
    
    Signed-off-by: Mark Hatle <mark hatle windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../rpm/files/0001-perl-disable-auto-reqs.patch    |   32 ++++++++++++++++++++
 meta/recipes-devtools/rpm/rpm_git.bb               |    1 +
 2 files changed, 33 insertions(+), 0 deletions(-)
---
diff --git a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch 
b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch
new file mode 100644
index 0000000..a6c5869
--- /dev/null
+++ b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch
@@ -0,0 +1,32 @@
+perl: disable auto requires
+
+When generating automatic requirements, it's possible for perl scripts to
+declare 'optional' dependencies.  These seem to often be incorrect and will
+cause installation failures in OE.  Instead of fixing the perl scripts, it
+was decided it is better to simply disable the automatic dependency
+generation.  This matches the behavior from the previous RPM5 implementation.
+
+Upstream-Status: Inappropriate [OE specific configuration]
+
+Signed-off-by: Mark Hatle <mark hatle windriver com>
+
+Index: git/fileattrs/perl.attr
+===================================================================
+--- git.orig/fileattrs/perl.attr
++++ git/fileattrs/perl.attr
+@@ -1,3 +1,3 @@
+-%__perl_requires      %{_rpmconfigdir}/perl.req
++#__perl_requires      %{_rpmconfigdir}/perl.req
+ %__perl_magic         ^.*[Pp]erl .*$
+ %__perl_flags         exeonly
+Index: git/fileattrs/perllib.attr
+===================================================================
+--- git.orig/fileattrs/perllib.attr
++++ git/fileattrs/perllib.attr
+@@ -1,5 +1,5 @@
+ %__perllib_provides   %{_rpmconfigdir}/perl.prov
+-%__perllib_requires   %{_rpmconfigdir}/perl.req
++#__perllib_requires   %{_rpmconfigdir}/perl.req
+ %__perllib_magic      ^Perl[[:digit:]] module source.*
+ %__perllib_path               \\.pm$
+ %__perllib_flags      magic_and_path
diff --git a/meta/recipes-devtools/rpm/rpm_git.bb b/meta/recipes-devtools/rpm/rpm_git.bb
index 2f814c4..ea894a3 100644
--- a/meta/recipes-devtools/rpm/rpm_git.bb
+++ b/meta/recipes-devtools/rpm/rpm_git.bb
@@ -42,6 +42,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm \
            file://0002-Run-binary-package-creation-via-thread-pools.patch \
            file://0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch \
            file://0004-build-pack.c-remove-static-local-variables-from-buil.patch \
+           file://0001-perl-disable-auto-reqs.patch \
            "
 UPSTREAM_VERSION_UNKNOWN = "1"