diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
| commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
| tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch | |
| parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
| download | talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip | |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch')
| -rw-r--r-- | yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch deleted file mode 100644 index 59fe524df..000000000 --- a/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch +++ /dev/null @@ -1,31 +0,0 @@ -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: Inappropriate (OpenEmbedded specific) - -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> - -Index: rpm-5.4.14/macros/macros.in -=================================================================== ---- rpm-5.4.14.orig/macros/macros.in -+++ rpm-5.4.14/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@ |
