diff options
| -rw-r--r-- | recipes/klibc/klibc-common.inc | 2 | ||||
| -rw-r--r-- | recipes/klibc/klibc-utils.inc | 18 | ||||
| -rw-r--r-- | recipes/klibc/klibc.inc | 4 | ||||
| -rw-r--r-- | recipes/klibc/klibc_1.5.18.bb | 2 | ||||
| -rw-r--r-- | recipes/klibc/klibc_1.5.18.inc | 8 | ||||
| -rw-r--r-- | recipes/klibc/klibc_1.5.bb | 2 | ||||
| -rw-r--r-- | recipes/klibc/klibc_1.5.inc | 3 |
7 files changed, 22 insertions, 17 deletions
diff --git a/recipes/klibc/klibc-common.inc b/recipes/klibc/klibc-common.inc index 1f3aab1735..7b7a3cb43e 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 = "r15" +INC_PR = "r14" KLIBC_ARCH = '${TARGET_ARCH}' KLIBC_ARCH_armeb = 'arm' diff --git a/recipes/klibc/klibc-utils.inc b/recipes/klibc/klibc-utils.inc index 930eb60b33..7bbcee3241 100644 --- a/recipes/klibc/klibc-utils.inc +++ b/recipes/klibc/klibc-utils.inc @@ -40,6 +40,16 @@ do_install_append() { ln -s gzip ${D}${base_bindir}/zcat } +# only in 1.5 +# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/insmod ${D}${base_bindir} + +# only in >= 1.5.15 +# 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 \ ${KLIBC_UTILS_PKGNAME}-gzip \ ${KLIBC_UTILS_PKGNAME}-kinit \ @@ -52,6 +62,7 @@ PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \ ${KLIBC_UTILS_PKGNAME}-chroot \ ${KLIBC_UTILS_PKGNAME}-cpio \ ${KLIBC_UTILS_PKGNAME}-dd \ + ${KLIBC_UTILS_PKGNAME}-dmesg \ ${KLIBC_UTILS_PKGNAME}-false \ ${KLIBC_UTILS_PKGNAME}-halt \ ${KLIBC_UTILS_PKGNAME}-kill \ @@ -67,12 +78,14 @@ PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \ ${KLIBC_UTILS_PKGNAME}-readlink \ ${KLIBC_UTILS_PKGNAME}-reboot \ ${KLIBC_UTILS_PKGNAME}-sleep \ + ${KLIBC_UTILS_PKGNAME}-sync \ ${KLIBC_UTILS_PKGNAME}-true \ ${KLIBC_UTILS_PKGNAME}-umount \ ${KLIBC_UTILS_PKGNAME}-uname \ ${KLIBC_UTILS_PKGNAME}-modprobe \ ${KLIBC_UTILS_PKGNAME}-losetup \ - ${KLIBC_UTILS_PKGNAME}-wc" + ${KLIBC_UTILS_PKGNAME}-wc \ + ${KLIBC_UTILS_PKGNAME}-ls" FILES_${KLIBC_UTILS_PKGNAME}-sh = "${base_bindir}/sh" FILES_${KLIBC_UTILS_PKGNAME}-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat" @@ -86,6 +99,7 @@ FILES_${KLIBC_UTILS_PKGNAME}-cat = "${base_bindir}/cat" FILES_${KLIBC_UTILS_PKGNAME}-chroot = "${base_bindir}/chroot" FILES_${KLIBC_UTILS_PKGNAME}-cpio = "${base_bindir}/cpio" FILES_${KLIBC_UTILS_PKGNAME}-dd = "${base_bindir}/dd" +FILES_${KLIBC_UTILS_PKGNAME}-dmesg = "${base_bindir}/dmesg" FILES_${KLIBC_UTILS_PKGNAME}-false = "${base_bindir}/false" FILES_${KLIBC_UTILS_PKGNAME}-halt = "${base_bindir}/halt" FILES_${KLIBC_UTILS_PKGNAME}-kill = "${base_bindir}/kill" @@ -101,9 +115,11 @@ FILES_${KLIBC_UTILS_PKGNAME}-poweroff = "${base_bindir}/poweroff" FILES_${KLIBC_UTILS_PKGNAME}-readlink = "${base_bindir}/readlink" FILES_${KLIBC_UTILS_PKGNAME}-reboot = "${base_bindir}/reboot" FILES_${KLIBC_UTILS_PKGNAME}-sleep = "${base_bindir}/sleep" +FILES_${KLIBC_UTILS_PKGNAME}-sync = "${base_bindir}/sync" FILES_${KLIBC_UTILS_PKGNAME}-true = "${base_bindir}/true" FILES_${KLIBC_UTILS_PKGNAME}-umount = "${base_bindir}/umount" 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}-ls = "${base_bindir}/ls" diff --git a/recipes/klibc/klibc.inc b/recipes/klibc/klibc.inc index 8ed976a229..9ae6c5b634 100644 --- a/recipes/klibc/klibc.inc +++ b/recipes/klibc/klibc.inc @@ -37,10 +37,9 @@ RDEPENDS_${KLIBC_UTILS_PKGNAME}-dd = "${PN} (=${PV}-${PR})" RDEPENDS_${KLIBC_UTILS_PKGNAME}-dmesg = "${PN} (=${PV}-${PR})" RDEPENDS_${KLIBC_UTILS_PKGNAME}-false = "${PN} (=${PV}-${PR})" RDEPENDS_${KLIBC_UTILS_PKGNAME}-halt = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-kill = "${PN} (=${PV}-${PR})" RDEPENDS_${KLIBC_UTILS_PKGNAME}-insmod = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-kill = "${PN} (=${PV}-${PR})" RDEPENDS_${KLIBC_UTILS_PKGNAME}-ln = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-ls = "${PN} (=${PV}-${PR})" RDEPENDS_${KLIBC_UTILS_PKGNAME}-minips = "${PN} (=${PV}-${PR})" RDEPENDS_${KLIBC_UTILS_PKGNAME}-mkdir = "${PN} (=${PV}-${PR})" RDEPENDS_${KLIBC_UTILS_PKGNAME}-mkfifo = "${PN} (=${PV}-${PR})" @@ -59,3 +58,4 @@ RDEPENDS_${KLIBC_UTILS_PKGNAME}-uname = "${PN} (=${PV}-${PR})" RDEPENDS_${KLIBC_UTILS_PKGNAME}-modprobe = "${PN} (=${PV}-${PR})" RDEPENDS_${KLIBC_UTILS_PKGNAME}-losetup = "${PN} (=${PV}-${PR})" RDEPENDS_${KLIBC_UTILS_PKGNAME}-wc = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-ls = "${PN} (=${PV}-${PR})" diff --git a/recipes/klibc/klibc_1.5.18.bb b/recipes/klibc/klibc_1.5.18.bb index 7520cad9a0..694bf5849b 100644 --- a/recipes/klibc/klibc_1.5.18.bb +++ b/recipes/klibc/klibc_1.5.18.bb @@ -1,3 +1,3 @@ require klibc.inc require klibc_${PV}.inc -PR = "${INC_PR}.2" +PR = "${INC_PR}.1" diff --git a/recipes/klibc/klibc_1.5.18.inc b/recipes/klibc/klibc_1.5.18.inc index cad3bdbfd8..2175643a92 100644 --- a/recipes/klibc/klibc_1.5.18.inc +++ b/recipes/klibc/klibc_1.5.18.inc @@ -42,11 +42,3 @@ do_install_append() { install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir} } - -PACKAGES += "${KLIBC_UTILS_PKGNAME}-dmesg \ - ${KLIBC_UTILS_PKGNAME}-sync \ - ${KLIBC_UTILS_PKGNAME}-ls" - -FILES_${KLIBC_UTILS_PKGNAME}-dmesg = "${base_bindir}/dmesg" -FILES_${KLIBC_UTILS_PKGNAME}-sync = "${base_bindir}/sync" -FILES_${KLIBC_UTILS_PKGNAME}-ls = "${base_bindir}/ls" diff --git a/recipes/klibc/klibc_1.5.bb b/recipes/klibc/klibc_1.5.bb index 694bf5849b..4b299f226e 100644 --- a/recipes/klibc/klibc_1.5.bb +++ b/recipes/klibc/klibc_1.5.bb @@ -1,3 +1,3 @@ require klibc.inc require klibc_${PV}.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.0" diff --git a/recipes/klibc/klibc_1.5.inc b/recipes/klibc/klibc_1.5.inc index c8ed5f652d..b00f02cc56 100644 --- a/recipes/klibc/klibc_1.5.inc +++ b/recipes/klibc/klibc_1.5.inc @@ -17,6 +17,3 @@ SRC_URI[sha256sum] = "27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba627 do_install_append() { install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/insmod ${D}${base_bindir} } - -PACKAGES += "${KLIBC_UTILS_PKGNAME}-insmod" -FILES_${KLIBC_UTILS_PKGNAME}-insmod = "${base_bindir}/insmod" |