Skip to contentSkip to conversation

ubi-utils-klibc_1.5.0: fix build because of ioctl renaming

PATCH In review Andrea Adami 1 participant 2 messages Jun 21, 2012 – Jun 27, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ubi-utils-klibc_1.5.0: fix build because of ioctl 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

---
 .../mtd/ubi-utils-klibc/libubi.c.patch             |   17 +++++++++++++++++
 .../recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb  |    2 +-
 2 files changed, 18 insertions(+), 1 deletions(-)
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch +17 -0
index db95904..b52e207 100644
@@ -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)
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb +1 -1
index 2095552..d4d0055 100644
@@ -6,7 +6,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c"
 
-PR = "r0"
+PR = "r1"
 
 inherit klibc
 
Signature · 1 line
1.7.3.4
#1 lore raw
Quoted 48 lines · Andrea Adami

* 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

---
 .../mtd/ubi-utils-klibc/libubi.c.patch             |   17 +++++++++++++++++ .../recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb  |    2 +-

 2 files changed, 18 insertions(+), 1 deletions(-)
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch +17 -0
index db95904..b52e207 100644
@@ -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)
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb +0 -0
index 2095552..d4d0055 100644
@@ -6,7 +6,7 @@ LICENSE = "GPLv2+"
  LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \

                    file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c"

meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb +1 -1
-PR = "r0"
+PR = "r1"
Quoted 5 lines

 inherit klibc

--
1.7.3.4

patch superseded, replaced by a new v2

Andrea