[PATCH 00/15] meta: unique dev and dbg packages

[PATCH 00/15] meta: unique dev and dbg packages

[Robert Yang]

Remove extra dev and dbg packages, keep PN-dev and PN-dbg.

// Robert

The following changes since commit 75ae0b7cf3863eb2857a2b6a7073beea626f751d:

  wic: Implement --build-rootfs command line option (2015-04-08 23:11:08 +0100)

are available in the git repository at:

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

Robert Yang (15):
  xz: remove liblzma-dev and liblzma-dbg from PACKAGES
  bzip2: remove libbz2-dev libbz2-staticdev from from PACKAGES
  acl/attr: remove extra dev and staticdev from PACKAGES
  aspell: remove libpspell-dev from PACKAGES
  apmd: remove libapm-dev and libapm-staticdev from PACKAGES
  augeas: remove extra dev and dbg from PACKAGES
  cogl: remove extra dev from PACKAGES
  curl: remove extra dev and staticdev from PACKAGES
  elfutils: remove libdw-dev libasm-dev libelf-dev from PACKAGES
  libtool: remove libltdl-dev libltdl-dbg libltdl-staticdev from
    PACKAGES
  libxmu: remove libxmuu-dev from PACKAGES
  opkg: remove libopkg-dev and libopkg-staticdev from PACKAGES
  pciutils: remove libpci-dev and libpci-dbg from PACKAGES
  sysfsutils: remove libsysfs-dev and libsysfs-staticdev from PACKAGES
  tiff: remove extra dev and dbg from PACKAGES

 meta/recipes-bsp/apmd/apmd_3.2.2-14.bb           |    4 +---
 meta/recipes-bsp/pciutils/pciutils_3.3.0.bb      |    5 +----
 meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb |    2 +-
 meta/recipes-devtools/elfutils/elfutils_0.148.bb |    5 +----
 meta/recipes-devtools/elfutils/elfutils_0.161.bb |    5 +----
 meta/recipes-devtools/libtool/libtool-2.4.6.inc  |    9 +-------
 meta/recipes-devtools/opkg/opkg_0.2.4.bb         |    4 +---
 meta/recipes-extended/augeas/augeas.inc          |    5 +----
 meta/recipes-extended/bzip2/bzip2_1.0.6.bb       |   10 +--------
 meta/recipes-extended/xz/xz_5.2.0.bb             |    8 +-------
 meta/recipes-graphics/cogl/cogl-1.0.inc          |   24 ++--------------------
 meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb   |    3 +--
 meta/recipes-multimedia/libtiff/tiff_4.0.3.bb    |    6 +-----
 meta/recipes-support/aspell/aspell_0.60.6.1.bb   |    4 ++--
 meta/recipes-support/attr/ea-acl.inc             |   13 +-----------
 meta/recipes-support/curl/curl_7.40.0.bb         |   11 +---------
 16 files changed, 18 insertions(+), 100 deletions(-)

-- 
1.7.9.5

[PATCH 01/15] 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.0.bb |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/meta/recipes-extended/xz/xz_5.2.0.bb b/meta/recipes-extended/xz/xz_5.2.0.bb
index 3439ec9..a9e38cc 100644
--- a/meta/recipes-extended/xz/xz_5.2.0.bb
+++ b/meta/recipes-extended/xz/xz_5.2.0.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] = "231ef369982240bb20ed7cffa52bb12a4a297ce6871f480ab85e8a7ba9
 
 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 02/15] bzip2: remove libbz2-dev libbz2-staticdev from 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/bzip2/bzip2_1.0.6.bb |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
index ed12277..233fe4c 100644
--- a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
@@ -16,7 +16,7 @@ SRC_URI = "http://www.bzip.org/${PV}/${BP}.tar.gz \
 SRC_URI[md5sum] = "00b516f4704d4a7cb50a1d97e6e8e15b"
 SRC_URI[sha256sum] = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"
 
