mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-04-20 11:38:34 +00:00
Code Issues Projects Releases Wiki Activity

ubi-utils-klibc: more patch-cleanings

Browse Source 
* remove unnecessary patches after klibc upgrades
* bump PR

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Andrea Adami
2012-05-29 22:12:07 +00:00
committed by Koen Kooi
parent 0dbd716b73
commit bb62247d60
4 changed files with 16 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libiniparser.c.patch
View File

@@ -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);
}
+*/
/*-------------------------------------------------------------------------*/
/**

24
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libmtd.c.patch
View File

@@ -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;

44
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch
View File

@@ -1,27 +1,5 @@
--- 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
@@ -382,8 +402,8 @@
return errmsg("\"%s\" is not a character device", node);
}
- major = major(st.st_rdev);
- minor = minor(st.st_rdev);
+ major = __major(st.st_rdev);
+ minor = __minor(st.st_rdev);
if (minor == 0) {
errno = EINVAL;
@@ -448,8 +468,8 @@
return errmsg("\"%s\" is not a character device", node);
}
- major = major(st.st_rdev);
- minor = minor(st.st_rdev);
+ major = __major(st.st_rdev);
+ minor = __minor(st.st_rdev);
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.
@@ -31,25 +9,3 @@
{
int fd, ret;
@@ -757,8 +777,8 @@
mtd_dev_node);
}
- major = major(sb.st_rdev);
- minor = minor(sb.st_rdev);
+ major = __major(sb.st_rdev);
+ minor = __minor(sb.st_rdev);
if (major != MTD_CHAR_MAJOR) {
errno = EINVAL;
@@ -866,8 +886,8 @@
return -1;
}
- major = major(st.st_rdev);
- minor = minor(st.st_rdev);
+ major = __major(st.st_rdev);
+ minor = __minor(st.st_rdev);
if (ubi_get_info((libubi_t *)lib, &info))
return -1;

3
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb
View File

@@ -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 \