summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-07-11 15:23:21 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-12 15:00:48 +0100
commitb8e12e91bbe9f8ea4a1788733f7ddb9a1cc3a614 (patch)
treed5732f867ce396373f663d97628228ac4175e92a
parent7cbce4bf877f0c04b267d4bb45abc9e45698037c (diff)
downloadpoky-b8e12e91bbe9f8ea4a1788733f7ddb9a1cc3a614.tar.gz
rpm: fix for non /usr/lib libdir case
rpm default will use /usr/lib if the --with-path-lib is not specified. this will not work in non /usr/lib libdir case. so this patch add the --with-path-lib to fix this issue. (From OE-Core rev: f707953372dd0962efb5cb8daeb422743376bc29) Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.0.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index d0933456b8..9cfb3ab03b 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
45DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}" 45DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
46extrarpmdeps = "python perl" 46extrarpmdeps = "python perl"
47extrarpmdeps_virtclass-native = "" 47extrarpmdeps_virtclass-native = ""
48PR = "r18" 48PR = "r19"
49 49
50# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed 50# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
51# in order to extract the distribution SRPM into a format we can extract... 51# in order to extract the distribution SRPM into a format we can extract...
@@ -162,6 +162,7 @@ EXTRA_OECONF = "--verbose \
162 --enable-build-debug \ 162 --enable-build-debug \
163 --enable-maintainer-mode \ 163 --enable-maintainer-mode \
164 --with-path-macros=${rpm_macros} \ 164 --with-path-macros=${rpm_macros} \
165 --with-path-lib=${libdir}/rpm \
165 --with-bugreport=http://bugzilla.yoctoproject.org" 166 --with-bugreport=http://bugzilla.yoctoproject.org"
166 167
167CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY" 168CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY"