5 files changed, 128 insertions, 0 deletions

diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/Makefile.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/Makefile.patch
new file mode 100644
index 000000000..b7dad878b
--- /dev/null
+++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/Makefile.patch
@@ -0,0 +1,53 @@
+--- 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
+ 
+-MTD_BINS = \
+-       ftl_format flash_erase nanddump doc_loadbios \
+-       ftl_check mkfs.jffs2 flash_lock flash_unlock \
+-       flash_otp_info flash_otp_dump mtd_debug flashcp nandwrite nandtest \
+-       jffs2dump \
+-       nftldump nftl_format docfdisk \
+-       rfddump rfdformat \
+-       serve_image recv_image \
+-       sumtool jffs2reader
+ 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
++BINS = $(addprefix ubi-utils/,$(UBI_BINS))
+ 
+ TARGETS = $(BINS)
+-TARGETS += lib/libmtd.a
+-TARGETS += ubi-utils/libubi.a
+ 
+ OBJDEPS = $(BUILDDIR)/include/version.h
+ 
+@@ -58,12 +44,9 @@
+        rm -f $(BUILDDIR)/include/version.h
+        $(MAKE) -C $(TESTS) clean
+ 
+-install:: $(addprefix $(BUILDDIR)/,${BINS}) ${SCRIPTS}
++install:: $(addprefix $(BUILDDIR)/,${BINS})
+        mkdir -p ${DESTDIR}/${SBINDIR}
+        install -m 0755 $^ ${DESTDIR}/${SBINDIR}/
+-       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)
+ 
+-$(foreach v,$(MTD_BINS),$(eval $(call mkdep,,$(v))))
+ 
+ #
+ # Common libmtd
diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/common.mk.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/common.mk.patch
new file mode 100644
index 000000000..0a48416c0
--- /dev/null
+++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/common.mk.patch
@@ -0,0 +1,8 @@
+--- a/common.mk 2012-04-29 18:15:30.000000000 +0200
++++ b/common.mk 2012-04-29 00:51:53.000000000 +0200
+@@ -1,4 +1,4 @@
+-CC := $(CROSS)gcc
++CC := $(CROSS)klcc
+ AR := $(CROSS)ar
+ RANLIB := $(CROSS)ranlib
+ 
diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libiniparser.c.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libiniparser.c.patch
new file mode 100644
index 000000000..45f2439c8
--- /dev/null
+++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libiniparser.c.patch
@@ -0,0 +1,19 @@
+--- a/ubi-utils/libiniparser.c  2012-05-29 23:46:08.000000000 +0200
++++ b/ubi-utils/libiniparser.c  2012-05-29 23:45:01.000000000 +0200
+@@ -327,6 +327,8 @@
+   the notfound value is returned.
+  */
+ /*--------------------------------------------------------------------------*/
++/* Floating-point is not supported in klibc */
++/*
+ double iniparser_getdouble(dictionary * d, char * key, double notfound)
+ {
+     char    *   str ;
+@@ -335,6 +337,7 @@
+     if (str==INI_INVALID_KEY) return notfound ;
+     return atof(str);
+ }
++*/
+ 
+ /*-------------------------------------------------------------------------*/
+ /**
diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch
new file mode 100644
index 000000000..b52e20789
--- /dev/null
+++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch
@@ -0,0 +1,28 @@
+--- 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
+@@ -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;
+ 
+@@ -1346,13 +1346,13 @@
+ 
+ int ubi_set_property(int fd, uint8_t property, uint64_t value)
+ {
+-       struct ubi_set_prop_req r;
++       struct ubi_set_vol_prop_req r;
+ 
+-       memset(&r, 0, sizeof(struct ubi_set_prop_req));
++       memset(&r, 0, sizeof(struct ubi_set_vol_prop_req));
+        r.property = property;
+        r.value = value;
+ 
+-       return ioctl(fd, UBI_IOCSETPROP, &r);
++       return ioctl(fd, UBI_IOCSETVOLPROP, &r);
+ }
+ 
+ int ubi_leb_unmap(int fd, int lnum)
diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/ubiformat.c.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/ubiformat.c.patch
new file mode 100644
index 000000000..d21ed577b
--- /dev/null
+++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/ubiformat.c.patch
@@ -0,0 +1,20 @@
+--- a/ubi-utils/ubiformat.c     2012-05-03 01:14:39.000000000 +0200
++++ b/ubi-utils/ubiformat.c     2012-05-20 23:11:57.000000000 +0200
+@@ -246,7 +246,7 @@
+ 
+        while (1) {
+                normsg_cont("continue? (yes/no)  ");
+-               if (scanf("%3s", buf) == EOF) {
++               if (fgets(buf,4,stdin) == NULL) {
+                        sys_errmsg("scanf returned unexpected EOF, assume \"yes\"");
+                        return 1;
+                }
+@@ -262,7 +262,7 @@
+        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;
+                }