All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v2 1/1] package/mmc-utils: bump to version dfc3b6ecda84d21418fb4408b39c5c71db4c6458
@ 2022-10-13  8:57 Sébastien Szymanski
  2022-10-13 17:10 ` Giulio Benetti
  2022-11-02 21:05 ` Thomas Petazzoni via buildroot
  0 siblings, 2 replies; 3+ messages in thread
From: Sébastien Szymanski @ 2022-10-13  8:57 UTC (permalink / raw)
  To: buildroot; +Cc: Giulio Benetti

Drop first patch, upstreamed:
https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/commit/?id=520f54eb94845e597837ae908a03b91ae8c8758f

Depends on kernel headers >= 4.4 for struct mmc_ioc_multi_cmd

Fixes: http://autobuild.buildroot.net/results/01f78081a50743d1faa50a090c00b7e90a17fa39

Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
---

Changes for v2:
 - needs kernel headers >= 4.4

 ...01-mmc_cmds.c-fix-build-with-gcc-4.9.patch | 37 -------------------
 package/mmc-utils/Config.in                   |  6 +--
 package/mmc-utils/mmc-utils.hash              |  4 +-
 package/mmc-utils/mmc-utils.mk                |  2 +-
 4 files changed, 6 insertions(+), 43 deletions(-)
 delete mode 100644 package/mmc-utils/0001-mmc_cmds.c-fix-build-with-gcc-4.9.patch

diff --git a/package/mmc-utils/0001-mmc_cmds.c-fix-build-with-gcc-4.9.patch b/package/mmc-utils/0001-mmc_cmds.c-fix-build-with-gcc-4.9.patch
deleted file mode 100644
index 7725f9ca5e..0000000000
--- a/package/mmc-utils/0001-mmc_cmds.c-fix-build-with-gcc-4.9.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6208cc78f6efd1fafc4f5bc6a487247a383df80f Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sat, 28 Sep 2019 20:44:52 +0200
-Subject: [PATCH] mmc_cmds.c: fix build with gcc 4.9
-
-Fix following error with gcc 4.9:
-
-mmc_cmds.c:1918:9: error: missing braces around initializer [-Werror=missing-braces]
-  struct rpmb_frame frame_status = {0};
-
-Fixes:
- - http://autobuild.buildroot.org/results/bf3b6f9f6ef39b99842b3c92495b7bf359c68158
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: sent to linux-mmc@vger.kernel.org]
----
- mmc_cmds.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/mmc_cmds.c b/mmc_cmds.c
-index fb37189..6b09f26 100644
---- a/mmc_cmds.c
-+++ b/mmc_cmds.c
-@@ -1915,7 +1915,9 @@ static int do_rpmb_op(int fd,
- 	u_int16_t rpmb_type;
- 	struct mmc_ioc_multi_cmd *mioc;
- 	struct mmc_ioc_cmd *ioc;
--	struct rpmb_frame frame_status = {0};
-+	struct rpmb_frame frame_status;
-+
-+	memset(&frame_status, 0, sizeof(frame_status));
- 
- 	if (!frame_in || !frame_out || !out_cnt)
- 		return -EINVAL;
--- 
-2.23.0
-
diff --git a/package/mmc-utils/Config.in b/package/mmc-utils/Config.in
index 850aeac445..ac32ae68bf 100644
--- a/package/mmc-utils/Config.in
+++ b/package/mmc-utils/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_MMC_UTILS
 	bool "mmc-utils"
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4
 	help
 	  MMC utils
 
 	  https://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git
 
-comment "mmc-utils needs a toolchain w/ headers >= 3.0"
-	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+comment "mmc-utils needs a toolchain w/ headers >= 4.4"
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4
diff --git a/package/mmc-utils/mmc-utils.hash b/package/mmc-utils/mmc-utils.hash
index e8b2826612..1256f63487 100644
--- a/package/mmc-utils/mmc-utils.hash
+++ b/package/mmc-utils/mmc-utils.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  ffc8f77233d1bd39ce4ec68835ad94aa6762624e4e96fb60102e87ba82db083e  mmc-utils-d40ec535b9d4e4c974e8c2fbfb422cd0348cc5e8-br1.tar.gz
-sha256  c3165393bcd710624e2909327a6fbeb736c47bdbe66de1c1a364ac7324d3e4d6  mmc.h
+sha256  f6ed1cb2f02d49df4244f8872b47b22780dd634fa19d857298ce1b793752776f  mmc-utils-dfc3b6ecda84d21418fb4408b39c5c71db4c6458-br1.tar.gz
+sha256  f57e3c6169116aa9ff06eec95734ca000e4d0196467bb221e80e50530c768081  mmc.h
diff --git a/package/mmc-utils/mmc-utils.mk b/package/mmc-utils/mmc-utils.mk
index c847378692..bf940967ef 100644
--- a/package/mmc-utils/mmc-utils.mk
+++ b/package/mmc-utils/mmc-utils.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MMC_UTILS_VERSION = d40ec535b9d4e4c974e8c2fbfb422cd0348cc5e8
+MMC_UTILS_VERSION = dfc3b6ecda84d21418fb4408b39c5c71db4c6458
 MMC_UTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git
 MMC_UTILS_SITE_METHOD = git
 MMC_UTILS_LICENSE = GPL-2.0
-- 
2.37.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] package/mmc-utils: bump to version dfc3b6ecda84d21418fb4408b39c5c71db4c6458
  2022-10-13  8:57 [Buildroot] [PATCH v2 1/1] package/mmc-utils: bump to version dfc3b6ecda84d21418fb4408b39c5c71db4c6458 Sébastien Szymanski
