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>
This commit is contained in:
Andrea Adami 2012-06-27 22:49:21 +00:00 committed by Koen Kooi
parent 9af2bd13c6
commit 2f9d8fef13
2 changed files with 20 additions and 3 deletions

View File

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

View File

@ -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 () {