summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch17
-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 db95904ea..b52e20789 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 @@
9 { 9 {
10 int fd, ret; 10 int fd, ret;
11 11
12@@ -1346,13 +1346,13 @@
13
14 int ubi_set_property(int fd, uint8_t property, uint64_t value)
15 {
16- struct ubi_set_prop_req r;
17+ struct ubi_set_vol_prop_req r;
18
19- memset(&r, 0, sizeof(struct ubi_set_prop_req));
20+ memset(&r, 0, sizeof(struct ubi_set_vol_prop_req));
21 r.property = property;
22 r.value = value;
23
24- return ioctl(fd, UBI_IOCSETPROP, &r);
25+ return ioctl(fd, UBI_IOCSETVOLPROP, &r);
26 }
27
28 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 ebdd3f6c8..5cdd984b2 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+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
7 file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c" 7 file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c"
8 8
9PR = "r4" 9PR = "r0"
10 10
11inherit klibc 11inherit klibc
12 12
13SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=995cfe51b0a3cf32f381c140bf72b21bf91cef1b \ 13SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=ca39eb1d98e736109c64ff9c1aa2a6ecca222d8f \
14 file://Makefile.patch \ 14 file://Makefile.patch \
15 file://common.mk.patch \ 15 file://common.mk.patch \
16 file://libubi.c.patch \ 16 file://libubi.c.patch \
@@ -20,7 +20,7 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=995cfe51b0a3cf
20 20
21S = "${WORKDIR}/git/" 21S = "${WORKDIR}/git/"
22 22
23EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}include -I${S}ubi-utils/include -DWITHOUT_XATTR' 'BUILDDIR=${S}'" 23EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}include -DWITHOUT_XATTR' 'BUILDDIR=${S}'"
24 24
25do_install () { 25do_install () {
26 26