diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2012-11-28 15:37:39 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-06 12:30:31 +0000 |
| commit | 66573093c44aabbba96d82de9375158e4a4c6f32 (patch) | |
| tree | 449e51b354f343de87907b8f0ba557f5ddd2e6da | |
| parent | 54247297816e1d8f97667e662bf00d8fefceb6aa (diff) | |
| download | openembedded-core-66573093c44aabbba96d82de9375158e4a4c6f32.tar.gz openembedded-core-66573093c44aabbba96d82de9375158e4a4c6f32.tar.bz2 openembedded-core-66573093c44aabbba96d82de9375158e4a4c6f32.zip | |
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.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.9.bb | 3 |
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 @@ +macros: Use dyanmic config vs hard coded settings + +When the dynamic, runtime relocation is enables we need to make sure that the +RPM macro file does not override the dynamic settings. Fix this by forcing the +dynamic version to be used in all cases. + +Upstream-Status: Inapproriate (OpenEmbedded specific) + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +Index: rpm-5.4.9/macros/macros.in +=================================================================== +--- rpm-5.4.9.orig/macros/macros.in ++++ rpm-5.4.9/macros/macros.in +@@ -27,11 +27,12 @@ + #============================================================================== + # ---- filesystem macros. + # +-%_usr @usrprefix@ ++%_usr %{_usrlibrpm}/../.. + %_usrsrc %{_usr}/src +-%_var @varprefix@ +-%_usrlibrpm @USRLIBRPM@ +-%_etcrpm @SYSCONFIGDIR@ ++%_var %{_usr}/../var ++# The dynamic relocation code sets the following two items ++#%_usrlibrpm @USRLIBRPM@ ++#%_etcrpm @SYSCONFIGDIR@ + + %__objext @objext@ + %__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" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native" -PR = "r56" +PR = "r57" # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed # 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 file://rpm-db_buffer_small.patch \ file://rpm-py-init.patch \ file://python-rpm-rpmsense.patch \ + file://rpm-reloc-macros.patch \ " SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768" |