summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-08-28 17:24:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-30 17:10:28 +0100
commit51baa9a3b4948683a962674b4854ceaa06d3eb4f (patch)
treeeb7921a7754bd909d2d210e0beb9b991d2a1eee7 /meta/recipes-devtools/rpm
parentba6a568512d46d49173998a7fb15cd8ee3302551 (diff)
downloadpoky-51baa9a3b4948683a962674b4854ceaa06d3eb4f.tar.gz
rpm: resolve a host contamination issue for mono packaging
This is perhaps not the most elegant patch but it be dropped once rpm is updated to the soon-to-be-released version 4.15 where upstream has removed mono dependency resolution altogether. (From OE-Core rev: c829e89f99c973787f31422b4c32eeebe8c383d3) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm')
-rw-r--r--meta/recipes-devtools/rpm/files/0001-mono-find-provides-requires-do-not-use-monodis-from-.patch58
-rw-r--r--meta/recipes-devtools/rpm/rpm_4.14.2.1.bb1
2 files changed, 59 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-mono-find-provides-requires-do-not-use-monodis-from-.patch b/meta/recipes-devtools/rpm/files/0001-mono-find-provides-requires-do-not-use-monodis-from-.patch
new file mode 100644
index 0000000000..24aa4c7fff
--- /dev/null
+++ b/meta/recipes-devtools/rpm/files/0001-mono-find-provides-requires-do-not-use-monodis-from-.patch
@@ -0,0 +1,58 @@
1From 43fbc3f53302a395463e8450ac81c53f623eec3f Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 27 Aug 2019 17:42:34 +0200
4Subject: [PATCH] mono-find-provides/requires: do not use monodis from the host
5
6There was a host contamination issue here: if monodis was installed
7on the host, do_package would use that to resolve dependencies
8of mono libraries (and often fail in that). Without monodis,
9no dependencies are resolved, which is seemingly how things
10are supposed to work.
11
12Upstream-Status: Inappropriate [oe-core specific]
13Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14---
15 scripts/mono-find-provides | 8 ++++----
16 scripts/mono-find-requires | 8 ++++----
17 2 files changed, 8 insertions(+), 8 deletions(-)
18
19diff --git a/scripts/mono-find-provides b/scripts/mono-find-provides
20index 9348457d3..b28872ffb 100644
21--- a/scripts/mono-find-provides
22+++ b/scripts/mono-find-provides
23@@ -18,11 +18,11 @@ monolist=($(printf "%s\n" "${filelist[@]}" | grep -E "\\.(exe|dll)\$"))
24 build_bindir="$2/usr/bin"
25 build_libdir="$2$3"
26
27-if [ -x $build_bindir/monodis ]; then
28- monodis="$build_bindir/monodis"
29+if [ -x $build_bindir/monodis.bogus ]; then
30+ monodis="$build_bindir/monodis.bogus"
31 export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
32-elif [ -x /usr/bin/monodis ]; then
33- monodis="/usr/bin/monodis"
34+elif [ -x /usr/bin/monodis.bogus ]; then
35+ monodis="/usr/bin/monodis.bogus"
36 else
37 exit 0;
38 fi
39diff --git a/scripts/mono-find-requires b/scripts/mono-find-requires
40index ea58cae48..d270169e1 100644
41--- a/scripts/mono-find-requires
42+++ b/scripts/mono-find-requires
43@@ -18,11 +18,11 @@ monolist=($(printf "%s\n" "${filelist[@]}" | grep -E "\\.(exe|dll)\$"))
44 build_bindir="$2/usr/bin"
45 build_libdir="$2$3"
46
47-if [ -x $build_bindir/monodis ]; then
48- monodis="$build_bindir/monodis"
49+if [ -x $build_bindir/monodis.bogus ]; then
50+ monodis="$build_bindir/monodis.bogus"
51 export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
52-elif [ -x /usr/bin/monodis ]; then
53- monodis="/usr/bin/monodis"
54+elif [ -x /usr/bin/monodis.bogus ]; then
55+ monodis="/usr/bin/monodis.bogus"
56 else
57 exit 0;
58 fi
diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
index 063f4269a5..c37330eb4c 100644
--- a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
@@ -41,6 +41,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \
41 file://0001-perl-disable-auto-reqs.patch \ 41 file://0001-perl-disable-auto-reqs.patch \
42 file://0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch \ 42 file://0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch \
43 file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ 43 file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \
44 file://0001-mono-find-provides-requires-do-not-use-monodis-from-.patch \
44 " 45 "
45 46
46PE = "1" 47PE = "1"