diff options
| author |   Andrea Adami <andrea.adami@gmail.com> | 2012-06-27 22:49:21 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-07-11 15:04:04 +0200 |
| commit | 2f9d8fef13e592d232a9bec3c1eb7c59fe048878 (patch) | |
| tree | a0c4034def41e4f85f55394448f6786534f9d411 /meta-initramfs/recipes-devtools/mtd | |
| parent | 9af2bd13c63655744785950a411a40f2848a9f3f (diff) | |
| download | meta-openembedded-2f9d8fef13e592d232a9bec3c1eb7c59fe048878.tar.gz | |
ubi-utils-klibc: update to patched v. 1.5.0
* Fix build failing because of UBI_IOCSETPROP -> UBI_IOCSETVOLPROP renaming.
* This patch follows the one in oe-core for mtd-utils_1.5.0
* which was staging an older version of the ubi-user.h header.
* We need to match the renaming done in kernel 3.0
* http://lists.infradead.org/pipermail/linux-mtd/2011-March/
* 034419.html
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-initramfs/recipes-devtools/mtd')
| -rw-r--r-- | meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch | 17 | ||||
| -rw-r--r-- | meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb (renamed from meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb) | 6 |
2 files changed, 20 insertions, 3 deletions
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 index db95904ea82..b52e207898c 100644 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch @@ -9,3 +9,20 @@ { 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_1.4.9.bb b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb index ebdd3f6c835..5cdd984b2bd 100644 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb @@ -6,11 +6,11 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c" -PR = "r4" +PR = "r0" inherit klibc -SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=995cfe51b0a3cf32f381c140bf72b21bf91cef1b \ +SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=ca39eb1d98e736109c64ff9c1aa2a6ecca222d8f \ file://Makefile.patch \ file://common.mk.patch \ file://libubi.c.patch \ @@ -20,7 +20,7 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=995cfe51b0a3cf 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}'" +EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}include -DWITHOUT_XATTR' 'BUILDDIR=${S}'" do_install () { |