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:31:04 +0000 |
commit | f8b2ec3c9468d29e0d3ac010c1d05d275d53123c (patch) | |
tree | ed327c372a37ea648918789a43a3954aa72d0612 /meta/recipes-devtools/rpm/rpm | |
parent | a6c86d166481984bd685ee732f9b9626eaa058ad (diff) | |
download | poky-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/rpm')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch | 31 |
1 files changed, 31 insertions, 0 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 @@ | |||
1 | macros: Use dyanmic config vs hard coded settings | ||
2 | |||
3 | When the dynamic, runtime relocation is enables we need to make sure that the | ||
4 | RPM macro file does not override the dynamic settings. Fix this by forcing the | ||
5 | dynamic version to be used in all cases. | ||
6 | |||
7 | Upstream-Status: Inapproriate (OpenEmbedded specific) | ||
8 | |||
9 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
10 | |||
11 | Index: 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@ | ||