[PATCH 0/4] meta: remove extra dev and dbg from PACKAGES

[PATCH 0/4] meta: remove extra dev and dbg from PACKAGES

[Robert Yang]

Hello,

I had sent xz and curl in the previous thread, but not got merged, any
comments on them, please ?

// Robert

The following changes since commit 8d207e55031c0b93387e728f4312b8cb34ad5b12:

  libgpg-error 1.18: simplify tupple handling and add armv8b support (2015-04-13 22:32:06 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/dev
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/dev

Robert Yang (4):
  xz: remove liblzma-dev and liblzma-dbg from PACKAGES
  curl: remove extra dev and staticdev from PACKAGES
  libgcc: remove libgcov-dev from PACKAGES
  gcc-target: remove gcc-plugin-dev from PACKAGES

 .../packagegroup-core-standalone-sdk-target.bb     |    1 -
 meta/recipes-devtools/gcc/gcc-target.inc           |    3 ---
 meta/recipes-devtools/gcc/libgcc.inc               |    5 +----
 meta/recipes-extended/xz/xz_5.2.1.bb               |    8 +-------
 meta/recipes-support/curl/curl_7.41.0.bb           |   11 +----------
 5 files changed, 3 insertions(+), 25 deletions(-)

-- 
1.7.9.5

[PATCH 1/4] xz: remove liblzma-dev and liblzma-dbg from PACKAGES

[Robert Yang]

There should be only one dev and dbg package.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-extended/xz/xz_5.2.1.bb |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/meta/recipes-extended/xz/xz_5.2.1.bb b/meta/recipes-extended/xz/xz_5.2.1.bb
index a197f91..e0ae48f 100644
--- a/meta/recipes-extended/xz/xz_5.2.1.bb
+++ b/meta/recipes-extended/xz/xz_5.2.1.bb
@@ -14,9 +14,6 @@ LICENSE_${PN}-doc = "GPLv2+"
 LICENSE_${PN}-dbg = "GPLv2+"
 LICENSE_${PN}-locale = "GPLv2+"
 LICENSE_liblzma = "PD"
-LICENSE_liblzma-dev = "PD"
-LICENSE_liblzma-staticdev = "PD"
-LICENSE_liblzma-dbg = "PD"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \
                     file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@@ -30,12 +27,9 @@ SRC_URI[sha256sum] = "b918b6648076e74f8d7ae19db5ee663df800049e187259faf5eb997a7b
 
 inherit autotools gettext
 
-PACKAGES =+ "liblzma liblzma-dev liblzma-staticdev liblzma-dbg"
+PACKAGES =+ "liblzma"
 
 FILES_liblzma = "${libdir}/liblzma*${SOLIBS}"
-FILES_liblzma-dev = "${includedir}/lzma* ${libdir}/liblzma*${SOLIBSDEV} ${libdir}/liblzma.la ${libdir}/pkgconfig/liblzma.pc"
-FILES_liblzma-staticdev = "${libdir}/liblzma.a"
-FILES_liblzma-dbg = "${libdir}/.debug/liblzma*"
 
 BBCLASSEXTEND = "native nativesdk"
 
-- 
1.7.9.5

[PATCH 2/4] curl: remove extra dev and staticdev from PACKAGES

[Robert Yang]

There should be only one dev and dbg package.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-support/curl/curl_7.41.0.bb |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/meta/recipes-support/curl/curl_7.41.0.bb b/meta/recipes-support/curl/curl_7.41.0.bb
index c3c3c0b..49ce716 100644
--- a/meta/recipes-support/curl/curl_7.41.0.bb
+++ b/meta/recipes-support/curl/curl_7.41.0.bb
@@ -42,18 +42,9 @@ do_install_append() {
 	oe_multilib_header curl/curlbuild.h
 }
 
-PACKAGES =+ "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev lib${BPN}-doc"
+PACKAGES =+ "lib${BPN}"
 
 FILES_lib${BPN} = "${libdir}/lib*.so.*"
 RRECOMMENDS_lib${BPN} += "ca-certificates"
-FILES_lib${BPN}-dev = "${includedir} \
-                      ${libdir}/lib*.so \
-                      ${libdir}/lib*.la \
-                      ${libdir}/pkgconfig \
-                      ${datadir}/aclocal \
-                      ${bindir}/*-config"
-FILES_lib${BPN}-staticdev = "${libdir}/lib*.a"
-FILES_lib${BPN}-doc = "${mandir}/man3 \
-                      ${mandir}/man1/curl-config.1"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
1.7.9.5

[PATCH 3/4] libgcc: remove libgcov-dev from PACKAGES

[Robert Yang]

There should be only one dev and dbg package.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../packagegroup-core-standalone-sdk-target.bb     |    1 -
 meta/recipes-devtools/gcc/libgcc.inc               |    5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
index 154a55c..5d1ce97 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
@@ -7,7 +7,6 @@ inherit packagegroup
 RDEPENDS_${PN} = "\
     libgcc \
     libgcc-dev \
-    libgcov-dev \
     libstdc++ \
     libstdc++-dev \
     ${LIBC_DEPENDENCIES} \
diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/meta/recipes-devtools/gcc/libgcc.inc
index 21cb8c1..35432c7 100644
--- a/meta/recipes-devtools/gcc/libgcc.inc
+++ b/meta/recipes-devtools/gcc/libgcc.inc
@@ -6,7 +6,6 @@ PACKAGES = "\
     ${PN} \
     ${PN}-dev \
     ${PN}-dbg \
-    libgcov-dev \
 "
 
 # All libgcc source is marked with the exception.
@@ -26,10 +25,9 @@ FILES_${PN}-dev = "\
     ${libdir}/${TARGET_SYS}/${BINV}/n32 \
     ${libdir}/${TARGET_SYS}/${BINV}/libgcc* \
     ${@base_conditional('TARGET_SYS_NO_EXTENSION', '${TARGET_SYS}', '', '${libdir}/${TARGET_SYS_NO_EXTENSION}', d)} \
-"
-FILES_libgcov-dev = "\
     ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \
 "
+
 FILES_${PN}-dbg += "${base_libdir}/.debug/"
 
 LIBGCCBUILDTREENAME = "gcc-build-internal-"
@@ -40,5 +38,4 @@ do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
 do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
 
 INSANE_SKIP_${PN}-dev = "staticdev"
-INSANE_SKIP_${MLPREFIX}libgcov-dev = "staticdev"
 
-- 
1.7.9.5

[PATCH 4/4] gcc-target: remove gcc-plugin-dev from PACKAGES

[Robert Yang]

There should be only one dev and dbg package.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/gcc/gcc-target.inc |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc
index 4c3eea6..e348517 100644
--- a/meta/recipes-devtools/gcc/gcc-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-target.inc
@@ -19,7 +19,6 @@ PACKAGES = "\
     g77 g77-symlinks \
     gfortran gfortran-symlinks \
     gcov gcov-symlinks \
-    ${PN}-plugin-dev \
     ${PN}-doc \
     ${PN}-dev \
     ${PN}-dbg \
@@ -47,8 +46,6 @@ FILES_${PN}-dbg += "\
 FILES_${PN}-dev = "\
     ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \
     ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \
-"
-FILES_${PN}-plugin-dev = "\
     ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \
     ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/gengtype \
     ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/gtype.state \
-- 
1.7.9.5