[oe-commits] Andrea Adami : klibc: upgrade to 1.5.22
git version control
git at git.openembedded.org
Thu May 26 20:00:53 UTC 2011
Module: openembedded.git
Branch: testing-next
Commit: a03594179cdec9778f0f311d159874d1203fa7f8
URL: http://git.openembedded.org/?p=openembedded.git&a=commit;h=a03594179cdec9778f0f311d159874d1203fa7f8
Author: Andrea Adami <andrea.adami at gmail.com>
Date: Sun May 22 01:19:58 2011 +0200
klibc: upgrade to 1.5.22
* fix QA about klcc installed but not packaged
* (we purposedly skip it)
* remove .install and ..install.cmd files (headers install)
Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
---
.../{klcc-cross_1.5.21.bb => klcc-cross_1.5.22.bb} | 2 +-
.../arm-signal-cleanup.patch | 0
.../dash_readopt.patch | 0
.../fstype-sane-vfat-and-jffs2-for-1.5.patch | 0
.../{klibc-1.5.21 => klibc-1.5.22}/getrusage.patch | 0
.../{klibc-1.5.21 => klibc-1.5.22}/isystem.patch | 0
.../klcc_prefix.patch | 0
.../klibc-config-eabi.patch | 0
.../klibc_kexecsyscall.patch | 0
.../mntproc-definitions.patch | 0
.../{klibc-1.5.21 => klibc-1.5.22}/modprobe.patch | 0
.../{klibc-1.5.21 => klibc-1.5.22}/socket.h.patch | 0
.../{klibc-1.5.21 => klibc-1.5.22}/staging.patch | 0
.../use-env-for-perl.patch | 0
.../klibc/{klibc-1.5.21 => klibc-1.5.22}/wc.patch | 0
recipes/klibc/klibc-checksums_1.5.21.inc | 2 --
recipes/klibc/klibc-checksums_1.5.22.inc | 2 ++
...tils_1.5.21.bb => klibc-static-utils_1.5.22.bb} | 0
recipes/klibc/{klibc_1.5.21.bb => klibc_1.5.22.bb} | 16 ++++++++++++----
19 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/recipes/klibc/klcc-cross_1.5.21.bb b/recipes/klibc/klcc-cross_1.5.22.bb
similarity index 95%
rename from recipes/klibc/klcc-cross_1.5.21.bb
rename to recipes/klibc/klcc-cross_1.5.22.bb
index 541d674..8f701fd 100644
--- a/recipes/klibc/klcc-cross_1.5.21.bb
+++ b/recipes/klibc/klcc-cross_1.5.22.bb
@@ -1,4 +1,4 @@
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
require klibc.inc
require klibc-checksums_${PV}.inc
diff --git a/recipes/klibc/klibc-1.5.21/arm-signal-cleanup.patch b/recipes/klibc/klibc-1.5.22/arm-signal-cleanup.patch
similarity index 100%
rename from recipes/klibc/klibc-1.5.21/arm-signal-cleanup.patch
rename to recipes/klibc/klibc-1.5.22/arm-signal-cleanup.patch
diff --git a/recipes/klibc/klibc-1.5.21/dash_readopt.patch b/recipes/klibc/klibc-1.5.22/dash_readopt.patch
similarity index 100%
rename from recipes/klibc/klibc-1.5.21/dash_readopt.patch
rename to recipes/klibc/klibc-1.5.22/dash_readopt.patch
diff --git a/recipes/klibc/klibc-1.5.21/fstype-sane-vfat-and-jffs2-for-1.5.patch b/recipes/klibc/klibc-1.5.22/fstype-sane-vfat-and-jffs2-for-1.5.patch
similarity index 100%
rename from recipes/klibc/klibc-1.5.21/fstype-sane-vfat-and-jffs2-for-1.5.patch
rename to recipes/klibc/klibc-1.5.22/fstype-sane-vfat-and-jffs2-for-1.5.patch
diff --git a/recipes/klibc/klibc-1.5.21/getrusage.patch b/recipes/klibc/klibc-1.5.22/getrusage.patch
similarity index 100%
rename from recipes/klibc/klibc-1.5.21/getrusage.patch
rename to recipes/klibc/klibc-1.5.22/getrusage.patch
diff --git a/recipes/klibc/klibc-1.5.21/isystem.patch b/recipes/klibc/klibc-1.5.22/isystem.patch
similarity index 100%
rename from recipes/klibc/klibc-1.5.21/isystem.patch
rename to recipes/klibc/klibc-1.5.22/isystem.patch
diff --git a/recipes/klibc/klibc-1.5.21/klcc_prefix.patch b/recipes/klibc/klibc-1.5.22/klcc_prefix.patch
similarity index 100%
rename from recipes/klibc/klibc-1.5.21/klcc_prefix.patch
rename to recipes/klibc/klibc-1.5.22/klcc_prefix.patch
diff --git a/recipes/klibc/klibc-1.5.21/klibc-config-eabi.patch b/recipes/klibc/klibc-1.5.22/klibc-config-eabi.patch
similarity index 100%
rename from recipes/klibc/klibc-1.5.21/klibc-config-eabi.patch
rename to recipes/klibc/klibc-1.5.22/klibc-config-eabi.patch
diff --git a/recipes/klibc/klibc-1.5.21/klibc_kexecsyscall.patch b/recipes/klibc/klibc-1.5.22/klibc_kexecsyscall.patch
similarity index 100%
rename from recipes/klibc/klibc-1.5.21/klibc_kexecsyscall.patch
rename to recipes/klibc/klibc-1.5.22/klibc_kexecsyscall.patch
diff --git a/recipes/klibc/klibc-1.5.21/mntproc-definitions.patch b/recipes/klibc/klibc-1.5.22/mntproc-definitions.patch
similarity index 100%
rename from recipes/klibc/klibc-1.5.21/mntproc-definitions.patch
rename to recipes/klibc/klibc-1.5.22/mntproc-definitions.patch
diff --git a/recipes/klibc/klibc-1.5.21/modprobe.patch b/recipes/klibc/klibc-1.5.22/modprobe.patch
similarity index 100%
rename from recipes/klibc/klibc-1.5.21/modprobe.patch
rename to recipes/klibc/klibc-1.5.22/modprobe.patch
diff --git a/recipes/klibc/klibc-1.5.21/socket.h.patch b/recipes/klibc/klibc-1.5.22/socket.h.patch
similarity index 100%
rename from recipes/klibc/klibc-1.5.21/socket.h.patch
rename to recipes/klibc/klibc-1.5.22/socket.h.patch
diff --git a/recipes/klibc/klibc-1.5.21/staging.patch b/recipes/klibc/klibc-1.5.22/staging.patch
similarity index 100%
rename from recipes/klibc/klibc-1.5.21/staging.patch
rename to recipes/klibc/klibc-1.5.22/staging.patch
diff --git a/recipes/klibc/klibc-1.5.21/use-env-for-perl.patch b/recipes/klibc/klibc-1.5.22/use-env-for-perl.patch
similarity index 100%
rename from recipes/klibc/klibc-1.5.21/use-env-for-perl.patch
rename to recipes/klibc/klibc-1.5.22/use-env-for-perl.patch
diff --git a/recipes/klibc/klibc-1.5.21/wc.patch b/recipes/klibc/klibc-1.5.22/wc.patch
similarity index 100%
rename from recipes/klibc/klibc-1.5.21/wc.patch
rename to recipes/klibc/klibc-1.5.22/wc.patch
diff --git a/recipes/klibc/klibc-checksums_1.5.21.inc b/recipes/klibc/klibc-checksums_1.5.21.inc
deleted file mode 100644
index 6b25702..0000000
--- a/recipes/klibc/klibc-checksums_1.5.21.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SRC_URI[md5sum] = "c232f3fd4e733f4d6ff8909fd54b9970"
-SRC_URI[sha256sum] = "d1de0d4a6a4a337624d19587713d253ce4636dd5492d23bad75f89e4b679e202"
diff --git a/recipes/klibc/klibc-checksums_1.5.22.inc b/recipes/klibc/klibc-checksums_1.5.22.inc
new file mode 100644
index 0000000..3966142
--- /dev/null
+++ b/recipes/klibc/klibc-checksums_1.5.22.inc
@@ -0,0 +1,2 @@
+SRC_URI[md5sum] = "2eb5ef12978099736be9b0d0d7d5e946"
+SRC_URI[sha256sum] = "0011ef50cb69b62033faa2d4a5e557f8998560ba97440af3962c1bc7bdaf8033"
diff --git a/recipes/klibc/klibc-static-utils_1.5.21.bb b/recipes/klibc/klibc-static-utils_1.5.22.bb
similarity index 100%
rename from recipes/klibc/klibc-static-utils_1.5.21.bb
rename to recipes/klibc/klibc-static-utils_1.5.22.bb
diff --git a/recipes/klibc/klibc_1.5.21.bb b/recipes/klibc/klibc_1.5.22.bb
similarity index 89%
rename from recipes/klibc/klibc_1.5.21.bb
rename to recipes/klibc/klibc_1.5.22.bb
index 65efa3e..11faee4 100644
--- a/recipes/klibc/klibc_1.5.21.bb
+++ b/recipes/klibc/klibc_1.5.22.bb
@@ -4,12 +4,17 @@ export INST=${D}
do_install() {
-# klcc for target host needs to be fixed
-# removed also from FILES_${PN}-dev
+ oe_runmake install
- rm klcc/klcc
+# the crosscompiler is packaged by klcc-cross
+# remove klcc
+# remove also from FILES_${PN}-dev
+ rm ${D}${base_bindir}/klcc
+
+ # remove Linux headers .install and ..install.cmd files
+ find ${D}${base_libdir}/klibc/include -name '.install' -delete
+ find ${D}${base_libdir}/klibc/include -name '..install.cmd' -delete
- oe_runmake install
install -d ${D}${base_bindir}
install -m 755 usr/dash/sh.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/sh
install -m 755 usr/kinit/kinit.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/kinit
@@ -17,6 +22,7 @@ do_install() {
install -d ${D}${base_libdir}
install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir}
(cd ${D}${base_libdir}; ln -s klibc-*.so klibc.so)
+
}
PACKAGES = "${PN} ${PN}-dev"
@@ -24,6 +30,8 @@ FILES_${PN} = "${base_libdir}/klibc-*.so"
FILES_${PN}-dev = "${base_libdir}/klibc.so \
${base_libdir}/klibc/lib/* \
${base_libdir}/klibc/include/* \
+# see above
+# do not package it
# ${base_bindir}/klcc \
"
More information about the Openembedded-commits
mailing list