summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-11-28 15:37:39 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:31:04 +0000
commitf8b2ec3c9468d29e0d3ac010c1d05d275d53123c (patch)
treeed327c372a37ea648918789a43a3954aa72d0612 /meta/recipes-devtools/rpm
parenta6c86d166481984bd685ee732f9b9626eaa058ad (diff)
downloadpoky-f8b2ec3c9468d29e0d3ac010c1d05d275d53123c.tar.gz
rpm: Fix rpm relocation macro usage
When RPM is setup to dynamically reconfigure itself at runtime, we need to avoid hard coded settings for _usrlibrpm and _etcrpm. (From OE-Core rev: 66573093c44aabbba96d82de9375158e4a4c6f32) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch31
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.9.bb3
2 files changed, 33 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch b/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch
new file mode 100644
index 0000000000..33ec8e21e1
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch
@@ -0,0 +1,31 @@
1macros: Use dyanmic config vs hard coded settings
2
3When the dynamic, runtime relocation is enables we need to make sure that the
4RPM macro file does not override the dynamic settings. Fix this by forcing the
5dynamic version to be used in all cases.
6
7Upstream-Status: Inapproriate (OpenEmbedded specific)
8
9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
10
11Index: rpm-5.4.9/macros/macros.in
12===================================================================
13--- rpm-5.4.9.orig/macros/macros.in
14+++ rpm-5.4.9/macros/macros.in
15@@ -27,11 +27,12 @@
16 #==============================================================================
17 # ---- filesystem macros.
18 #
19-%_usr @usrprefix@
20+%_usr %{_usrlibrpm}/../..
21 %_usrsrc %{_usr}/src
22-%_var @varprefix@
23-%_usrlibrpm @USRLIBRPM@
24-%_etcrpm @SYSCONFIGDIR@
25+%_var %{_usr}/../var
26+# The dynamic relocation code sets the following two items
27+#%_usrlibrpm @USRLIBRPM@
28+#%_etcrpm @SYSCONFIGDIR@
29
30 %__objext @objext@
31 %__libext @libext@
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index ccf079a694..59f3eef276 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -43,7 +43,7 @@ LICENSE = "LGPLv2.1"
43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" 43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
44 44
45DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native" 45DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native"
46PR = "r56" 46PR = "r57"
47 47
48# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed 48# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
49# in order to extract the distribution SRPM into a format we can extract... 49# in order to extract the distribution SRPM into a format we can extract...
@@ -82,6 +82,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex
82 file://rpm-db_buffer_small.patch \ 82 file://rpm-db_buffer_small.patch \
83 file://rpm-py-init.patch \ 83 file://rpm-py-init.patch \
84 file://python-rpm-rpmsense.patch \ 84 file://python-rpm-rpmsense.patch \
85 file://rpm-reloc-macros.patch \
85 " 86 "
86 87
87SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768" 88SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768"