summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-03-13 12:17:27 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-14 13:03:11 +0000
commit05a360bd7f4df8e719e94f254bc0057ee91746a3 (patch)
tree832da601873379202d68f26df2b9d73a18027bd7
parent0d1ea0ddcf3cb445a6b0bb3e1641aaa1de317a12 (diff)
downloadpoky-05a360bd7f4df8e719e94f254bc0057ee91746a3.tar.gz
rpm: Package python-rpm static archive correctly
WARNING: QA Issue: non -staticdev package contains static .a library: python-rpm path '/work/i586-poky-linux/rpm-5.4.0-r34/packages-split/python-rpm/usr/lib/python2.7/rpm/_rpmmodule.a' (From OE-Core rev: 1374c7a8ea7c583d428a9546999a4ec3bee06128) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.0.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index 2441380f4e..0df107ddbd 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 = "file-native" 47extrarpmdeps_virtclass-native = "file-native"
48PR = "r34" 48PR = "r35"
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...
@@ -174,7 +174,7 @@ EXTRA_OECONF = "--verbose \
174 174
175CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY" 175CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY"
176 176
177PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale" 177PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm-staticdev python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale"
178 178
179SOLIBS = "5.4.so" 179SOLIBS = "5.4.so"
180 180
@@ -302,6 +302,7 @@ RDEPENDS_${PN}-build = "file"
302#%rpmattr %{_rpmhome}/symclash.* 302#%rpmattr %{_rpmhome}/symclash.*
303 303
304FILES_python-rpm-dbg = "${libdir}/python*/rpm/.debug/_*" 304FILES_python-rpm-dbg = "${libdir}/python*/rpm/.debug/_*"
305FILES_python-rpm-staticdev = "${libdir}/python*/rpm/*.a"
305FILES_python-rpm = "${libdir}/python*/rpm" 306FILES_python-rpm = "${libdir}/python*/rpm"
306 307
307FILES_perl-module-rpm = "${libdir}/perl/*/* \ 308FILES_perl-module-rpm = "${libdir}/perl/*/* \