From 49a99cc3c0b0309be0930d2b3de6465e67522957 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 1 Jun 2010 23:44:32 +0200 Subject: klibc: fix packaging without moving PACKAGES and FILES_ back to recipes Signed-off-by: Martin Jansa --- recipes/klibc/klibc-common.inc | 2 +- recipes/klibc/klibc-utils.inc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'recipes/klibc') diff --git a/recipes/klibc/klibc-common.inc b/recipes/klibc/klibc-common.inc index 7b7a3cb43e..5aba9e5d4f 100644 --- a/recipes/klibc/klibc-common.inc +++ b/recipes/klibc/klibc-common.inc @@ -9,7 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/${KLIBC_FETCHDIR}/klibc-${PV S = "${WORKDIR}/klibc-${PV}" PACKAGE_ARCH = "${MACHINE_ARCH}" -INC_PR = "r14" +INC_PR = "r16" KLIBC_ARCH = '${TARGET_ARCH}' KLIBC_ARCH_armeb = 'arm' diff --git a/recipes/klibc/klibc-utils.inc b/recipes/klibc/klibc-utils.inc index 7bbcee3241..912b774716 100644 --- a/recipes/klibc/klibc-utils.inc +++ b/recipes/klibc/klibc-utils.inc @@ -43,11 +43,9 @@ do_install_append() { # only in 1.5 # install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/insmod ${D}${base_bindir} -# only in >= 1.5.15 +# only in >= 1.5.18 (can be moved to do_install_append above as soon as klibc_1.5 is dropped from tree) # install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dmesg ${D}${base_bindir} # install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir} - -# only in >= 1.5.15+1.5.16 # install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir} PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \ @@ -85,6 +83,7 @@ PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \ ${KLIBC_UTILS_PKGNAME}-modprobe \ ${KLIBC_UTILS_PKGNAME}-losetup \ ${KLIBC_UTILS_PKGNAME}-wc \ + ${KLIBC_UTILS_PKGNAME}-insmod \ ${KLIBC_UTILS_PKGNAME}-ls" FILES_${KLIBC_UTILS_PKGNAME}-sh = "${base_bindir}/sh" @@ -122,4 +121,5 @@ FILES_${KLIBC_UTILS_PKGNAME}-uname = "${base_bindir}/uname" FILES_${KLIBC_UTILS_PKGNAME}-modprobe = "${base_sbindir}/modprobe" FILES_${KLIBC_UTILS_PKGNAME}-losetup = "${base_bindir}/losetup" FILES_${KLIBC_UTILS_PKGNAME}-wc = "${base_bindir}/wc" +FILES_${KLIBC_UTILS_PKGNAME}-insmod = "${base_bindir}/insmod" FILES_${KLIBC_UTILS_PKGNAME}-ls = "${base_bindir}/ls" -- cgit 1.2.3-korg