-PACKAGES =+ "libbz2 libbz2-dev libbz2-staticdev"
+PACKAGES =+ "libbz2"
 
 CFLAGS_append = " -fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64"
 
@@ -35,14 +35,6 @@ do_install_ptest () {
 
 FILES_libbz2 = "${libdir}/lib*${SOLIBS}"
 
-FILES_libbz2-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV}"
-SECTION_libbz2-dev = "devel"
-RDEPENDS_libbz2-dev = "libbz2 (= ${EXTENDPKGV})"
-
-FILES_libbz2-staticdev = "${libdir}/*.a"
-SECTION_libbz2-staticdev = "devel"
-RDEPENDS_libbz2-staticdev = "libbz2-dev (= ${EXTENDPKGV})"
-
 PROVIDES_append_class-native = " bzip2-replacement-native"
 BBCLASSEXTEND = "native nativesdk"
 
-- 
1.7.9.5

[PATCH 03/15] acl/attr: 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/attr/ea-acl.inc |   13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index b17e9b1..474291a 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -17,21 +17,10 @@ do_install () {
 	oe_runmake install install-lib install-dev DIST_ROOT="${D}"
 }
 
-PACKAGES =+ "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev lib${BPN}-doc"
+PACKAGES =+ "lib${BPN}"
 
 FILES_lib${BPN} = "${base_libdir}/lib*${SOLIBS}"
 
-FILES_lib${BPN}-dev = "${includedir} \
-                      ${libdir}/lib*${SOLIBSDEV} \
-                      ${libdir}/lib*.la \
-                      ${base_libdir}/lib*${SOLIBSDEV} \
-                      ${base_libdir}/lib*.la"
-
-FILES_lib${BPN}-staticdev = "${libdir}/*.a ${base_libdir}/*.a"
-
-FILES_lib${BPN}-doc = "${mandir}/man2 \
-                      ${mandir}/man3"
-
 BBCLASSEXTEND = "native"
 # Only append ldflags for target recipe and if USE_NLS is enabled
 LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl '][(d.getVar('USE_NLS', True) == 'yes')]}"
-- 
1.7.9.5

[PATCH 04/15] aspell: remove libpspell-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-support/aspell/aspell_0.60.6.1.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/aspell/aspell_0.60.6.1.bb b/meta/recipes-support/aspell/aspell_0.60.6.1.bb
index a4f0e14..f546721 100644
--- a/meta/recipes-support/aspell/aspell_0.60.6.1.bb
+++ b/meta/recipes-support/aspell/aspell_0.60.6.1.bb
@@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff4
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses"
 
-PACKAGES += "libaspell libpspell libpspell-dev aspell-utils"
+PACKAGES += "libaspell libpspell aspell-utils"
 
 RDEPENDS_${PN}-utils += "perl"
 
@@ -22,7 +22,7 @@ FILES_libaspell = "${libdir}/libaspell.so.* ${libdir}/aspell*"
 FILES_aspell-utils = "${bindir}/word-list-compress ${bindir}/aspell-import ${bindir}/run-with-aspell ${bindir}/pre*"
 FILES_${PN} = "${bindir}/aspell"
 FILES_libpspell = "${libdir}/libpspell.so.*"
-FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir}/pspell"
+FILES_${PN}-dev += "${bindir}/pspell-config"
 
 ARM_INSTRUCTION_SET = "arm"
 inherit autotools-brokensep gettext texinfo
-- 
1.7.9.5

[PATCH 05/15] apmd: remove libapm-dev and libapm-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-bsp/apmd/apmd_3.2.2-14.bb |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb b/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb
index ab7de65..65dd01b 100644
--- a/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb
+++ b/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb
@@ -74,9 +74,7 @@ do_install() {
 		-e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/apmd.service
 }
 
-PACKAGES =+ "libapm libapm-dev libapm-staticdev apm"
+PACKAGES =+ "libapm apm"
 
 FILES_libapm = "${libdir}/libapm${SOLIBS}"
