diff options
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@ | ||