ubi-utils-klibc: catch up with struct renaming in mtd/ubi-user.h
PATCH 1/1 ubi-utils-klibc: catch up with struct renaming in mtd/ubi-user.h
* fix build, broken by header upgrade
* bump PR
--- .../mtd/ubi-utils-klibc/libubi.c.patch | 9 +++++++++ .../recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-)
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch +9 -0
@@ -9,3 +9,12 @@ { int fd, ret; +@@ -1354,7 +1354,7 @@ + { + struct ubi_set_vol_prop_req r; + +- memset(&r, 0, sizeof(struct ubi_set_vol_prop_req)); ++ memset(&r, 0, sizeof(struct ubi_set_prop_req)); + r.property = property; + r.value = value; +
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb +1 -1
@@ -6,7 +6,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c" -PR = "r4" +PR = "r5" inherit klibc
Signature · 1 line
1.7.3.4
PATCH v2 1/1 ubi-utils-klibc: catch up with struct renaming in mtd/ubi-user.h
* v2 replaces malformed v1 patch
* fix build, broken by header upgrade
* bump PR
--- .../mtd/ubi-utils-klibc/libubi.c.patch | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-)
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch +17 -0
@@ -9,3 +9,20 @@ { int fd, ret; +@@ -1352,13 +1352,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)
Signature · 1 line
1.7.3.4
Quoted 35 lines · Andrea Adami
* v2 replaces malformed v1 patch
* fix build, broken by header upgrade
* bump PRSigned-off-by Andrea Adami <[email protected]>---
.../mtd/ubi-utils-klibc/libubi.c.patch | 17 +++++++++++++++++1 files changed, 17 insertions(+), 0 deletions(-)meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch +17
-1@@ -9,3 +9,20 @@ { int fd, ret; +@@ -1352,13 +1352,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) --
Quoted 2 lines
1.7.3.4
This strange renaming issue happened today, with stock linux-libc-headers. I'm trying to understand why right now I get still pre-3.0 headers... this is mtd/ubi-user.h
Anyhow, this patch is superseded by the next one, committing ver. 1.5.0
Andrea
PATCH 1/1 ubi-utils-klibc: move to version 1.5.0
--- .../recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb | 49 -------------------- .../recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb | 49 ++++++++++++++++++++ 2 files changed, 49 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
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb deleted +0 -49
@@ -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"
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb new file +49 -0
49 lines not on this page · raw message
Signature · 1 line
1.7.3.4
Re: [meta-oe][meta-initramfs][PATCH] ubi-utils-klibc: move to version 1.5.0
Quoted 119 lines · Andrea Adami
Signed-off-by Andrea Adami <[email protected]>---
.../recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb | 49 -------------------- .../recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb | 49 ++++++++++++++++++++2 files changed, 49 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
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb deleted +0
-49@@ -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"meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb new file +49
-1@@ -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 -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" --
Quoted 2 lines
1.7.3.4
patch superseded, replaced by a new v2
Andrea
Quoted 43 lines · Andrea Adami
Quoted 35 lines · Andrea Adami
* v2 replaces malformed v1 patch
* fix build, broken by header upgrade
* bump PRSigned-off-by Andrea Adami <[email protected]>---
.../mtd/ubi-utils-klibc/libubi.c.patch | 17 +++++++++++++++++1 files changed, 17 insertions(+), 0 deletions(-)meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch +17
-1@@ -9,3 +9,20 @@ { int fd, ret; +@@ -1352,13 +1352,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) --Quoted 2 lines
1.7.3.4
This strange renaming issue happened today, with stock linux-libc-headers. I'm trying to understand why right now I get still pre-3.0 headers... this is
mtd/ubi-user.h
Quoted 3 lines
Anyhow, this patch is superseded by the next one, committing ver. 1.5.0
Andrea
I've found out oe-core's parent recipe mtd-utils_1.5.0 is staging its own headers in sysroot...
We happen to install mtd-utils in our images so the header update has always been masked.
FWIW ubi-utils-klibc has own do_install and does not touch the sysroot :)
Thinking now about the best solution...
Andrea