summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
committerTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
commit972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch)
tree97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch
downloadpoky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch31
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..0a5f5a4d72
--- /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.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@