diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch | 32 | ||||
-rw-r--r-- | 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 0000000000..a6c58699d3 --- /dev/null +++ b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | perl: disable auto requires | ||
2 | |||
3 | When generating automatic requirements, it's possible for perl scripts to | ||
4 | declare 'optional' dependencies. These seem to often be incorrect and will | ||
5 | cause installation failures in OE. Instead of fixing the perl scripts, it | ||
6 | was decided it is better to simply disable the automatic dependency | ||
7 | generation. This matches the behavior from the previous RPM5 implementation. | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE specific configuration] | ||
10 | |||
11 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
12 | |||
13 | Index: git/fileattrs/perl.attr | ||
14 | =================================================================== | ||
15 | --- git.orig/fileattrs/perl.attr | ||
16 | +++ git/fileattrs/perl.attr | ||
17 | @@ -1,3 +1,3 @@ | ||
18 | -%__perl_requires %{_rpmconfigdir}/perl.req | ||
19 | +#__perl_requires %{_rpmconfigdir}/perl.req | ||
20 | %__perl_magic ^.*[Pp]erl .*$ | ||
21 | %__perl_flags exeonly | ||
22 | Index: git/fileattrs/perllib.attr | ||
23 | =================================================================== | ||
24 | --- git.orig/fileattrs/perllib.attr | ||
25 | +++ git/fileattrs/perllib.attr | ||
26 | @@ -1,5 +1,5 @@ | ||
27 | %__perllib_provides %{_rpmconfigdir}/perl.prov | ||
28 | -%__perllib_requires %{_rpmconfigdir}/perl.req | ||
29 | +#__perllib_requires %{_rpmconfigdir}/perl.req | ||
30 | %__perllib_magic ^Perl[[:digit:]] module source.* | ||
31 | %__perllib_path \\.pm$ | ||
32 | %__perllib_flags magic_and_path | ||
diff --git a/meta/recipes-devtools/rpm/rpm_git.bb b/meta/recipes-devtools/rpm/rpm_git.bb index 971aac7867..b0f57809cc 100644 --- a/meta/recipes-devtools/rpm/rpm_git.bb +++ b/meta/recipes-devtools/rpm/rpm_git.bb | |||
@@ -38,6 +38,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm \ | |||
38 | file://0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch \ | 38 | file://0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch \ |
39 | file://0012-Use-conditional-to-access-_docdir-in-macros.in.patch \ | 39 | file://0012-Use-conditional-to-access-_docdir-in-macros.in.patch \ |
40 | file://0013-Add-a-new-option-alldeps-to-rpmdeps.patch \ | 40 | file://0013-Add-a-new-option-alldeps-to-rpmdeps.patch \ |
41 | file://0001-perl-disable-auto-reqs.patch \ | ||
41 | " | 42 | " |
42 | 43 | ||
43 | PV = "4.13.90+git${SRCPV}" | 44 | PV = "4.13.90+git${SRCPV}" |