@ 2022-10-13 17:10 ` Giulio Benetti
  2022-11-02 21:05 ` Thomas Petazzoni via buildroot
  1 sibling, 0 replies; 3+ messages in thread
From: Giulio Benetti @ 2022-10-13 17:10 UTC (permalink / raw)
  To: Sébastien Szymanski, buildroot

Hi Sébastien,

On 13/10/22 10:57, Sébastien Szymanski wrote:
> Drop first patch, upstreamed:
> https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/commit/?id=520f54eb94845e597837ae908a03b91ae8c8758f
> 
> Depends on kernel headers >= 4.4 for struct mmc_ioc_multi_cmd
> 
> Fixes: http://autobuild.buildroot.net/results/01f78081a50743d1faa50a090c00b7e90a17fa39
> 
> Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>

Reviewed-by: Giulio Benetti <giulio.benetti@benettiengineering.com>

Thank you

Best regards
-- 
Giulio Benetti
Benetti Engineering sas

> ---
> 
> Changes for v2:
>   - needs kernel headers >= 4.4
> 
>   ...01-mmc_cmds.c-fix-build-with-gcc-4.9.patch | 37 -------------------
>   package/mmc-utils/Config.in                   |  6 +--
>   package/mmc-utils/mmc-utils.hash              |  4 +-
>   package/mmc-utils/mmc-utils.mk                |  2 +-
>   4 files changed, 6 insertions(+), 43 deletions(-)
>   delete mode 100644 package/mmc-utils/0001-mmc_cmds.c-fix-build-with-gcc-4.9.patch
> 
> diff --git a/package/mmc-utils/0001-mmc_cmds.c-fix-build-with-gcc-4.9.patch b/package/mmc-utils/0001-mmc_cmds.c-fix-build-with-gcc-4.9.patch
> deleted file mode 100644
> index 7725f9ca5e..0000000000
> --- a/package/mmc-utils/0001-mmc_cmds.c-fix-build-with-gcc-4.9.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -From 6208cc78f6efd1fafc4f5bc6a487247a383df80f Mon Sep 17 00:00:00 2001
> -From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -Date: Sat, 28 Sep 2019 20:44:52 +0200
> -Subject: [PATCH] mmc_cmds.c: fix build with gcc 4.9
> -
> -Fix following error with gcc 4.9:
> -
> -mmc_cmds.c:1918:9: error: missing braces around initializer [-Werror=missing-braces]
> -  struct rpmb_frame frame_status = {0};
> -
> -Fixes:
> - - http://autobuild.buildroot.org/results/bf3b6f9f6ef39b99842b3c92495b7bf359c68158
> -
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -[Upstream status: sent to linux-mmc@vger.kernel.org]
> ----
> - mmc_cmds.c | 4 +++-
> - 1 file changed, 3 insertions(+), 1 deletion(-)
> -
> -diff --git a/mmc_cmds.c b/mmc_cmds.c
> -index fb37189..6b09f26 100644
> ---- a/mmc_cmds.c
> -+++ b/mmc_cmds.c
> -@@ -1915,7 +1915,9 @@ static int do_rpmb_op(int fd,
> - 	u_int16_t rpmb_type;
> - 	struct mmc_ioc_multi_cmd *mioc;
> - 	struct mmc_ioc_cmd *ioc;
> --	struct rpmb_frame frame_status = {0};
> -+	struct rpmb_frame frame_status;
> -+
> -+	memset(&frame_status, 0, sizeof(frame_status));
> -
> - 	if (!frame_in || !frame_out || !out_cnt)
> - 		return -EINVAL;
> ---
> -2.23.0
> -
> diff --git a/package/mmc-utils/Config.in b/package/mmc-utils/Config.in
> index 850aeac445..ac32ae68bf 100644
> --- a/package/mmc-utils/Config.in
> +++ b/package/mmc-utils/Config.in
> @@ -1,10 +1,10 @@
>   config BR2_PACKAGE_MMC_UTILS
>   	bool "mmc-utils"
> -	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
> +	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4
>   	help
>   	  MMC utils
>   
>   	  https://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git
>   
> -comment "mmc-utils needs a toolchain w/ headers >= 3.0"
> -	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
> +comment "mmc-utils needs a toolchain w/ headers >= 4.4"
> +	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4
> diff --git a/package/mmc-utils/mmc-utils.hash b/package/mmc-utils/mmc-utils.hash
> index e8b2826612..1256f63487 100644
> --- a/package/mmc-utils/mmc-utils.hash
> +++ b/package/mmc-utils/mmc-utils.hash
> @@ -1,3 +1,3 @@
>   # Locally computed
> -sha256  ffc8f77233d1bd39ce4ec68835ad94aa6762624e4e96fb60102e87ba82db083e  mmc-utils-d40ec535b9d4e4c974e8c2fbfb422cd0348cc5e8-br1.tar.gz
> -sha256  c3165393bcd710624e2909327a6fbeb736c47bdbe66de1c1a364ac7324d3e4d6  mmc.h
> +sha256  f6ed1cb2f02d49df4244f8872b47b22780dd634fa19d857298ce1b793752776f  mmc-utils-dfc3b6ecda84d21418fb4408b39c5c71db4c6458-br1.tar.gz
> +sha256  f57e3c6169116aa9ff06eec95734ca000e4d0196467bb221e80e50530c768081  mmc.h
> diff --git a/package/mmc-utils/mmc-utils.mk b/package/mmc-utils/mmc-utils.mk
> index c847378692..bf940967ef 100644
> --- a/package/mmc-utils/mmc-utils.mk
> +++ b/package/mmc-utils/mmc-utils.mk
> @@ -4,7 +4,7 @@
>   #
>   ################################################################################
>   
> -MMC_UTILS_VERSION = d40ec535b9d4e4c974e8c2fbfb422cd0348cc5e8
> +MMC_UTILS_VERSION = dfc3b6ecda84d21418fb4408b39c5c71db4c6458
>   MMC_UTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git
>   MMC_UTILS_SITE_METHOD = git
>   MMC_UTILS_LICENSE = GPL-2.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] package/mmc-utils: bump to version dfc3b6ecda84d21418fb4408b39c5c71db4c6458
  2022-10-13  8:57 [Buildroot] [PATCH v2 1/1] package/mmc-utils: bump to version dfc3b6ecda84d21418fb4408b39c5c71db4c6458 Sébastien Szymanski
  2022-10-13 17:10 ` Giulio Benetti
@ 2022-11-02 21:05 ` Thomas Petazzoni via buildroot
  1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-11-02 21:05 UTC (permalink / raw)
  To: Sébastien Szymanski; +Cc: Giulio Benetti, buildroot

On Thu, 13 Oct 2022 10:57:33 +0200
Sébastien Szymanski <sebastien.szymanski@armadeus.com> wrote:

> Drop first patch, upstreamed:
> https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/commit/?id=520f54eb94845e597837ae908a03b91ae8c8758f
> 
> Depends on kernel headers >= 4.4 for struct mmc_ioc_multi_cmd
> 
> Fixes: http://autobuild.buildroot.net/results/01f78081a50743d1faa50a090c00b7e90a17fa39
> 
> Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
> ---

It's a bit annoying to have the dependency bumped to Linux 4.4, as
mmc-utils can potentially be used by people running older kernels. But
well, let's see if people complain about this, so I've applied as-is.
Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-02 21:05 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-13  8:57 [Buildroot] [PATCH v2 1/1] package/mmc-utils: bump to version dfc3b6ecda84d21418fb4408b39c5c71db4c6458 Sébastien Szymanski
2022-10-13 17:10 ` Giulio Benetti
2022-11-02 21:05 ` Thomas Petazzoni via buildroot

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.