-FILES_libapm-dev = "${libdir}/libapm${SOLIBSDEV} ${includedir} ${libdir}/libapm.la"
-FILES_libapm-staticdev = "${libdir}/libapm.a"
 FILES_apm = "${bindir}/apm*"
-- 
1.7.9.5

[PATCH 06/15] augeas: remove extra dev and 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/augeas/augeas.inc |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta/recipes-extended/augeas/augeas.inc b/meta/recipes-extended/augeas/augeas.inc
index ac25326..004c998 100644
--- a/meta/recipes-extended/augeas/augeas.inc
+++ b/meta/recipes-extended/augeas/augeas.inc
@@ -14,13 +14,10 @@ DEPENDS = "readline libxml2"
 
 inherit autotools pkgconfig
 
-PACKAGES =+ "${PN}-lenses lib${BPN} lib${BPN}-dev lib${BPN}-staticdev lib${BPN}-dbg"
+PACKAGES =+ "${PN}-lenses lib${BPN}"
 
 FILES_${PN}-lenses = "${datadir}/augeas/lenses"
 FILES_lib${BPN} = "${libdir}/lib*${SOLIBS}"
-FILES_lib${BPN}-dev = "${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la ${includedir} ${libdir}/pkgconfig"
-FILES_lib${BPN}-staticdev = "${libdir}/*.a"
-FILES_lib${BPN}-dbg = "${libdir}/.debug"
 
 RDEPENDS_lib${BPN} += "${PN}-lenses"
 RRECOMMENDS_lib${BPN} += "${PN}"
-- 
1.7.9.5

[PATCH 07/15] cogl: remove extra 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-graphics/cogl/cogl-1.0.inc |   24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
index af06484..3da31c8 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0.inc
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -6,10 +6,8 @@ inherit clutter
 
 DEPENDS = "glib-2.0 gdk-pixbuf"
 PACKAGES =+ "${PN}-examples \
-             libcogl libcogl-dev \
-             libcogl-gles2 libcogl-gles2-dev \
-             libcogl-pango libcogl-pango-dev \
-             libcogl-path libcogl-path-dev"
+             libcogl libcogl-gles2 libcogl-pango libcogl-path \
+            "
 AUTOTOOLS_AUXDIR = "${S}/build"
 
 # Extra DEPENDS for PACKAGECONFIG
@@ -61,28 +59,10 @@ PACKAGECONFIG ??= "cogl-pango gles2 \
 
 FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*"
 FILES_libcogl = "${libdir}/libcogl${SOLIBS}"
-FILES_libcogl-dev = "${includedir}/cogl/cogl \
-                     ${libdir}/libcogl${SOLIBSDEV} \
-                     ${libdir}/libcogl.la \
-                     ${libdir}/pkgconfig/cogl-1.0.pc \
-                     ${libdir}/pkgconfig/cogl-2.0-experimental.pc \
-                     ${libdir}/pkgconfig/cogl-gl-1.0.pc"
 FILES_libcogl-gles2 = "${libdir}/libcogl-gles2${SOLIBS}"
-FILES_libcogl-gles2-dev = "${includedir}/cogl/cogl-gles2 \
-                           ${libdir}/libcogl-gles2${SOLIBSDEV} \
-                           ${libdir}/libcogl-gles2.la \
-                           ${libdir}/pkgconfig/cogl-gles2-*.pc"
 FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS}"
-FILES_libcogl-pango-dev = "${includedir}/cogl/cogl-pango \
-                           ${libdir}/libcogl-pango${SOLIBSDEV} \
-                           ${libdir}/libcogl-pango.la \
-                           ${libdir}/pkgconfig/cogl-pango-*.pc"
 
 FILES_libcogl-path = "${libdir}/libcogl-path${SOLIBS}"
-FILES_libcogl-path-dev = "${includedir}/cogl/cogl-path \
-                          ${libdir}/libcogl-path${SOLIBSDEV} \
-                          ${libdir}/libcogl-path.la \
-                          ${libdir}/pkgconfig/cogl-path-*.pc"
 
 # For backwards compatibility after Debian-renaming
 RPROVIDES_libcogl = "cogl-1.0"
