From: Andrea Adami Date: Thu, 27 Jan 2011 23:22:15 +0000 (+0100) Subject: klibc: move to latest 1.5.21 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f626c0217a83b127953f1f5f6c9fc56c8dcd0c0d;p=openembedded.git klibc: move to latest 1.5.21 * temporarly remove the klcc binary for target (broken paths) * needs to be fixed before recipe refactor (debian-style) * reset INC_PR and PR Signed-off-by: Andrea Adami --- diff --git a/recipes/klibc/klcc-cross_1.5.20.bb b/recipes/klibc/klcc-cross_1.5.21.bb similarity index 96% rename from recipes/klibc/klcc-cross_1.5.20.bb rename to recipes/klibc/klcc-cross_1.5.21.bb index 7ec8f3012a..cecee2420a 100644 --- a/recipes/klibc/klcc-cross_1.5.20.bb +++ b/recipes/klibc/klcc-cross_1.5.21.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.2" +PR = "${INC_PR}.0" require klibc.inc require klibc-checksums_${PV}.inc diff --git a/recipes/klibc/klibc-1.5.20/arm-signal-cleanup.patch b/recipes/klibc/klibc-1.5.21/arm-signal-cleanup.patch similarity index 100% rename from recipes/klibc/klibc-1.5.20/arm-signal-cleanup.patch rename to recipes/klibc/klibc-1.5.21/arm-signal-cleanup.patch diff --git a/recipes/klibc/klibc-1.5.20/dash_readopt.patch b/recipes/klibc/klibc-1.5.21/dash_readopt.patch similarity index 100% rename from recipes/klibc/klibc-1.5.20/dash_readopt.patch rename to recipes/klibc/klibc-1.5.21/dash_readopt.patch diff --git a/recipes/klibc/klibc-1.5.20/fstype-sane-vfat-and-jffs2-for-1.5.patch b/recipes/klibc/klibc-1.5.21/fstype-sane-vfat-and-jffs2-for-1.5.patch similarity index 100% rename from recipes/klibc/klibc-1.5.20/fstype-sane-vfat-and-jffs2-for-1.5.patch rename to recipes/klibc/klibc-1.5.21/fstype-sane-vfat-and-jffs2-for-1.5.patch diff --git a/recipes/klibc/klibc-1.5.20/getrusage.patch b/recipes/klibc/klibc-1.5.21/getrusage.patch similarity index 100% rename from recipes/klibc/klibc-1.5.20/getrusage.patch rename to recipes/klibc/klibc-1.5.21/getrusage.patch diff --git a/recipes/klibc/klibc-1.5.20/isystem.patch b/recipes/klibc/klibc-1.5.21/isystem.patch similarity index 100% rename from recipes/klibc/klibc-1.5.20/isystem.patch rename to recipes/klibc/klibc-1.5.21/isystem.patch diff --git a/recipes/klibc/klibc-1.5.20/klcc_prefix.patch b/recipes/klibc/klibc-1.5.21/klcc_prefix.patch similarity index 100% rename from recipes/klibc/klibc-1.5.20/klcc_prefix.patch rename to recipes/klibc/klibc-1.5.21/klcc_prefix.patch diff --git a/recipes/klibc/klibc-1.5.20/klibc-config-eabi.patch b/recipes/klibc/klibc-1.5.21/klibc-config-eabi.patch similarity index 100% rename from recipes/klibc/klibc-1.5.20/klibc-config-eabi.patch rename to recipes/klibc/klibc-1.5.21/klibc-config-eabi.patch diff --git a/recipes/klibc/klibc-1.5.20/klibc_kexecsyscall.patch b/recipes/klibc/klibc-1.5.21/klibc_kexecsyscall.patch similarity index 100% rename from recipes/klibc/klibc-1.5.20/klibc_kexecsyscall.patch rename to recipes/klibc/klibc-1.5.21/klibc_kexecsyscall.patch diff --git a/recipes/klibc/klibc-1.5.20/mntproc-definitions.patch b/recipes/klibc/klibc-1.5.21/mntproc-definitions.patch similarity index 100% rename from recipes/klibc/klibc-1.5.20/mntproc-definitions.patch rename to recipes/klibc/klibc-1.5.21/mntproc-definitions.patch diff --git a/recipes/klibc/klibc-1.5.20/modprobe.patch b/recipes/klibc/klibc-1.5.21/modprobe.patch similarity index 100% rename from recipes/klibc/klibc-1.5.20/modprobe.patch rename to recipes/klibc/klibc-1.5.21/modprobe.patch diff --git a/recipes/klibc/klibc-1.5.20/socket.h.patch b/recipes/klibc/klibc-1.5.21/socket.h.patch similarity index 100% rename from recipes/klibc/klibc-1.5.20/socket.h.patch rename to recipes/klibc/klibc-1.5.21/socket.h.patch diff --git a/recipes/klibc/klibc-1.5.20/staging.patch b/recipes/klibc/klibc-1.5.21/staging.patch similarity index 100% rename from recipes/klibc/klibc-1.5.20/staging.patch rename to recipes/klibc/klibc-1.5.21/staging.patch diff --git a/recipes/klibc/klibc-1.5.20/use-env-for-perl.patch b/recipes/klibc/klibc-1.5.21/use-env-for-perl.patch similarity index 100% rename from recipes/klibc/klibc-1.5.20/use-env-for-perl.patch rename to recipes/klibc/klibc-1.5.21/use-env-for-perl.patch diff --git a/recipes/klibc/klibc-1.5.20/wc.patch b/recipes/klibc/klibc-1.5.21/wc.patch similarity index 100% rename from recipes/klibc/klibc-1.5.20/wc.patch rename to recipes/klibc/klibc-1.5.21/wc.patch diff --git a/recipes/klibc/klibc-checksums_1.5.20.inc b/recipes/klibc/klibc-checksums_1.5.20.inc deleted file mode 100644 index 7a53098ac1..0000000000 --- a/recipes/klibc/klibc-checksums_1.5.20.inc +++ /dev/null @@ -1,2 +0,0 @@ -SRC_URI[md5sum] = "a4e6fa37373b784250a080350afa874d" -SRC_URI[sha256sum] = "f55c4c12902116f29f70a68e8e1b6da7337c11b21adc6b5a197364146c1bc81c" diff --git a/recipes/klibc/klibc-checksums_1.5.21.inc b/recipes/klibc/klibc-checksums_1.5.21.inc new file mode 100644 index 0000000000..6b257029e8 --- /dev/null +++ b/recipes/klibc/klibc-checksums_1.5.21.inc @@ -0,0 +1,2 @@ +SRC_URI[md5sum] = "c232f3fd4e733f4d6ff8909fd54b9970" +SRC_URI[sha256sum] = "d1de0d4a6a4a337624d19587713d253ce4636dd5492d23bad75f89e4b679e202" diff --git a/recipes/klibc/klibc-static-utils_1.5.20.bb b/recipes/klibc/klibc-static-utils_1.5.21.bb similarity index 100% rename from recipes/klibc/klibc-static-utils_1.5.20.bb rename to recipes/klibc/klibc-static-utils_1.5.21.bb diff --git a/recipes/klibc/klibc.inc b/recipes/klibc/klibc.inc index c5299b5e2d..c6fcaa4aa5 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 = "r4" +INC_PR = "r0" KLIBC_ARCH = '${TARGET_ARCH}' KLIBC_ARCH_armeb = 'arm' diff --git a/recipes/klibc/klibc_1.5.20.bb b/recipes/klibc/klibc_1.5.21.bb similarity index 95% rename from recipes/klibc/klibc_1.5.20.bb rename to recipes/klibc/klibc_1.5.21.bb index adbe8c0348..52fc1fbb18 100644 --- a/recipes/klibc/klibc_1.5.20.bb +++ b/recipes/klibc/klibc_1.5.21.bb @@ -3,6 +3,12 @@ PR = "${INC_PR}.0" export INST=${D} do_install() { + +# klcc for target host needs to be fixed +# removed also from FILES_${PN}-dev + + rm klcc/klcc + oe_runmake install install -d ${D}${base_bindir} install -m 755 usr/dash/sh.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/sh @@ -18,7 +24,7 @@ FILES_${PN} = "${base_libdir}/klibc-*.so" FILES_${PN}-dev = "${base_libdir}/klibc.so \ ${base_libdir}/klibc/lib/* \ ${base_libdir}/klibc/include/* \ - ${base_bindir}/klcc \ +# ${base_bindir}/klcc \ " # Yes we want exactly the klibc that was compiled with the utils