summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2015-06-17 12:04:41 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-23 11:47:40 +0100
commitc0123e59a0963509f5a797295efad2b5302a1474 (patch)
tree600a228379e5713b4267e8c5c102098d78ac9364 /meta
parenta990d21aec317b637fe974d935aa80ebfbaa3645 (diff)
downloadpoky-c0123e59a0963509f5a797295efad2b5302a1474.tar.gz
rpm: Rebrand rpm custom macro paths to be distro specific
RPM was previously hard coded to use the 'poky' directory. We really want the directory name to be distribution specific. (From OE-Core rev: 2c2fd0391df377cb9151598569e7e7c4a622bc0e) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.14.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
index eac3b8f455..fb81f12a1f 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
@@ -108,9 +108,9 @@ inherit autotools gettext
108acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java" 108acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
109 109
110# Specify the default rpm macros in terms of adjustable variables 110# Specify the default rpm macros in terms of adjustable variables
111rpm_macros = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:%{_etcrpm}/macros.*:%{_etcrpm}/macros:%{_etcrpm}/%{_target}/macros:~/.oerpmmacros" 111rpm_macros = "%{_usrlibrpm}/macros:%{_usrlibrpm}/${DISTRO}/macros:%{_usrlibrpm}/${DISTRO}/%{_target}/macros:%{_etcrpm}/macros.*:%{_etcrpm}/macros:%{_etcrpm}/%{_target}/macros:~/.oerpmmacros"
112rpm_macros_class-native = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:~/.oerpmmacros" 112rpm_macros_class-native = "%{_usrlibrpm}/macros:%{_usrlibrpm}/${DISTRO}/macros:%{_usrlibrpm}/${DISTRO}/%{_target}/macros:~/.oerpmmacros"
113rpm_macros_class-nativesdk = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:~/.oerpmmacros" 113rpm_macros_class-nativesdk = "%{_usrlibrpm}/macros:%{_usrlibrpm}/${DISTRO}/macros:%{_usrlibrpm}/${DISTRO}/%{_target}/macros:~/.oerpmmacros"
114 114
115# sqlite lua tcl augeas nss gcrypt neon xz xar keyutils perl selinux 115# sqlite lua tcl augeas nss gcrypt neon xz xar keyutils perl selinux
116 116