-- 
1.7.9.5

[PATCH 08/15] 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.40.0.bb |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/meta/recipes-support/curl/curl_7.40.0.bb b/meta/recipes-support/curl/curl_7.40.0.bb
index 4cde9c6..bd5bf96 100644
--- a/meta/recipes-support/curl/curl_7.40.0.bb
+++ b/meta/recipes-support/curl/curl_7.40.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 09/15] elfutils: remove libdw-dev libasm-dev libelf-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/elfutils/elfutils_0.148.bb |    5 +----
 meta/recipes-devtools/elfutils/elfutils_0.161.bb |    5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-devtools/elfutils/elfutils_0.148.bb b/meta/recipes-devtools/elfutils/elfutils_0.148.bb
index 16db6b2..47875d5 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.148.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.148.bb
@@ -69,7 +69,7 @@ EXTRA_OEMAKE_class-nativesdk = ""
 BBCLASSEXTEND = "native nativesdk"
 
 # Package utilities separately
-PACKAGES =+ "${PN}-binutils libelf libasm libdw libdw-dev libasm-dev libelf-dev"
+PACKAGES =+ "${PN}-binutils libelf libasm libdw"
 FILES_${PN}-binutils = "\
     ${bindir}/eu-addr2line \
     ${bindir}/eu-ld \
@@ -81,9 +81,6 @@ FILES_${PN}-binutils = "\
 FILES_libelf = "${libdir}/libelf-${PV}.so ${libdir}/libelf.so.*"
 FILES_libasm = "${libdir}/libasm-${PV}.so ${libdir}/libasm.so.*"
 FILES_libdw  = "${libdir}/libdw-${PV}.so ${libdir}/libdw.so.* ${libdir}/elfutils/lib*"
-FILES_libelf-dev = "${libdir}/libelf.so ${includedir}"
-FILES_libasm-dev = "${libdir}/libasm.so ${includedir}/elfutils/libasm.h"
-FILES_libdw-dev  = "${libdir}/libdw.so  ${includedir}/dwarf.h ${includedir}/elfutils/libdw*.h"
 # Some packages have the version preceeding the .so instead properly
 # versioned .so.<version>, so we need to reorder and repackage.
 #FILES_${PN} += "${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so"
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.161.bb b/meta/recipes-devtools/elfutils/elfutils_0.161.bb
index a3c1f36..c18222d 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.161.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.161.bb
@@ -73,7 +73,7 @@ EXTRA_OEMAKE_class-nativesdk = ""
 BBCLASSEXTEND = "native nativesdk"
 
 # Package utilities separately
-PACKAGES =+ "${PN}-binutils libelf libasm libdw libdw-dev libasm-dev libelf-dev"
+PACKAGES =+ "${PN}-binutils libelf libasm libdw"
 FILES_${PN}-binutils = "\
     ${bindir}/eu-addr2line \
     ${bindir}/eu-ld \
@@ -85,9 +85,6 @@ FILES_${PN}-binutils = "\
 FILES_libelf = "${libdir}/libelf-${PV}.so ${libdir}/libelf.so.*"
 FILES_libasm = "${libdir}/libasm-${PV}.so ${libdir}/libasm.so.*"
 FILES_libdw  = "${libdir}/libdw-${PV}.so ${libdir}/libdw.so.* ${libdir}/elfutils/lib*"
-FILES_libelf-dev = "${libdir}/libelf.so ${includedir}"
-FILES_libasm-dev = "${libdir}/libasm.so ${includedir}/elfutils/libasm.h"
-FILES_libdw-dev  = "${libdir}/libdw.so  ${includedir}/dwarf.h ${includedir}/elfutils/libdw*.h"
 # Some packages have the version preceeding the .so instead properly
 # versioned .so.<version>, so we need to reorder and repackage.
 #FILES_${PN} += "${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so"
