klibc: upgrade from 1.5.25 to 1.5.26
PATCH 1/2 klibc: upgrade from 1.5.25 to 1.5.26
--- .../recipes-devtools/klibc/klcc-cross_1.5.25.bb | 32 - .../recipes-devtools/klibc/klcc-cross_1.5.26.bb | 32 + .../klibc/klibc-1.5.25/dash_readopt.patch | 111 -- .../fstype-sane-vfat-and-jffs2-for-1.5.patch | 74 - .../klibc-1.5.25/kernel_3.2__aligned_u64.patch | 46 - .../klibc/klibc-1.5.25/klcc_prefix.patch | 24 - .../klibc/klibc-1.5.25/klibc-config-eabi.patch | 14 - .../klibc/klibc-1.5.25/modprobe.patch | 1984 -------------------- .../klibc/klibc-1.5.25/staging.patch | 153 -- .../klibc/klibc-1.5.25/use-env-for-perl.patch | 25 - .../recipes-devtools/klibc/klibc-1.5.25/wc.patch | 245 --- .../klibc/klibc-1.5.26/dash_readopt.patch | 111 ++ .../fstype-sane-vfat-and-jffs2-for-1.5.patch | 74 + .../klibc-1.5.26/kernel_3.2__aligned_u64.patch | 46 + .../klibc/klibc-1.5.26/klcc_prefix.patch | 24 + .../klibc/klibc-1.5.26/klibc-config-eabi.patch | 14 + .../klibc/klibc-1.5.26/modprobe.patch | 1984 ++++++++++++++++++++ .../klibc/klibc-1.5.26/staging.patch | 153 ++ .../klibc/klibc-1.5.26/use-env-for-perl.patch | 25 + .../recipes-devtools/klibc/klibc-1.5.26/wc.patch | 245 +++ .../klibc/klibc-static-utils_1.5.25.bb | 16 - .../klibc/klibc-static-utils_1.5.26.bb | 16 + .../recipes-devtools/klibc/klibc-utils_1.5.25.bb | 16 - .../recipes-devtools/klibc/klibc-utils_1.5.26.bb | 16 + meta-initramfs/recipes-devtools/klibc/klibc.inc | 4 +- .../recipes-devtools/klibc/klibc_1.5.25.bb | 45 - .../recipes-devtools/klibc/klibc_1.5.26.bb | 45 + 27 files changed, 2787 insertions(+), 2787 deletions(-) delete mode 100644 meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.25.bb create mode 100644 meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.26.bb delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/dash_readopt.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/fstype-sane-vfat-and-jffs2-for-1.5.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/kernel_3.2__aligned_u64.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/klcc_prefix.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/klibc-config-eabi.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/modprobe.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/staging.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/use-env-for-perl.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/wc.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/dash_readopt.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/fstype-sane-vfat-and-jffs2-for-1.5.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/kernel_3.2__aligned_u64.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klcc_prefix.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klibc-config-eabi.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/modprobe.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/staging.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/use-env-for-perl.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/wc.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.25.bb create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.26.bb delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.25.bb create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.26.bb delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc_1.5.25.bb create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc_1.5.26.bb
meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.25.bb deleted +0 -32
@@ -1,32 +0,0 @@ -PR = "${INC_PR}.0" - -require klibc.inc - -export KLCC_INST = "${STAGING_DIR_TARGET}/lib/klibc" - -SRC_URI += "file://klcc_prefix.patch \ - file://use-env-for-perl.patch" - -DEPENDS = "klibc" - -FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" - -# ${TARGET_PREFIX}klcc is just a -# perl wrapper around gcc-cross -# so give it the same arch and path -PACKAGE_ARCH = "${TUNE_PKGARCH}" - -inherit cross - -do_configure () { - : -} - -do_compile() { - oe_runmake klcc -} - -do_install() { - install -d ${D}${base_bindir} - install -m 0755 klcc/klcc ${D}${base_bindir}/${TARGET_PREFIX}klcc -}
meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.26.bb new file +32 -0
@@ -0,0 +1,32 @@ +PR = "${INC_PR}.0" + +require klibc.inc + +export KLCC_INST = "${STAGING_DIR_TARGET}/lib/klibc" + +SRC_URI += "file://klcc_prefix.patch \ + file://use-env-for-perl.patch" + +DEPENDS = "klibc" + +FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" + +# ${TARGET_PREFIX}klcc is just a +# perl wrapper around gcc-cross +# so give it the same arch and path +PACKAGE_ARCH = "${TUNE_PKGARCH}" + +inherit cross + +do_configure () { + : +} + +do_compile() { + oe_runmake klcc +} + +do_install() { + install -d ${D}${base_bindir} + install -m 0755 klcc/klcc ${D}${base_bindir}/${TARGET_PREFIX}klcc +}
meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/dash_readopt.patch deleted +0 -111
111 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/fstype-sane-vfat-and-jffs2-for-1.5.patch deleted +0 -74
74 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/kernel_3.2__aligned_u64.patch deleted +0 -46
46 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/klcc_prefix.patch deleted +0 -24
@@ -1,24 +0,0 @@ -Patch was imported from the OpenEmbedded git server -(git://git.openembedded.org/openembedded) -as of commit id a29bf15b9c9c0d15f96c254b2ed830e104ae3436 -Signed-off-by: Andrea Adami <[email protected]> - -Index: klibc-1.5.19/klcc/Kbuild -=================================================================== ---- --- klibc-1.5.19.orig/klcc/Kbuild 2010-07-07 14:07:48.000000000 +0200 -+++ --- klibc-1.5.19./klcc/Kbuild 2010-08-18 23:39:23.000000000 +0200 -@@ -22,10 +22,10 @@ - $(Q)echo 'EMAIN=$(KLIBCEMAIN)' >> $@ - $(Q)echo 'BITSIZE=$(KLIBCBITSIZE)' >> $@ - $(Q)echo 'VERSION=$(shell cat $(srctree)/usr/klibc/version)' >> $@ -- $(Q)echo 'prefix=$(INSTALLDIR)' >> $@ -- $(Q)echo 'bindir=$(INSTALLDIR)/$(KCROSS)bin' >> $@ -- $(Q)echo 'libdir=$(INSTALLDIR)/$(KCROSS)lib' >> $@ -- $(Q)echo 'includedir=$(INSTALLDIR)/$(KCROSS)include' >> $@ -+ $(Q)echo 'prefix=$(KLCC_INST)' >> $@ -+ $(Q)echo 'bindir=$(KLCC_INST)/$(KCROSS)bin' >> $@ -+ $(Q)echo 'libdir=$(KLCC_INST)/$(KCROSS)lib' >> $@ -+ $(Q)echo 'includedir=$(KLCC_INST)/$(KCROSS)include' >> $@ - - - # Generate klcc
meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/klibc-config-eabi.patch deleted +0 -14
@@ -1,14 +0,0 @@ -Patch was imported from the OpenEmbedded git server -(git://git.openembedded.org/openembedded) -as of commit id b6764cf32ec93547531130dca364fb95e1c495f4 -Signed-off-by: Thomas Kunze <[email protected]> - -diff -Nur klibc-1.5/defconfig klibc-1.5p/defconfig ---- klibc-1.5/defconfig 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5p/defconfig 2008-02-08 19:24:22.337127756 +0100 -@@ -5,4 +5,4 @@ - CONFIG_REGPARM=y - # ARM options - # CONFIG_KLIBC_THUMB is not set --# CONFIG_AEABI is not set -+CONFIG_AEABI=y
meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/modprobe.patch deleted +0 -1984
1,984 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/staging.patch deleted +0 -153
153 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/use-env-for-perl.patch deleted +0 -25
@@ -1,25 +0,0 @@ -Patch was imported from the OpenEmbedded git server -(git://git.openembedded.org/openembedded) -as of commit id 676cbb54d42c89a4832871064cfcb7ee2ad372ee - -klcc-cross: Add patch to use /usr/bin/env perl -Certain configurations (such as autobuilders) may build in very -deep paths (that are longer than the #! mechanism allows) which -makes it unsafe to use the direct path for perl. In our case we know -that /usr/bin/env perl will always return ours (if it has been built). - -Signed-off-by: Tom Rini <[email protected]> - -Index: klibc-1.5.20/klcc/makeklcc.pl -=================================================================== ---- a/klcc/makeklcc.pl -+++ b/klcc/makeklcc.pl -@@ -26,7 +26,7 @@ sub pathsearch($) { - return undef; - } - --print "#!${perlpath}\n"; -+print "#!/usr/bin/env perl\n"; - - open(KLIBCCONF, "< $klibcconf\0") - or die "$0: cannot open $klibcconf: $!\n";
meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/wc.patch deleted +0 -245
245 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/dash_readopt.patch new file +111 -0
111 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/fstype-sane-vfat-and-jffs2-for-1.5.patch new file +74 -0
74 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/kernel_3.2__aligned_u64.patch new file +46 -0
46 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klcc_prefix.patch new file +24 -0
@@ -0,0 +1,24 @@ +Patch was imported from the OpenEmbedded git server +(git://git.openembedded.org/openembedded) +as of commit id a29bf15b9c9c0d15f96c254b2ed830e104ae3436 +Signed-off-by: Andrea Adami <[email protected]> + +Index: klibc-1.5.19/klcc/Kbuild +=================================================================== +--- --- klibc-1.5.19.orig/klcc/Kbuild 2010-07-07 14:07:48.000000000 +0200 ++++ --- klibc-1.5.19./klcc/Kbuild 2010-08-18 23:39:23.000000000 +0200 +@@ -22,10 +22,10 @@ + $(Q)echo 'EMAIN=$(KLIBCEMAIN)' >> $@ + $(Q)echo 'BITSIZE=$(KLIBCBITSIZE)' >> $@ + $(Q)echo 'VERSION=$(shell cat $(srctree)/usr/klibc/version)' >> $@ +- $(Q)echo 'prefix=$(INSTALLDIR)' >> $@ +- $(Q)echo 'bindir=$(INSTALLDIR)/$(KCROSS)bin' >> $@ +- $(Q)echo 'libdir=$(INSTALLDIR)/$(KCROSS)lib' >> $@ +- $(Q)echo 'includedir=$(INSTALLDIR)/$(KCROSS)include' >> $@ ++ $(Q)echo 'prefix=$(KLCC_INST)' >> $@ ++ $(Q)echo 'bindir=$(KLCC_INST)/$(KCROSS)bin' >> $@ ++ $(Q)echo 'libdir=$(KLCC_INST)/$(KCROSS)lib' >> $@ ++ $(Q)echo 'includedir=$(KLCC_INST)/$(KCROSS)include' >> $@ + + + # Generate klcc
meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klibc-config-eabi.patch new file +14 -0
@@ -0,0 +1,14 @@ +Patch was imported from the OpenEmbedded git server +(git://git.openembedded.org/openembedded) +as of commit id b6764cf32ec93547531130dca364fb95e1c495f4 +Signed-off-by: Thomas Kunze <[email protected]> +
Lines of this file are not shown. View the raw message.
meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/modprobe.patch new file +1984 -0
1,984 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/staging.patch new file +153 -0
153 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/use-env-for-perl.patch new file +25 -0
Lines of this file are not shown. View the raw message.
meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/wc.patch new file +245 -0
245 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.25.bb deleted +0 -16
Lines of this file are not shown. View the raw message.
meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.26.bb new file +16 -0
Lines of this file are not shown. View the raw message.
meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.25.bb deleted +0 -16
Lines of this file are not shown. View the raw message.
meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.26.bb new file +16 -0
Lines of this file are not shown. View the raw message.
meta-initramfs/recipes-devtools/klibc/klibc.inc +2 -2
Lines of this file are not shown. View the raw message.
meta-initramfs/recipes-devtools/klibc/klibc_1.5.25.bb deleted +0 -45
45 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc_1.5.26.bb new file +45 -0
45 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.3.4
Part of the diff is not shown here. View the raw message.
PATCH 2/2 ubi-utils-klibc: add the remaining ubicrc32, ubinize, ubiformat
* add more hacks to compile
* binaries tested on Zaurus poodle/corgi (with patched kernel)
* bump PR
* NOTES
* strange behavior wrt getopt for at least ubiformat:
* you should pass the options first, i.e.
* ubiformat -O 512 /dev/mtd3 *works*
* ubiformat /dev/mtd3 -O 512 *fails*
--- .../mtd/ubi-utils-klibc/Makefile.patch | 27 ++++++++++-------- .../mtd/ubi-utils-klibc/libiniparser.c.patch | 13 ++++++++ .../mtd/ubi-utils-klibc/libubi.c.patch | 13 +++++++- .../mtd/ubi-utils-klibc/ubiformat.c.patch | 30 ++++++++++++++++++++ .../recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb | 30 +++++++++---------- 5 files changed, 83 insertions(+), 30 deletions(-) create mode 100644 meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libiniparser.c.patch create mode 100644 meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/ubiformat.c.patch
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/Makefile.patch +15 -12
@@ -1,6 +1,6 @@ ---- a/Makefile 2012-04-29 18:15:30.000000000 +0200 -+++ b/Makefile 2012-04-29 00:43:03.000000000 +0200 -@@ -16,27 +16,11 @@ +--- a/Makefile 2012-05-01 19:46:47.000000000 +0200 ++++ b/Makefile 2012-05-01 19:48:01.000000000 +0200 +@@ -16,27 +16,13 @@ TESTS = tests
@@ -13,16 +13,14 @@ - rfddump rfdformat \ - serve_image recv_image \ - sumtool jffs2reader --UBI_BINS = \ -- ubiupdatevol ubimkvol ubirmvol ubicrc32 ubinfo ubiattach \ -- ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol -- + UBI_BINS = \ + ubiupdatevol ubimkvol ubirmvol ubicrc32 ubinfo ubiattach \ + ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol + -BINS = $(MTD_BINS) -BINS += mkfs.ubifs/mkfs.ubifs -BINS += $(addprefix ubi-utils/,$(UBI_BINS)) -SCRIPTS = flash_eraseall -+UBI_BINS = ubiupdatevol ubimkvol ubirmvol ubinfo ubiattach ubidetach ubirename mtdinfo ubirsvol -+ +BINS = $(addprefix ubi-utils/,$(UBI_BINS)) TARGETS = $(BINS)
@@ -31,7 +29,7 @@ OBJDEPS = $(BUILDDIR)/include/version.h -@@ -58,7 +42,7 @@ +@@ -58,12 +44,9 @@ rm -f $(BUILDDIR)/include/version.h $(MAKE) -C $(TESTS) clean
@@ -39,8 +37,13 @@ +install:: $(addprefix $(BUILDDIR)/,${BINS}) mkdir -p ${DESTDIR}/${SBINDIR} install -m 0755 $^ ${DESTDIR}/${SBINDIR}/ - mkdir -p ${DESTDIR}/${MANDIR}/man1 -@@ -88,7 +72,6 @@ +- mkdir -p ${DESTDIR}/${MANDIR}/man1 +- install -m 0644 mkfs.jffs2.1 ${DESTDIR}/${MANDIR}/man1/ +- -gzip -9f ${DESTDIR}/${MANDIR}/man1/*.1 + + tests:: + $(MAKE) -C $(TESTS) +@@ -88,7 +71,6 @@ LDFLAGS_jffs2reader = $(ZLIBLDFLAGS) $(LZOLDFLAGS) LDLIBS_jffs2reader = -lz $(LZOLDLIBS)
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libiniparser.c.patch new file +13 -0
@@ -0,0 +1,13 @@ +--- a/ubi-utils/libiniparser.c 2012-04-30 23:59:40.000000000 +0200 ++++ b/ubi-utils/libiniparser.c 2012-04-30 23:55:15.000000000 +0200 +@@ -333,7 +333,9 @@ + + str = iniparser_getstring(d, key, INI_INVALID_KEY); + if (str==INI_INVALID_KEY) return notfound ; +- return atof(str); ++ double value; ++ sscanf(str,"%lf",&value); ++ return value; + } + + /*-------------------------------------------------------------------------*/
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch +11 -2
@@ -1,5 +1,5 @@ ---- a/ubi-utils/libubi.c 2012-04-29 21:44:52.000000000 +0200 -+++ b/ubi-utils/libubi.c 2012-04-29 21:43:52.000000000 +0200 +--- a/ubi-utils/libubi.c 2012-05-01 01:57:51.000000000 +0200 ++++ b/ubi-utils/libubi.c 2012-05-01 01:55:14.000000000 +0200 @@ -36,6 +36,26 @@ #include "libubi_int.h" #include "common.h"
@@ -49,6 +49,15 @@ if (minor != 0) { errno = EINVAL; +@@ -686,7 +706,7 @@ + * success and %-1 in case of failure. @r->ubi_num contains newly created UBI + * device number. + */ +-static int do_attach(const char *node, const struct ubi_attach_req *r) ++static int do_attach(const char *node, struct ubi_attach_req *r) + { + int fd, ret; + @@ -757,8 +777,8 @@ mtd_dev_node); }
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/ubiformat.c.patch new file +30 -0
@@ -0,0 +1,30 @@ +--- a/ubi-utils/ubiformat.c 2012-05-03 01:14:39.000000000 +0200 ++++ b/ubi-utils/ubiformat.c 2012-05-03 01:00:57.000000000 +0200 +@@ -246,7 +246,11 @@ + + while (1) { + normsg_cont("continue? (yes/no) "); +- if (scanf("%3s", buf) == EOF) { ++ ++ fflush(stderr); ++ fflush(stdout); ++ ++ if (fgets(buf,4,stdin) == NULL) { + sys_errmsg("scanf returned unexpected EOF, assume \"yes\""); + return 1; + } +@@ -259,10 +263,13 @@ + + static int answer_is_yes(void) + { ++ fflush(stderr); ++ fflush(stdout); ++ + char buf[4]; + + while (1) { +- if (scanf("%3s", buf) == EOF) { ++ if (fgets(buf,4,stdin) == NULL) { + sys_errmsg("scanf returned unexpected EOF, assume \"no\""); + return 0; + }
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb +14 -16
@@ -6,20 +6,17 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c" - -PR = "r0" +PR = "r1" inherit klibc -# ubicrc32 needs 'feof' (in klibc_2.0) -# ubinize needs 'atof' -# ubiformat needs 'scanf'equivalent for klibc - SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=995cfe51b0a3cf32f381c140bf72b21bf91cef1b \ file://Makefile.patch \ file://common.mk.patch \ file://libmtd.c.patch \ file://libubi.c.patch \ + file://libiniparser.c.patch \ + file://ubiformat.c.patch \ " S = "${WORKDIR}/git/"
@@ -27,21 +24,19 @@ S = "${WORKDIR}/git/" EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}include -I${S}ubi-utils/include -DWITHOUT_XATTR' 'BUILDDIR=${S}'" do_install () { + install -d ${D}${sbindir} - install -m 755 ubi-utils/ubinfo ${D}${sbindir}/ubinfo - install -m 755 ubi-utils/ubiattach ${D}${sbindir}/ubiattach - install -m 755 ubi-utils/ubidetach ${D}${sbindir}/ubidetach - install -m 755 ubi-utils/mtdinfo ${D}${sbindir}/mtdinfo - install -m 755 ubi-utils/ubiupdatevol ${D}${sbindir}/ubiupdatevol - install -m 755 ubi-utils/ubimkvol ${D}${sbindir}/ubimkvol - install -m 755 ubi-utils/ubirename ${D}${sbindir}/ubirename - install -m 755 ubi-utils/ubirmvol ${D}${sbindir}/ubirmvol - install -m 755 ubi-utils/ubirsvol ${D}${sbindir}/ubirsvol + oe_runmake DESTDIR="${D}" install + } +PACKAGES = "ubi-utils-klibc-dbg" + PACKAGES =+ "ubinfo-klibc ubiattach-klibc ubidetach-klibc mtdinfo-klibc ubiupdatevol-klibc \ - ubimkvol-klibc ubirename-klibc ubirmvol-klibc ubirsvol-klibc" + ubimkvol-klibc ubirename-klibc ubirmvol-klibc ubirsvol-klibc \ + ubinize-klibc ubiformat-klibc ubicrc32-klibc" +FILES_ubicrc32-klibc = "${sbindir}/ubicrc32" FILES_ubinfo-klibc = "${sbindir}/ubinfo" FILES_ubiattach-klibc = "${sbindir}/ubiattach" FILES_ubidetach-klibc = "${sbindir}/ubidetach"
@@ -51,3 +46,6 @@ FILES_ubimkvol-klibc = "${sbindir}/ubimkvol" FILES_ubirename-klibc = "${sbindir}/ubirename" FILES_ubirmvol-klibc = "${sbindir}/ubirmvol" FILES_ubirsvol-klibc = "${sbindir}/ubirsvol" +FILES_ubinize-klibc = "${sbindir}/ubinize" +FILES_ubiformat-klibc = "${sbindir}/ubiformat" +
Signature · 1 line
1.7.3.4
PATCH v2 1/2 klibc: upgrade from 1.5.25 to 1.5.26
In reply to Andrea Adami* minor updates, still waiting for release 2.0
* v2 adds another (sometimes) missing header
--- .../recipes-devtools/klibc/klcc-cross_1.5.25.bb | 32 - .../recipes-devtools/klibc/klcc-cross_1.5.26.bb | 32 + .../klibc/klibc-1.5.25/dash_readopt.patch | 111 -- .../fstype-sane-vfat-and-jffs2-for-1.5.patch | 74 - .../klibc-1.5.25/kernel_3.2__aligned_u64.patch | 46 - .../klibc/klibc-1.5.25/klcc_prefix.patch | 24 - .../klibc/klibc-1.5.25/klibc-config-eabi.patch | 14 - .../klibc/klibc-1.5.25/modprobe.patch | 1984 -------------------- .../klibc/klibc-1.5.25/staging.patch | 153 -- .../klibc/klibc-1.5.25/use-env-for-perl.patch | 25 - .../recipes-devtools/klibc/klibc-1.5.25/wc.patch | 245 --- .../klibc/klibc-1.5.26/dash_readopt.patch | 111 ++ .../fstype-sane-vfat-and-jffs2-for-1.5.patch | 74 + .../klibc-1.5.26/kernel_3.2__aligned_u64.patch | 46 + .../klibc/klibc-1.5.26/klcc_prefix.patch | 24 + .../klibc/klibc-1.5.26/klibc-config-eabi.patch | 14 + .../klibc/klibc-1.5.26/modprobe.patch | 1984 ++++++++++++++++++++ .../klibc/klibc-1.5.26/staging.patch | 153 ++ .../klibc/klibc-1.5.26/use-env-for-perl.patch | 25 + .../recipes-devtools/klibc/klibc-1.5.26/wc.patch | 245 +++ .../klibc/klibc-static-utils_1.5.25.bb | 16 - .../klibc/klibc-static-utils_1.5.26.bb | 16 + .../recipes-devtools/klibc/klibc-utils_1.5.25.bb | 16 - .../recipes-devtools/klibc/klibc-utils_1.5.26.bb | 16 + meta-initramfs/recipes-devtools/klibc/klibc.inc | 4 +- .../recipes-devtools/klibc/klibc_1.5.25.bb | 45 - .../recipes-devtools/klibc/klibc_1.5.26.bb | 46 + 27 files changed, 2788 insertions(+), 2787 deletions(-) delete mode 100644 meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.25.bb create mode 100644 meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.26.bb delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/dash_readopt.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/fstype-sane-vfat-and-jffs2-for-1.5.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/kernel_3.2__aligned_u64.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/klcc_prefix.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/klibc-config-eabi.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/modprobe.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/staging.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/use-env-for-perl.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/wc.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/dash_readopt.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/fstype-sane-vfat-and-jffs2-for-1.5.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/kernel_3.2__aligned_u64.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klcc_prefix.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klibc-config-eabi.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/modprobe.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/staging.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/use-env-for-perl.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/wc.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.25.bb create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.26.bb delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.25.bb create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.26.bb delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc_1.5.25.bb create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc_1.5.26.bb
meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.25.bb deleted +0 -32
@@ -1,32 +0,0 @@ -PR = "${INC_PR}.0" - -require klibc.inc - -export KLCC_INST = "${STAGING_DIR_TARGET}/lib/klibc" - -SRC_URI += "file://klcc_prefix.patch \ - file://use-env-for-perl.patch" - -DEPENDS = "klibc" - -FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" - -# ${TARGET_PREFIX}klcc is just a -# perl wrapper around gcc-cross -# so give it the same arch and path -PACKAGE_ARCH = "${TUNE_PKGARCH}" - -inherit cross - -do_configure () { - : -} - -do_compile() { - oe_runmake klcc -} - -do_install() { - install -d ${D}${base_bindir} - install -m 0755 klcc/klcc ${D}${base_bindir}/${TARGET_PREFIX}klcc -}
meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.26.bb new file +32 -0
@@ -0,0 +1,32 @@ +PR = "${INC_PR}.0" + +require klibc.inc + +export KLCC_INST = "${STAGING_DIR_TARGET}/lib/klibc" + +SRC_URI += "file://klcc_prefix.patch \ + file://use-env-for-perl.patch" + +DEPENDS = "klibc" + +FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" + +# ${TARGET_PREFIX}klcc is just a +# perl wrapper around gcc-cross +# so give it the same arch and path +PACKAGE_ARCH = "${TUNE_PKGARCH}" + +inherit cross + +do_configure () { + : +} + +do_compile() { + oe_runmake klcc +} + +do_install() { + install -d ${D}${base_bindir} + install -m 0755 klcc/klcc ${D}${base_bindir}/${TARGET_PREFIX}klcc +}
meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/dash_readopt.patch deleted +0 -111
111 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/fstype-sane-vfat-and-jffs2-for-1.5.patch deleted +0 -74
74 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/kernel_3.2__aligned_u64.patch deleted +0 -46
46 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/klcc_prefix.patch deleted +0 -24
@@ -1,24 +0,0 @@ -Patch was imported from the OpenEmbedded git server -(git://git.openembedded.org/openembedded) -as of commit id a29bf15b9c9c0d15f96c254b2ed830e104ae3436 -Signed-off-by: Andrea Adami <[email protected]> - -Index: klibc-1.5.19/klcc/Kbuild -=================================================================== ---- --- klibc-1.5.19.orig/klcc/Kbuild 2010-07-07 14:07:48.000000000 +0200 -+++ --- klibc-1.5.19./klcc/Kbuild 2010-08-18 23:39:23.000000000 +0200 -@@ -22,10 +22,10 @@ - $(Q)echo 'EMAIN=$(KLIBCEMAIN)' >> $@ - $(Q)echo 'BITSIZE=$(KLIBCBITSIZE)' >> $@ - $(Q)echo 'VERSION=$(shell cat $(srctree)/usr/klibc/version)' >> $@ -- $(Q)echo 'prefix=$(INSTALLDIR)' >> $@ -- $(Q)echo 'bindir=$(INSTALLDIR)/$(KCROSS)bin' >> $@ -- $(Q)echo 'libdir=$(INSTALLDIR)/$(KCROSS)lib' >> $@ -- $(Q)echo 'includedir=$(INSTALLDIR)/$(KCROSS)include' >> $@ -+ $(Q)echo 'prefix=$(KLCC_INST)' >> $@ -+ $(Q)echo 'bindir=$(KLCC_INST)/$(KCROSS)bin' >> $@ -+ $(Q)echo 'libdir=$(KLCC_INST)/$(KCROSS)lib' >> $@ -+ $(Q)echo 'includedir=$(KLCC_INST)/$(KCROSS)include' >> $@ - - - # Generate klcc
meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/klibc-config-eabi.patch deleted +0 -14
@@ -1,14 +0,0 @@ -Patch was imported from the OpenEmbedded git server -(git://git.openembedded.org/openembedded) -as of commit id b6764cf32ec93547531130dca364fb95e1c495f4 -Signed-off-by: Thomas Kunze <[email protected]> - -diff -Nur klibc-1.5/defconfig klibc-1.5p/defconfig ---- klibc-1.5/defconfig 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5p/defconfig 2008-02-08 19:24:22.337127756 +0100 -@@ -5,4 +5,4 @@ - CONFIG_REGPARM=y - # ARM options - # CONFIG_KLIBC_THUMB is not set --# CONFIG_AEABI is not set -+CONFIG_AEABI=y
meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/modprobe.patch deleted +0 -1984
1,984 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/staging.patch deleted +0 -153
153 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/use-env-for-perl.patch deleted +0 -25
@@ -1,25 +0,0 @@ -Patch was imported from the OpenEmbedded git server -(git://git.openembedded.org/openembedded) -as of commit id 676cbb54d42c89a4832871064cfcb7ee2ad372ee - -klcc-cross: Add patch to use /usr/bin/env perl -Certain configurations (such as autobuilders) may build in very -deep paths (that are longer than the #! mechanism allows) which -makes it unsafe to use the direct path for perl. In our case we know -that /usr/bin/env perl will always return ours (if it has been built). - -Signed-off-by: Tom Rini <[email protected]> - -Index: klibc-1.5.20/klcc/makeklcc.pl -=================================================================== ---- a/klcc/makeklcc.pl -+++ b/klcc/makeklcc.pl -@@ -26,7 +26,7 @@ sub pathsearch($) { - return undef; - } - --print "#!${perlpath}\n"; -+print "#!/usr/bin/env perl\n"; - - open(KLIBCCONF, "< $klibcconf\0") - or die "$0: cannot open $klibcconf: $!\n";
meta-initramfs/recipes-devtools/klibc/klibc-1.5.25/wc.patch deleted +0 -245
245 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/dash_readopt.patch new file +111 -0
111 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/fstype-sane-vfat-and-jffs2-for-1.5.patch new file +74 -0
74 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/kernel_3.2__aligned_u64.patch new file +46 -0
46 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klcc_prefix.patch new file +24 -0
@@ -0,0 +1,24 @@ +Patch was imported from the OpenEmbedded git server +(git://git.openembedded.org/openembedded) +as of commit id a29bf15b9c9c0d15f96c254b2ed830e104ae3436 +Signed-off-by: Andrea Adami <[email protected]> + +Index: klibc-1.5.19/klcc/Kbuild +=================================================================== +--- --- klibc-1.5.19.orig/klcc/Kbuild 2010-07-07 14:07:48.000000000 +0200 ++++ --- klibc-1.5.19./klcc/Kbuild 2010-08-18 23:39:23.000000000 +0200 +@@ -22,10 +22,10 @@ + $(Q)echo 'EMAIN=$(KLIBCEMAIN)' >> $@ + $(Q)echo 'BITSIZE=$(KLIBCBITSIZE)' >> $@ + $(Q)echo 'VERSION=$(shell cat $(srctree)/usr/klibc/version)' >> $@ +- $(Q)echo 'prefix=$(INSTALLDIR)' >> $@ +- $(Q)echo 'bindir=$(INSTALLDIR)/$(KCROSS)bin' >> $@ +- $(Q)echo 'libdir=$(INSTALLDIR)/$(KCROSS)lib' >> $@ +- $(Q)echo 'includedir=$(INSTALLDIR)/$(KCROSS)include' >> $@ ++ $(Q)echo 'prefix=$(KLCC_INST)' >> $@ ++ $(Q)echo 'bindir=$(KLCC_INST)/$(KCROSS)bin' >> $@ ++ $(Q)echo 'libdir=$(KLCC_INST)/$(KCROSS)lib' >> $@ ++ $(Q)echo 'includedir=$(KLCC_INST)/$(KCROSS)include' >> $@ + + + # Generate klcc
meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klibc-config-eabi.patch new file +14 -0
@@ -0,0 +1,14 @@ +Patch was imported from the OpenEmbedded git server +(git://git.openembedded.org/openembedded) +as of commit id b6764cf32ec93547531130dca364fb95e1c495f4 +Signed-off-by: Thomas Kunze <[email protected]> +
Lines of this file are not shown. View the raw message.
meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/modprobe.patch new file +1984 -0
1,984 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/staging.patch new file +153 -0
153 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/use-env-for-perl.patch new file +25 -0
Lines of this file are not shown. View the raw message.
meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/wc.patch new file +245 -0
245 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.25.bb deleted +0 -16
Lines of this file are not shown. View the raw message.
meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.26.bb new file +16 -0
Lines of this file are not shown. View the raw message.
meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.25.bb deleted +0 -16
Lines of this file are not shown. View the raw message.
meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.26.bb new file +16 -0
Lines of this file are not shown. View the raw message.
meta-initramfs/recipes-devtools/klibc/klibc.inc +2 -2
Lines of this file are not shown. View the raw message.
meta-initramfs/recipes-devtools/klibc/klibc_1.5.25.bb deleted +0 -45
45 lines not on this page · raw message
meta-initramfs/recipes-devtools/klibc/klibc_1.5.26.bb new file +46 -0
46 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.3.4
Part of the diff is not shown here. View the raw message.