* [meta-swupdate][PATCH] mtd-utils: Remove patchs @ 2020-07-30 1:18 zhengruoqin 2020-07-30 8:34 ` [swupdate] " Stefano Babic 0 siblings, 1 reply; 4+ messages in thread From: zhengruoqin @ 2020-07-30 1:18 UTC (permalink / raw) To: swupdate; +Cc: yocto files/0001-libubigen-remove-unnecessary-include.patch files/0002-libubi-remove-private-kernel-header-from-includes.patch Removed since these are included in 2.1.2. Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>/ --- ...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 61e1380..0000000 --- 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 <bastiangermann@fishpost.de> -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 <bastiangermann@fishpost.de> -Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at> ---- - 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 <stdint.h> --#include <mtd/ubi-media.h> - - #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 7ca79b2..0000000 --- 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 <bastiangermann@fishpost.de> -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 <bastiangermann@fishpost.de> -Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at> ---- - 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 <ctype.h> - #include <stdint.h> - #include <mtd/ubi-user.h> --#include <mtd/ubi-media.h> - - #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 <getopt.h> - #include <fcntl.h> - -+#include <mtd/ubi-media.h> - #include <libubi.h> - #include <libmtd.h> - #include <libscan.h> --- -2.25.1 - diff --git a/recipes-devtools/mtd/mtd-utils_%.bbappend b/recipes-devtools/mtd/mtd-utils_%.bbappend index 72cc858..471c8ad 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}/ -- 2.25.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [swupdate] [meta-swupdate][PATCH] mtd-utils: Remove patchs 2020-07-30 1:18 [meta-swupdate][PATCH] mtd-utils: Remove patchs zhengruoqin @ 2020-07-30 8:34 ` Stefano Babic 2020-07-30 10:28 ` Richard Purdie 0 siblings, 1 reply; 4+ messages in thread From: Stefano Babic @ 2020-07-30 8:34 UTC (permalink / raw) To: Zheng Ruoqin, swupdate; +Cc: yocto, Richard Purdie Hi Zheng, I do not discuss abot the correctness of these patches (that I will aplly to meta-swupdate, -master), but about mtd-utils version (for this I pick up Richard in CC). There were in last month more breakage around mtd-utils due to patches (required !) that are applied to an undefined (from recipe) version of mtd-utils. In fact, we have mtd-utils_git.bb in poky, and as "git" version, the expectation is that it points to TOT. But this is not the case, and meta-<layers> outside poky just add some patches to a not well defined version. Should we also replace mtd-utils_git.bb with a more precise mtd-utils_2.1.2.bb ? Regards, Stefano On 30.07.20 03:18, Zheng Ruoqin wrote: > files/0001-libubigen-remove-unnecessary-include.patch > files/0002-libubi-remove-private-kernel-header-from-includes.patch > Removed since these are included in 2.1.2. > > Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>/ > --- > ...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 61e1380..0000000 > --- 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 <bastiangermann@fishpost.de> > -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 <bastiangermann@fishpost.de> > -Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at> > ---- > - 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 <stdint.h> > --#include <mtd/ubi-media.h> > - > - #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 7ca79b2..0000000 > --- 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 <bastiangermann@fishpost.de> > -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 <bastiangermann@fishpost.de> > -Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at> > ---- > - 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 <ctype.h> > - #include <stdint.h> > - #include <mtd/ubi-user.h> > --#include <mtd/ubi-media.h> > - > - #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 <getopt.h> > - #include <fcntl.h> > - > -+#include <mtd/ubi-media.h> > - #include <libubi.h> > - #include <libmtd.h> > - #include <libscan.h> > --- > -2.25.1 > - > diff --git a/recipes-devtools/mtd/mtd-utils_%.bbappend b/recipes-devtools/mtd/mtd-utils_%.bbappend > index 72cc858..471c8ad 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}/ > -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de ===================================================================== ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [swupdate] [meta-swupdate][PATCH] mtd-utils: Remove patchs 2020-07-30 8:34 ` [swupdate] " Stefano Babic @ 2020-07-30 10:28 ` Richard Purdie 2020-07-30 10:40 ` [yocto] " Stefano Babic 0 siblings, 1 reply; 4+ messages in thread From: Richard Purdie @ 2020-07-30 10:28 UTC (permalink / raw) To: Stefano Babic, Zheng Ruoqin, swupdate; +Cc: yocto On Thu, 2020-07-30 at 10:34 +0200, Stefano Babic wrote: > Hi Zheng, > > I do not discuss abot the correctness of these patches (that I will > aplly to meta-swupdate, -master), but about mtd-utils version (for > this I pick up Richard in CC). There were in last month more breakage > around mtd-utils due to patches (required !) that are applied to an > undefined (from recipe) version of mtd-utils. > > In fact, we have mtd-utils_git.bb in poky, and as "git" version, the > expectation is that it points to TOT. But this is not the case, and > meta-<layers> outside poky just add some patches to a not well > defined version. > > Should we also replace mtd-utils_git.bb with a more precise > mtd-utils_2.1.2.bb ? Adding patches in bbappends is always going to be high maintenance. Are these patches swupdate specific? The recipes use "git" in the filename and then set a sepcific SRCREV and set PV correctly. This is an accepted behaviour. I can see how renaming the recipe would also help for certain usecases but both are really correct for different reasons. I'd also note that git versions in oe-core are always locked down to something and that something is therefore likely not to be TOT as they don't get updated frequently enough. Cheers, Richard ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [yocto] [swupdate] [meta-swupdate][PATCH] mtd-utils: Remove patchs 2020-07-30 10:28 ` Richard Purdie @ 2020-07-30 10:40 ` Stefano Babic 0 siblings, 0 replies; 4+ messages in thread From: Stefano Babic @ 2020-07-30 10:40 UTC (permalink / raw) To: Richard Purdie, Stefano Babic, Zheng Ruoqin, swupdate; +Cc: yocto Hi Richard, On 30.07.20 12:28, Richard Purdie wrote: > On Thu, 2020-07-30 at 10:34 +0200, Stefano Babic wrote: >> Hi Zheng, >> >> I do not discuss abot the correctness of these patches (that I will >> aplly to meta-swupdate, -master), but about mtd-utils version (for >> this I pick up Richard in CC). There were in last month more breakage >> around mtd-utils due to patches (required !) that are applied to an >> undefined (from recipe) version of mtd-utils. >> >> In fact, we have mtd-utils_git.bb in poky, and as "git" version, the >> expectation is that it points to TOT. But this is not the case, and >> meta-<layers> outside poky just add some patches to a not well >> defined version. >> >> Should we also replace mtd-utils_git.bb with a more precise >> mtd-utils_2.1.2.bb ? > > Adding patches in bbappends is always going to be high maintenance. Are > these patches swupdate specific? > Yes, they are. My question was related to mtd recipe in OE-Core. > The recipes use "git" in the filename and then set a sepcific SRCREV > and set PV correctly. This is an accepted behaviour. I can see how > renaming the recipe would also help for certain usecases but both are > really correct for different reasons. Agree both are correct, but as you said, it can be more messy to maintain in external layers if it is not possible to identify a specific version, > > I'd also note that git versions in oe-core are always locked down to > something and that something is therefore likely not to be TOT as they > don't get updated frequently enough. ok, fine. Regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de ===================================================================== ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-07-30 10:41 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-07-30 1:18 [meta-swupdate][PATCH] mtd-utils: Remove patchs zhengruoqin 2020-07-30 8:34 ` [swupdate] " Stefano Babic 2020-07-30 10:28 ` Richard Purdie 2020-07-30 10:40 ` [yocto] " Stefano Babic
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.