From 2f9d8fef13e592d232a9bec3c1eb7c59fe048878 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Wed, 27 Jun 2012 22:49:21 +0000 Subject: 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 Signed-off-by: Koen Kooi --- .../mtd/ubi-utils-klibc/libubi.c.patch | 17 ++++++++ .../recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb | 49 ---------------------- .../recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb | 49 ++++++++++++++++++++++ 3 files changed, 66 insertions(+), 49 deletions(-) delete mode 100644 meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb create mode 100644 meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb (limited to 'meta-initramfs') 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 db95904ea8..b52e207898 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.4.9.bb deleted file mode 100644 index ebdd3f6c83..0000000000 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb +++ /dev/null @@ -1,49 +0,0 @@ -DESCRIPTION = "Tools for managing memory technology devices." -SECTION = "base" -DEPENDS = "zlib lzo e2fsprogs util-linux" -HOMEPAGE = "http://www.linux-mtd.infradead.org/" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ - file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c" - -PR = "r4" - -inherit klibc - -SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=995cfe51b0a3cf32f381c140bf72b21bf91cef1b \ - file://Makefile.patch \ - file://common.mk.patch \ - file://libubi.c.patch \ - file://libiniparser.c.patch \ - file://ubiformat.c.patch \ - " - -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}'" - -do_install () { - - install -d ${D}${sbindir} - oe_runmake DESTDIR="${D}" install - -} - -PACKAGES = "ubi-utils-klibc-dbg" - -PACKAGES =+ "ubinfo-klibc ubiattach-klibc ubidetach-klibc mtdinfo-klibc ubiupdatevol-klibc \ - ubimkvol-klibc ubirename-klibc ubirmvol-klibc ubirsvol-klibc \ - ubinize-klibc ubiformat-klibc ubicrc32-klibc" - -FILES_ubinfo-klibc = "${sbindir}/ubinfo" -FILES_ubiattach-klibc = "${sbindir}/ubiattach" -FILES_ubidetach-klibc = "${sbindir}/ubidetach" -FILES_mtdinfo-klibc = "${sbindir}/mtdinfo" -FILES_ubiupdatevol-klibc = "${sbindir}/ubiupdatevol" -FILES_ubimkvol-klibc = "${sbindir}/ubimkvol" -FILES_ubirename-klibc = "${sbindir}/ubirename" -FILES_ubirmvol-klibc = "${sbindir}/ubirmvol" -FILES_ubirsvol-klibc = "${sbindir}/ubirsvol" -FILES_ubinize-klibc = "${sbindir}/ubinize" -FILES_ubiformat-klibc = "${sbindir}/ubiformat" -FILES_ubicrc32-klibc = "${sbindir}/ubicrc32" 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 new file mode 100644 index 0000000000..5cdd984b2b --- /dev/null +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb @@ -0,0 +1,49 @@ +DESCRIPTION = "Tools for managing memory technology devices." +SECTION = "base" +DEPENDS = "zlib lzo e2fsprogs util-linux" +HOMEPAGE = "http://www.linux-mtd.infradead.org/" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ + file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c" + +PR = "r0" + +inherit klibc + +SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=ca39eb1d98e736109c64ff9c1aa2a6ecca222d8f \ + file://Makefile.patch \ + file://common.mk.patch \ + file://libubi.c.patch \ + file://libiniparser.c.patch \ + file://ubiformat.c.patch \ + " + +S = "${WORKDIR}/git/" + +EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}include -DWITHOUT_XATTR' 'BUILDDIR=${S}'" + +do_install () { + + install -d ${D}${sbindir} + oe_runmake DESTDIR="${D}" install + +} + +PACKAGES = "ubi-utils-klibc-dbg" + +PACKAGES =+ "ubinfo-klibc ubiattach-klibc ubidetach-klibc mtdinfo-klibc ubiupdatevol-klibc \ + ubimkvol-klibc ubirename-klibc ubirmvol-klibc ubirsvol-klibc \ + ubinize-klibc ubiformat-klibc ubicrc32-klibc" + +FILES_ubinfo-klibc = "${sbindir}/ubinfo" +FILES_ubiattach-klibc = "${sbindir}/ubiattach" +FILES_ubidetach-klibc = "${sbindir}/ubidetach" +FILES_mtdinfo-klibc = "${sbindir}/mtdinfo" +FILES_ubiupdatevol-klibc = "${sbindir}/ubiupdatevol" +FILES_ubimkvol-klibc = "${sbindir}/ubimkvol" +FILES_ubirename-klibc = "${sbindir}/ubirename" +FILES_ubirmvol-klibc = "${sbindir}/ubirmvol" +FILES_ubirsvol-klibc = "${sbindir}/ubirsvol" +FILES_ubinize-klibc = "${sbindir}/ubinize" +FILES_ubiformat-klibc = "${sbindir}/ubiformat" +FILES_ubicrc32-klibc = "${sbindir}/ubicrc32" -- cgit 1.2.3-korg