From b9bcb18a4435491bad5cd76ecf26a857b2f40800 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Mon, 13 Sep 2010 01:08:27 +0200 Subject: [PATCH] klibc: bump to 1.5.20 * still some doubt about klcc-cross packaging, triggering * NOTE: the following files were installed but not shipped in any package: * staging-klcc-cross seems sane, though. --- ...c-cross_1.5.19.bb => klcc-cross_1.5.20.bb} | 4 +--- .../arm-signal-cleanup.patch | 0 .../dash_readopt.patch | 0 .../fstype-sane-vfat-and-jffs2-for-1.5.patch | 0 .../getrusage.patch | 0 .../isystem.patch | 0 .../klcc_prefix.patch | 0 .../klibc-config-eabi.patch | 0 .../klibc_kexecsyscall.patch | 0 .../mntproc-definitions.patch | 0 .../modprobe.patch | 0 .../socket.h.patch | 0 .../staging.patch | 0 .../{klibc-1.5.19 => klibc-1.5.20}/wc.patch | 0 recipes/klibc/klibc-checksums_1.5.20.inc | 2 ++ ...1.5.19.bb => klibc-static-utils_1.5.20.bb} | 7 ++----- recipes/klibc/klibc.inc | 2 +- .../{klibc_1.5.19.bb => klibc_1.5.20.bb} | 21 ++++++++++++------- 18 files changed, 20 insertions(+), 16 deletions(-) rename recipes/klibc/{klcc-cross_1.5.19.bb => klcc-cross_1.5.20.bb} (72%) rename recipes/klibc/{klibc-1.5.19 => klibc-1.5.20}/arm-signal-cleanup.patch (100%) rename recipes/klibc/{klibc-1.5.19 => klibc-1.5.20}/dash_readopt.patch (100%) rename recipes/klibc/{klibc-1.5.19 => klibc-1.5.20}/fstype-sane-vfat-and-jffs2-for-1.5.patch (100%) rename recipes/klibc/{klibc-1.5.19 => klibc-1.5.20}/getrusage.patch (100%) rename recipes/klibc/{klibc-1.5.19 => klibc-1.5.20}/isystem.patch (100%) rename recipes/klibc/{klibc-1.5.19 => klibc-1.5.20}/klcc_prefix.patch (100%) rename recipes/klibc/{klibc-1.5.19 => klibc-1.5.20}/klibc-config-eabi.patch (100%) rename recipes/klibc/{klibc-1.5.19 => klibc-1.5.20}/klibc_kexecsyscall.patch (100%) rename recipes/klibc/{klibc-1.5.19 => klibc-1.5.20}/mntproc-definitions.patch (100%) rename recipes/klibc/{klibc-1.5.19 => klibc-1.5.20}/modprobe.patch (100%) rename recipes/klibc/{klibc-1.5.19 => klibc-1.5.20}/socket.h.patch (100%) rename recipes/klibc/{klibc-1.5.19 => klibc-1.5.20}/staging.patch (100%) rename recipes/klibc/{klibc-1.5.19 => klibc-1.5.20}/wc.patch (100%) create mode 100644 recipes/klibc/klibc-checksums_1.5.20.inc rename recipes/klibc/{klibc-static-utils_1.5.19.bb => klibc-static-utils_1.5.20.bb} (66%) rename recipes/klibc/{klibc_1.5.19.bb => klibc_1.5.20.bb} (85%) diff --git a/recipes/klibc/klcc-cross_1.5.19.bb b/recipes/klibc/klcc-cross_1.5.20.bb similarity index 72% rename from recipes/klibc/klcc-cross_1.5.19.bb rename to recipes/klibc/klcc-cross_1.5.20.bb index c4069dd2e8..2eeacecb36 100644 --- a/recipes/klibc/klcc-cross_1.5.19.bb +++ b/recipes/klibc/klcc-cross_1.5.20.bb @@ -1,6 +1,7 @@ PR = "${INC_PR}.0" require klibc.inc +require klibc-checksums_${PV}.inc DEPENDS = "klibc" FILESPATHPKG =. "klibc-${PV}:" @@ -16,6 +17,3 @@ do_install() { PACKAGES = "${PN}" FILES_${PN} = "${D}${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}klcc" - -SRC_URI[md5sum] = "1b713fe65c345e687666b9f94b12f0a0" -SRC_URI[sha256sum] = "de0fa51d47b7363e064a3e6f26dabcb458d371a14e78e6407d49bb3386a24a97" diff --git a/recipes/klibc/klibc-1.5.19/arm-signal-cleanup.patch b/recipes/klibc/klibc-1.5.20/arm-signal-cleanup.patch similarity index 100% rename from recipes/klibc/klibc-1.5.19/arm-signal-cleanup.patch rename to recipes/klibc/klibc-1.5.20/arm-signal-cleanup.patch diff --git a/recipes/klibc/klibc-1.5.19/dash_readopt.patch b/recipes/klibc/klibc-1.5.20/dash_readopt.patch similarity index 100% rename from recipes/klibc/klibc-1.5.19/dash_readopt.patch rename to recipes/klibc/klibc-1.5.20/dash_readopt.patch diff --git a/recipes/klibc/klibc-1.5.19/fstype-sane-vfat-and-jffs2-for-1.5.patch b/recipes/klibc/klibc-1.5.20/fstype-sane-vfat-and-jffs2-for-1.5.patch similarity index 100% rename from recipes/klibc/klibc-1.5.19/fstype-sane-vfat-and-jffs2-for-1.5.patch rename to recipes/klibc/klibc-1.5.20/fstype-sane-vfat-and-jffs2-for-1.5.patch diff --git a/recipes/klibc/klibc-1.5.19/getrusage.patch b/recipes/klibc/klibc-1.5.20/getrusage.patch similarity index 100% rename from recipes/klibc/klibc-1.5.19/getrusage.patch rename to recipes/klibc/klibc-1.5.20/getrusage.patch diff --git a/recipes/klibc/klibc-1.5.19/isystem.patch b/recipes/klibc/klibc-1.5.20/isystem.patch similarity index 100% rename from recipes/klibc/klibc-1.5.19/isystem.patch rename to recipes/klibc/klibc-1.5.20/isystem.patch diff --git a/recipes/klibc/klibc-1.5.19/klcc_prefix.patch b/recipes/klibc/klibc-1.5.20/klcc_prefix.patch similarity index 100% rename from recipes/klibc/klibc-1.5.19/klcc_prefix.patch rename to recipes/klibc/klibc-1.5.20/klcc_prefix.patch diff --git a/recipes/klibc/klibc-1.5.19/klibc-config-eabi.patch b/recipes/klibc/klibc-1.5.20/klibc-config-eabi.patch similarity index 100% rename from recipes/klibc/klibc-1.5.19/klibc-config-eabi.patch rename to recipes/klibc/klibc-1.5.20/klibc-config-eabi.patch diff --git a/recipes/klibc/klibc-1.5.19/klibc_kexecsyscall.patch b/recipes/klibc/klibc-1.5.20/klibc_kexecsyscall.patch similarity index 100% rename from recipes/klibc/klibc-1.5.19/klibc_kexecsyscall.patch rename to recipes/klibc/klibc-1.5.20/klibc_kexecsyscall.patch diff --git a/recipes/klibc/klibc-1.5.19/mntproc-definitions.patch b/recipes/klibc/klibc-1.5.20/mntproc-definitions.patch similarity index 100% rename from recipes/klibc/klibc-1.5.19/mntproc-definitions.patch rename to recipes/klibc/klibc-1.5.20/mntproc-definitions.patch diff --git a/recipes/klibc/klibc-1.5.19/modprobe.patch b/recipes/klibc/klibc-1.5.20/modprobe.patch similarity index 100% rename from recipes/klibc/klibc-1.5.19/modprobe.patch rename to recipes/klibc/klibc-1.5.20/modprobe.patch diff --git a/recipes/klibc/klibc-1.5.19/socket.h.patch b/recipes/klibc/klibc-1.5.20/socket.h.patch similarity index 100% rename from recipes/klibc/klibc-1.5.19/socket.h.patch rename to recipes/klibc/klibc-1.5.20/socket.h.patch diff --git a/recipes/klibc/klibc-1.5.19/staging.patch b/recipes/klibc/klibc-1.5.20/staging.patch similarity index 100% rename from recipes/klibc/klibc-1.5.19/staging.patch rename to recipes/klibc/klibc-1.5.20/staging.patch diff --git a/recipes/klibc/klibc-1.5.19/wc.patch b/recipes/klibc/klibc-1.5.20/wc.patch similarity index 100% rename from recipes/klibc/klibc-1.5.19/wc.patch rename to recipes/klibc/klibc-1.5.20/wc.patch diff --git a/recipes/klibc/klibc-checksums_1.5.20.inc b/recipes/klibc/klibc-checksums_1.5.20.inc new file mode 100644 index 0000000000..7a53098ac1 --- /dev/null +++ b/recipes/klibc/klibc-checksums_1.5.20.inc @@ -0,0 +1,2 @@ +SRC_URI[md5sum] = "a4e6fa37373b784250a080350afa874d" +SRC_URI[sha256sum] = "f55c4c12902116f29f70a68e8e1b6da7337c11b21adc6b5a197364146c1bc81c" diff --git a/recipes/klibc/klibc-static-utils_1.5.19.bb b/recipes/klibc/klibc-static-utils_1.5.20.bb similarity index 66% rename from recipes/klibc/klibc-static-utils_1.5.19.bb rename to recipes/klibc/klibc-static-utils_1.5.20.bb index 3813840ebc..681d6f012a 100644 --- a/recipes/klibc/klibc-static-utils_1.5.19.bb +++ b/recipes/klibc/klibc-static-utils_1.5.20.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.0" FILESPATHPKG =. "klibc-${PV}:" @@ -14,9 +14,6 @@ PACKAGES = "" KLIBC_UTILS_VARIANT = "static" KLIBC_UTILS_PKGNAME = "klibc-static-utils" -####################### require klibc-utils.inc require klibc.inc - -SRC_URI[md5sum] = "1b713fe65c345e687666b9f94b12f0a0" -SRC_URI[sha256sum] = "de0fa51d47b7363e064a3e6f26dabcb458d371a14e78e6407d49bb3386a24a97" +require klibc-checksums_${PV}.inc diff --git a/recipes/klibc/klibc.inc b/recipes/klibc/klibc.inc index 5c70695cee..6fcfc0e553 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 = "r2" +INC_PR = "r0" KLIBC_ARCH = '${TARGET_ARCH}' KLIBC_ARCH_armeb = 'arm' diff --git a/recipes/klibc/klibc_1.5.19.bb b/recipes/klibc/klibc_1.5.20.bb similarity index 85% rename from recipes/klibc/klibc_1.5.19.bb rename to recipes/klibc/klibc_1.5.20.bb index 66b8768e58..cad9746abd 100644 --- a/recipes/klibc/klibc_1.5.19.bb +++ b/recipes/klibc/klibc_1.5.20.bb @@ -1,5 +1,6 @@ PR = "${INC_PR}.0" + export INST=${D} do_install() { @@ -13,10 +14,19 @@ do_install() { (cd ${D}${base_libdir}; ln -s klibc-*.so klibc.so) } -PACKAGES = "${PN} ${PN}-dev " -FILES_${PN} = "${base_libdir}/klibc-*.so" -FILES_${PN}-dev = "${base_libdir}/klibc.so" +# ${PN}-dev was introduced to fix +# ERROR: QA Issue with klibc: non -dev package contains symlink .so: klibc +# '/klibc/lib/klibc.so' +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})" @@ -55,9 +65,6 @@ RDEPENDS_${KLIBC_UTILS_PKGNAME}-umount = "${PN} (=${PV}-${PR})" RDEPENDS_${KLIBC_UTILS_PKGNAME}-uname = "${PN} (=${PV}-${PR})" RDEPENDS_${KLIBC_UTILS_PKGNAME}-wc = "${PN} (=${PV}-${PR})" -####################### require klibc-utils.inc require klibc.inc - -SRC_URI[md5sum] = "1b713fe65c345e687666b9f94b12f0a0" -SRC_URI[sha256sum] = "de0fa51d47b7363e064a3e6f26dabcb458d371a14e78e6407d49bb3386a24a97" +require klibc-checksums_${PV}.inc -- 2.39.5