Skip to contentSkip to conversation

klibc: update to git tag 49419d2df2018fff5ae6250cf55b16fa65bdc490

PATCH New Andrea Adami 1 participant 2 messages May 29, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 klibc: update to git tag 49419d2df2018fff5ae6250cf55b16fa65bdc490

* still pre-2.0
* bump INC_PR

---
 meta-initramfs/recipes-devtools/klibc/klibc.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta-initramfs/recipes-devtools/klibc/klibc.inc +2 -2
index 4466225..886b655 100644
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://usr/klibc/LICENSE;md5=d75181f10e998c21eb147f6d2e43ce8
 # debugsources.list: No such file or directory:
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 KLIBC_ARCH = '${TARGET_ARCH}'
 KLIBC_ARCH_armeb = 'arm'
@@ -21,7 +21,7 @@ KLIBC_ARCH_i586 = 'i386'
 KLIBC_ARCH_i686 = 'i386'
 KLIBC_ARCH_pentium = 'i386'
 
-SRCREV = "c2c7f19a094bba822995f7eba8ec8dfc5cbe4fdb"
+SRCREV = "49419d2df2018fff5ae6250cf55b16fa65bdc490"
 SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git;protocol=git"
 
 SRC_URI_append_linux-gnueabi = " file://klibc-config-eabi.patch"
Signature · 1 line
1.7.3.4
#1 lore raw

PATCH 2/2 ubi-utils-klibc: more patch-cleanings

* remove unnecessary patches after klibc upgrades
* bump PR

---
 .../mtd/ubi-utils-klibc/libiniparser.c.patch       |   24 +++++++----
 .../mtd/ubi-utils-klibc/libmtd.c.patch             |   24 -----------
 .../mtd/ubi-utils-klibc/libubi.c.patch             |   44 --------------------
 .../recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb  |    3 +-
 4 files changed, 16 insertions(+), 79 deletions(-)
 delete mode 100644 meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libmtd.c.patch
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libiniparser.c.patch +15 -9
index 8be8ac3..45f2439 100644
@@ -1,13 +1,19 @@
---- 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);
+--- 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);
-+    double value;
-+    sscanf(str,"%lf",&value);
-+    return value;
+     return atof(str);
  }
++*/
  
  /*-------------------------------------------------------------------------*/
+ /**
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libmtd.c.patch deleted +0 -24
deleted file mode 100644
index f32fb70..0000000
@@ -1,24 +0,0 @@
---- a/lib/libmtd.c	2012-04-29 21:44:52.000000000 +0200
-+++ b/lib/libmtd.c	2012-04-29 21:43:04.000000000 +0200
-@@ -441,8 +441,8 @@
- 		return -1;
- 	}
- 
--	major = major(st.st_rdev);
--	minor = minor(st.st_rdev);
-+	major = __major(st.st_rdev);
-+	minor = __minor(st.st_rdev);
- 
- 	if (mtd_get_info((libmtd_t *)lib, &info))
- 		return -1;
-@@ -1381,8 +1381,8 @@
- 		return -1;
- 	}
- 
--	major = major(st.st_rdev);
--	minor = minor(st.st_rdev);
-+	major = __major(st.st_rdev);
-+	minor = __minor(st.st_rdev);
- 
- 	if (mtd_get_info((libmtd_t *)lib, &info))
- 		return -1;
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch +0 -44

52 lines not on this page · raw message

meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb +1 -2
index f975952..ebdd3f6 100644
@@ -6,14 +6,13 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c"
 
-PR = "r3"
+PR = "r4"
 
 inherit 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 \
Signature · 1 line
1.7.3.4