| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 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: Inappropriate (OpenEmbedded specific) |
| 8 | |
| 9 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 10 | |
| 11 | Index: rpm-5.4.14/macros/macros.in |
| 12 | =================================================================== |
| 13 | --- rpm-5.4.14.orig/macros/macros.in |
| 14 | +++ rpm-5.4.14/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@ |