[oe-commits] Andrea Adami : klibc: fix packaging mismatch

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: eda06ec3dde6169a46797f876a82499c4fff8f62
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=eda06ec3dde6169a46797f876a82499c4fff8f62

Author: Andrea Adami <andrea.adami at gmail.com>
Date:   Mon Sep 13 19:27:27 2010 +0200

klibc: fix packaging mismatch

* introduced by mistake extending list of packaged files
* (copy and paste is for the lazy...)
* bump PR

---

 recipes/klibc/klibc.inc       |    2 +-
 recipes/klibc/klibc_1.5.20.bb |   20 +++++++-------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/recipes/klibc/klibc.inc b/recipes/klibc/klibc.inc
index 6fcfc0e..ab28e2f 100644
--- a/recipes/klibc/klibc.inc
+++ b/recipes/klibc/klibc.inc
@@ -6,7 +6,7 @@ minimal entaglement, and portability, not speed."
 LICENSE = "BSD-ADV"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-INC_PR = "r0"
+INC_PR = "r1"
 
 KLIBC_ARCH = '${TARGET_ARCH}'
 KLIBC_ARCH_armeb = 'arm'
diff --git a/recipes/klibc/klibc_1.5.20.bb b/recipes/klibc/klibc_1.5.20.bb
index cad9746..adbe8c0 100644
--- a/recipes/klibc/klibc_1.5.20.bb
+++ b/recipes/klibc/klibc_1.5.20.bb
@@ -1,6 +1,5 @@
 PR = "${INC_PR}.0"
 
-
 export INST=${D}
 
 do_install() {
@@ -14,19 +13,14 @@ do_install() {
         (cd  ${D}${base_libdir}; ln -s klibc-*.so klibc.so)
 }
 
-# ${PN}-dev was introduced to fix
-# ERROR: QA Issue with klibc: non -dev package contains symlink .so: klibc
-# '<path>/klibc/lib/klibc.so'
+PACKAGES = "${PN} ${PN}-dev"
+FILES_${PN} = "${base_libdir}/klibc-*.so"
+FILES_${PN}-dev = "${base_libdir}/klibc.so \
+                   ${base_libdir}/klibc/lib/* \
+                   ${base_libdir}/klibc/include/* \
+                   ${base_bindir}/klcc \
+                  "
 
-PACKAGES = "${PN}-dev ${PN}"
-FILES_${PN}-dev = "${base_libdir}/klibc.so"
-FILES_${PN} = "${base_libdir}/klibc-*.so \
-               ${base_libdir}/klibc.so \
-               ${base_libdir}/klibc/lib/* \
-               ${base_libdir}/klibc/include/* \
-# FIXME: packaging klcc makes klcc-cross ipk empty
-               ${base_bindir}/klcc \
-               "
 # Yes we want exactly the klibc that was compiled with the utils
 RDEPENDS_${KLIBC_UTILS_PKGNAME}-sh = "${PN} (=${PV}-${PR})"
 RDEPENDS_${KLIBC_UTILS_PKGNAME}-kinit = "${PN} (=${PV}-${PR})"