From 307f977a566bc6727e8f52f919360b9d3906d750 Mon Sep 17 00:00:00 2001 From: Kurt Kiefer Date: Sun, 19 Jul 2020 19:18:15 -0700 Subject: [PATCH] mtd-utils: fix build for master Drop backported patches already applied in version 2.1.2 --- ...libubigen-remove-unnecessary-include.patch | 29 ---------- ...-private-kernel-header-from-includes.patch | 58 ------------------- recipes-devtools/mtd/mtd-utils_%.bbappend | 5 -- 3 files changed, 92 deletions(-) delete mode 100644 recipes-devtools/mtd/files/0001-libubigen-remove-unnecessary-include.patch delete mode 100644 recipes-devtools/mtd/files/0002-libubi-remove-private-kernel-header-from-includes.patch diff --git a/recipes-devtools/mtd/files/0001-libubigen-remove-unnecessary-include.patch b/recipes-devtools/mtd/files/0001-libubigen-remove-unnecessary-include.patch deleted file mode 100644 index 61e13803..00000000 --- a/recipes-devtools/mtd/files/0001-libubigen-remove-unnecessary-include.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 87809c4804d3355ecd2fd0bd3362526fa27bf953 Mon Sep 17 00:00:00 2001 -From: Bastian Germann -Date: Wed, 29 Jan 2020 19:50:12 +0100 -Subject: [PATCH 1/2] libubigen: remove unnecessary include - -libubigen.h does not use any symbol from mtd/ubi-media.h, -so remove it from includes. - -Signed-off-by: Bastian Germann -Signed-off-by: David Oberhollenzer ---- - include/libubigen.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/include/libubigen.h b/include/libubigen.h -index c25ac20..48d2fad 100644 ---- a/include/libubigen.h -+++ b/include/libubigen.h -@@ -26,7 +26,6 @@ - #define __LIBUBIGEN_H__ - - #include --#include - - #ifdef __cplusplus - extern "C" { --- -2.25.1 - diff --git a/recipes-devtools/mtd/files/0002-libubi-remove-private-kernel-header-from-includes.patch b/recipes-devtools/mtd/files/0002-libubi-remove-private-kernel-header-from-includes.patch deleted file mode 100644 index 7ca79b2a..00000000 --- a/recipes-devtools/mtd/files/0002-libubi-remove-private-kernel-header-from-includes.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 42e051acd32c28c2f93c946d0c4bf6f9eada2aa4 Mon Sep 17 00:00:00 2001 -From: Bastian Germann -Date: Wed, 29 Jan 2020 19:50:13 +0100 -Subject: [PATCH 2/2] libubi: remove private kernel header from includes - -libubi.h includes ubi-media.h which was made private in the kernel a -long time ago. There are users of libubi.h, e.g. swupdate, which have to -have ubi-media.h available at build time with this inclusion. - -However, libubi.h uses only one symbol from ubi-media.h. Define that symbol -in the header to enable using libubi.h without installing ubi-media.h. - -Make up for the transitive symbol use in ubiformat.c by including ubi-media.h. - -Signed-off-by: Bastian Germann -Signed-off-by: David Oberhollenzer ---- - include/libubi.h | 4 +++- - ubi-utils/ubiformat.c | 1 + - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/include/libubi.h b/include/libubi.h -index 46596a3..46c732a 100644 ---- a/include/libubi.h -+++ b/include/libubi.h -@@ -26,7 +26,6 @@ - #include - #include - #include --#include - - #ifdef __cplusplus - extern "C" { -@@ -38,6 +37,9 @@ extern "C" { - /* Maximum physical eraseblock size in bytes */ - #define UBI_MAX_PEB_SZ (2*1024*1024) - -+/* The maximum volume name length (from Linux's ubi-media.h) */ -+#define UBI_VOL_NAME_MAX 127 -+ - /* UBI library descriptor */ - typedef void * libubi_t; - -diff --git a/ubi-utils/ubiformat.c b/ubi-utils/ubiformat.c -index be40e52..d1b12e4 100644 ---- a/ubi-utils/ubiformat.c -+++ b/ubi-utils/ubiformat.c -@@ -38,6 +38,7 @@ - #include - #include - -+#include - #include - #include - #include --- -2.25.1 - diff --git a/recipes-devtools/mtd/mtd-utils_%.bbappend b/recipes-devtools/mtd/mtd-utils_%.bbappend index 72cc858f..471c8adf 100644 --- a/recipes-devtools/mtd/mtd-utils_%.bbappend +++ b/recipes-devtools/mtd/mtd-utils_%.bbappend @@ -2,11 +2,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" FILES_${PN}-staticdev += "ubi-utils/libubi.a ${libdir}/*.a" -SRC_URI += " \ - file://0001-libubigen-remove-unnecessary-include.patch \ - file://0002-libubi-remove-private-kernel-header-from-includes.patch \ -" - do_install_append () { install -d ${D}${includedir}/mtd/ install -d ${D}${libdir}/