[meta-swupdate] mtd-utils: Remove patchs

Submitted by Zheng Ruoqin on July 30, 2020, 1:18 a.m. | Patch ID: 174891

Details

Message ID 1596071889-91188-1-git-send-email-zhengrq.fnst@cn.fujitsu.com
State New
Headers show

Commit Message

Zheng Ruoqin July 30, 2020, 1:18 a.m.
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

Patch hide | download patch | download mbox

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}/

Comments

Stefano Babic July 30, 2020, 8:34 a.m.
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}/
>
Richard Purdie July 30, 2020, 10:28 a.m.
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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#50143): https://lists.yoctoproject.org/g/yocto/message/50143
Mute This Topic: https://lists.yoctoproject.org/mt/75882692/3617530
Group Owner: yocto+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Stefano Babic July 30, 2020, 10:40 a.m.
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