[oe] [meta-oe][meta-initramfs][PATCH] ubi-utils-klibc_1.5.0: fix build because of ioctl renaming

[Andrea Adami]

On Fri, Jun 22, 2012 at 1:23 AM, Andrea Adami <andrea.adami at gmail.com> wrote:
> * 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 at gmail.com>
> ---
>  .../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(-)
>
> 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 db95904..b52e207 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.5.0.bb b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb
> index 2095552..d4d0055 100644
> --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb
> +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb
> @@ -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
>
> --
> 1.7.3.4
>


patch superseded, replaced by a new v2

Andrea