-- 
1.7.9.5

[PATCH 10/15] libtool: remove libltdl-dev libltdl-dbg libltdl-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-devtools/libtool/libtool-2.4.6.inc |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/meta/recipes-devtools/libtool/libtool-2.4.6.inc b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
index 2125de3..6af6923 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.6.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
@@ -36,17 +36,10 @@ EXTRA_AUTORECONF = "--exclude=libtoolize"
 
 DEPENDS = "libtool-native"
 
-PACKAGES =+ "libltdl libltdl-dev libltdl-dbg libltdl-staticdev"
+PACKAGES =+ "libltdl"
 FILES_${PN} += "${datadir}/aclocal"
-FILES_${PN}-dev = "${includedir} ${FILES_SOLIBSDEV} ${libdir}/*.la \
-                ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \
-                ${base_libdir}/*.o ${libdir}/${BPN}/*.la ${base_libdir}/*.la"
 
 #FILES_${PN}-dev := "${@oe_filter_out('${datadir}/aclocal', '${FILES_libtool-dev}', d)}"
 FILES_libltdl = "${libdir}/libltdl${SOLIBS}"
-FILES_libltdl-dev = "${libdir}/libltdl${SOLIBSDEV} ${includedir}"
-FILES_libltdl-dev =+ "${libdir}/libltdl.la"
-FILES_libltdl-staticdev = "${libdir}/libltdl.a"
-FILES_libltdl-dbg = "${libdir}/.debug/"
 
 export CONFIG_SHELL="/bin/bash"
-- 
1.7.9.5

[PATCH 11/15] libxmu: remove libxmuu-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-graphics/xorg-lib/libxmu_1.1.2.bb |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb
index 3922b52..003baec 100644
--- a/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb
@@ -22,10 +22,9 @@ XORG_PN = "libXmu"
 
 LEAD_SONAME = "libXmu"
 
-PACKAGES =+ "libxmuu libxmuu-dev"
+PACKAGES =+ "libxmuu"
 
 FILES_libxmuu = "${libdir}/libXmuu.so.*"
-FILES_libxmuu-dev = "${libdir}/libXmuu.so"
 
 BBCLASSEXTEND = "native"
 
-- 
1.7.9.5

[PATCH 12/15] opkg: remove libopkg-dev and libopkg-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-devtools/opkg/opkg_0.2.4.bb |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/opkg/opkg_0.2.4.bb b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
index 23a32e6..a9ba037 100644
--- a/meta/recipes-devtools/opkg/opkg_0.2.4.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
@@ -78,10 +78,8 @@ RREPLACES_${PN} = "opkg-nogpg opkg-collateral"
 RCONFLICTS_${PN} = "opkg-collateral"
 RPROVIDES_${PN} = "opkg-collateral"
 
-PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg"
+PACKAGES =+ "libopkg"
 
-FILES_libopkg-dev = "${libdir}/*.la ${libdir}/*.so ${includedir}/libopkg"
-FILES_libopkg-staticdev = "${libdir}/*.a"
 FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/"
 FILES_${PN} += "${systemd_unitdir}/system/"
 
-- 
1.7.9.5

[PATCH 13/15] pciutils: remove libpci-dev and libpci-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-bsp/pciutils/pciutils_3.3.0.bb |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta/recipes-bsp/pciutils/pciutils_3.3.0.bb b/meta/recipes-bsp/pciutils/pciutils_3.3.0.bb
index b713512..7a3a0c6 100644
--- a/meta/recipes-bsp/pciutils/pciutils_3.3.0.bb
+++ b/meta/recipes-bsp/pciutils/pciutils_3.3.0.bb
@@ -52,12 +52,9 @@ do_install () {
 	oe_multilib_header pci/config.h
 }
 
-PACKAGES =+ "${PN}-ids libpci libpci-dev libpci-dbg"
+PACKAGES =+ "${PN}-ids libpci"
 FILES_${PN}-ids = "${datadir}/pci.ids*"
 FILES_libpci = "${libdir}/libpci.so.*"
