From b412306418c3915bb11e3d5201cafb68e2f2b453 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 4 Jun 2015 02:01:10 -0700 Subject: rpm: remove extra dev and dbg packages There should be only one dev and dbg package. [YOCTO #7481] Signed-off-by: Robert Yang Signed-off-by: Ross Burton --- meta/recipes-devtools/rpm/rpm_5.4.14.bb | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb index 03a24f08be..75b1ae22cc 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb @@ -34,10 +34,6 @@ DESCRIPTION_perl-modules-rpm = "The perl-modules-rpm package contains a module t written in the Perl programming language to use the interface \ supplied by the RPM Package Manager libraries." -SUMMARY_perl-module-rpm-dev = "Development components for perl bindings" -DESCRIPTION_perl-modules-rpm-dev = "Development items such as man pages for use with the Perl \ -language bindings." - HOMEPAGE = "http://rpm5.org/" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" @@ -211,7 +207,7 @@ CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY -DRPM_VENDOR_OE" LDFLAGS_append_libc-uclibc = "-lrt -lpthread" -PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm-staticdev python-rpm-dev python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale" +PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm perl-module-rpm ${PN}-locale" SOLIBS = "5.4.so" @@ -248,6 +244,7 @@ FILES_${PN} = "${bindir}/rpm \ FILES_${PN}-dbg += "${libdir}/rpm/.debug \ ${libdir}/rpm/bin/.debug \ + ${libdir}/python*/site-packages/rpm/.debug/_* \ " FILES_${PN}-common = "${bindir}/rpm2cpio \ @@ -341,18 +338,12 @@ RDEPENDS_${PN}-build = "file bash perl" RDEPENDS_python-rpm = "${PN}" -FILES_python-rpm-dbg = "${libdir}/python*/site-packages/rpm/.debug/_*" -FILES_python-rpm-dev = "${libdir}/python*/site-packages/rpm/*.la" -FILES_python-rpm-staticdev = "${libdir}/python*/site-packages/rpm/*.a" FILES_python-rpm = "${libdir}/python*/site-packages/rpm" PROVIDES += "python-rpm" FILES_perl-module-rpm = "${libdir}/perl/*/* \ " -FILES_perl-module-rpm-dev = "${prefix}/share/man/man3/RPM* \ - " - RDEPENDS_${PN}-dev += "bash" FILES_${PN}-dev = "${includedir}/rpm \ @@ -381,6 +372,7 @@ FILES_${PN}-staticdev = " \ ${libdir}/librpmmisc.a \ ${libdir}/librpmbuild.a \ ${libdir}/rpm/lib/liblua.a \ + ${libdir}/python*/site-packages/rpm/*.a \ " do_configure() { -- cgit 1.2.3-korg