aboutsummaryrefslogtreecommitdiffstats
path: root/recipes
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2010-09-13 19:27:27 +0200
committerAndrea Adami <andrea.adami@gmail.com>2010-09-13 19:32:33 +0200
commiteda06ec3dde6169a46797f876a82499c4fff8f62 (patch)
tree729f8b0ce4bdbcd8a16f561fb68da0d66c3a3eb8 /recipes
parentd888b42cc4597814b714a8c008df7094c7de53d1 (diff)
downloadopenembedded-eda06ec3dde6169a46797f876a82499c4fff8f62.tar.gz
openembedded-eda06ec3dde6169a46797f876a82499c4fff8f62.tar.bz2
openembedded-eda06ec3dde6169a46797f876a82499c4fff8f62.zip
klibc: fix packaging mismatch
* introduced by mistake extending list of packaged files * (copy and paste is for the lazy...) * bump PR
Diffstat (limited to 'recipes')
-rw-r--r--recipes/klibc/klibc.inc2
-rw-r--r--recipes/klibc/klibc_1.5.20.bb20
2 files changed, 8 insertions, 14 deletions
diff --git a/recipes/klibc/klibc.inc b/recipes/klibc/klibc.inc
index 6fcfc0e553..ab28e2f3ab 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 cad9746abd..adbe8c0348 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})"