-FILES_libpci-dbg = "${libdir}/.debug"
-FILES_libpci-dev = "${libdir}/libpci.a ${libdir}/libpci.la ${libdir}/libpci.so \
-                    ${includedir}/pci ${libdir}/pkgconfig"
 SUMMARY_${PN}-ids = "PCI utilities - device ID database"
 DESCRIPTION_${PN}-ids = "Package providing the PCI device ID database for pciutils."
 RDEPENDS_${PN} += "${PN}-ids"
-- 
1.7.9.5

[PATCH 14/15] sysfsutils: remove libsysfs-dev and libsysfs-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-core/sysfsutils/sysfsutils_2.1.0.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
index 1d9c476..b9f40f4 100644
--- a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
+++ b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
@@ -21,7 +21,7 @@ S = "${WORKDIR}/sysfsutils-${PV}"
 
 inherit autotools
 
-PACKAGES =+ "libsysfs libsysfs-dev libsysfs-staticdev"
+PACKAGES =+ "libsysfs"
 FILES_libsysfs = "${libdir}/lib*${SOLIBS}"
 FILES_libsysfs-dev = "${libdir}/lib*${SOLIBSDEV} ${includedir}"
 FILES_libsysfs-staticdev = "${libdir}/lib*.a"
-- 
1.7.9.5

[PATCH 15/15] tiff: remove extra dev and 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-multimedia/libtiff/tiff_4.0.3.bb |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.3.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.3.bb
index b7d1129..62e6256 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.3.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.3.bb
@@ -43,12 +43,8 @@ PACKAGECONFIG[check-ycbcr-subsampling] = "--enable-check-ycbcr-subsampling,--dis
 # in chunks when using TIFFReadScanline. Experimental 4.0+ feature
 PACKAGECONFIG[chunky-strip-read] = "--enable-chunky-strip-read,--disable-chunky-strip-read,,"
 
-PACKAGES =+ "tiffxx tiffxx-dbg tiffxx-dev tiffxx-staticdev tiff-utils tiff-utils-dbg"
+PACKAGES =+ "tiffxx tiff-utils"
 FILES_tiffxx = "${libdir}/libtiffxx.so.*"
-FILES_tiffxx-dev = "${libdir}/libtiffxx.so ${libdir}/libtiffxx.la"
-FILES_tiffxx-staticdev = "${libdir}/libtiffxx.a"
-FILES_tiffxx-dbg += "${libdir}/.debug/libtiffxx.so*"
 FILES_tiff-utils = "${bindir}/*"
-FILES_tiff-utils-dbg += "${bindir}/.debug/"
 
 BBCLASSEXTEND = "native"
-- 
1.7.9.5

Re: [PATCH 04/15] aspell: remove libpspell-dev from PACKAGES

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 282 bytes --]

On 10 April 2015 at 10:29, Robert Yang <liezhi.yang@windriver.com> wrote:

> +FILES_${PN}-dev += "${bindir}/pspell-config"
>
>  inherit autotools-brokensep gettext texinfo
>

Is that a binconfig-style pspell-config and so we should be inheriting
binconfig.bbclass?

Ross

[-- Attachment #2: Type: text/html, Size: 676 bytes --]

Re: [PATCH 04/15] aspell: remove libpspell-dev from PACKAGES

[Robert Yang]

On 04/13/2015 09:33 PM, Burton, Ross wrote:
>
> On 10 April 2015 at 10:29, Robert Yang <liezhi.yang@windriver.com
> <mailto:liezhi.yang@windriver.com>> wrote:
>
>     +FILES_${PN}-dev += "${bindir}/pspell-config"
>
>       inherit autotools-brokensep gettext texinfo
>
>
> Is that a binconfig-style pspell-config and so we should be inheriting
> binconfig.bbclass?

Yes, I think so, I will fix that.

// Robert

>
> Ross