summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2017-08-15 16:41:57 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-18 10:40:26 +0100
commit05a60766561f659c9be307953cd5cb267f83c63b (patch)
treeba9c92fc66035f08c16fc270dc8fbfac1dad276c /meta
parent1b5d1b36bbb802a95483d8712849ee8deb823e54 (diff)
downloadpoky-05a60766561f659c9be307953cd5cb267f83c63b.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch32
-rw-r--r--meta/recipes-devtools/rpm/rpm_git.bb1
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 @@
1perl: disable auto requires
2
3When generating automatic requirements, it's possible for perl scripts to
4declare 'optional' dependencies. These seem to often be incorrect and will
5cause installation failures in OE. Instead of fixing the perl scripts, it
6was decided it is better to simply disable the automatic dependency
7generation. This matches the behavior from the previous RPM5 implementation.
8
9Upstream-Status: Inappropriate [OE specific configuration]
10
11Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
12
13Index: 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
22Index: 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 2f814c44e7..ea894a3470 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 \
42 file://0002-Run-binary-package-creation-via-thread-pools.patch \ 42 file://0002-Run-binary-package-creation-via-thread-pools.patch \
43 file://0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch \ 43 file://0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch \
44 file://0004-build-pack.c-remove-static-local-variables-from-buil.patch \ 44 file://0004-build-pack.c-remove-static-local-variables-from-buil.patch \
45 file://0001-perl-disable-auto-reqs.patch \
45 " 46 "
46UPSTREAM_VERSION_UNKNOWN = "1" 47UPSTREAM_VERSION_UNKNOWN = "1"
47 48