Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

klibc: fix packaging mismatch

* introduced by mistake extending list of packaged files
* (copy and paste is for the lazy...)
* bump PR
  • Loading branch information...
commit eda06ec3dde6169a46797f876a82499c4fff8f62 1 parent d888b42
andrea-adami andrea-adami authored
Showing with 8 additions and 14 deletions.
  1. +1 −1  recipes/klibc/klibc.inc
  2. +7 −13 recipes/klibc/klibc_1.5.20.bb
2  recipes/klibc/klibc.inc
View
@@ -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'
20 recipes/klibc/klibc_1.5.20.bb
View
@@ -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})"
Please sign in to comment.
Something went wrong with that request. Please try again.