summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch')
-rw-r--r--meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch39
1 files changed, 0 insertions, 39 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
deleted file mode 100644
index 55108e7f1c..0000000000
--- a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 58bf006646a063837c46b695f7e7ebb69bee7238 Mon Sep 17 00:00:00 2001
2From: Mark Hatle <mark.hatle@windriver.com>
3Date: Tue, 15 Aug 2017 16:41:57 -0500
4Subject: [PATCH] perl: disable auto requires
5
6When generating automatic requirements, it's possible for perl scripts to
7declare 'optional' dependencies. These seem to often be incorrect and will
8cause installation failures in OE. Instead of fixing the perl scripts, it
9was decided it is better to simply disable the automatic dependency
10generation. This matches the behavior from the previous RPM5 implementation.
11
12Upstream-Status: Inappropriate [OE specific configuration]
13
14Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
15---
16 fileattrs/perl.attr | 2 +-
17 fileattrs/perllib.attr | 2 +-
18 2 files changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/fileattrs/perl.attr b/fileattrs/perl.attr
21index 0daef58d5..81ddf5305 100644
22--- a/fileattrs/perl.attr
23+++ b/fileattrs/perl.attr
24@@ -1,3 +1,3 @@
25-%__perl_requires %{_rpmconfigdir}/perl.req
26+#__perl_requires %{_rpmconfigdir}/perl.req
27 %__perl_magic ^.*[Pp]erl .*$
28 %__perl_flags exeonly
29diff --git a/fileattrs/perllib.attr b/fileattrs/perllib.attr
30index fcad48099..495a28927 100644
31--- a/fileattrs/perllib.attr
32+++ b/fileattrs/perllib.attr
33@@ -1,5 +1,5 @@
34 %__perllib_provides %{_rpmconfigdir}/perl.prov
35-%__perllib_requires %{_rpmconfigdir}/perl.req
36+#__perllib_requires %{_rpmconfigdir}/perl.req
37 %__perllib_magic ^Perl[[:digit:]] module source.*
38 %__perllib_path \\.pm$
39 %__perllib_flags magic_and_path