[kirkstone,1/1] mmc-utils: upgrade to latest revision

Message ID 20220515124346.8095-2-liu.ming50@gmail.com
State Accepted, archived
Commit 777121a66faedc5fafbaab55f1bf6b61498aa75a
Headers show
Series Fix a compilation issue of mmc-utils | expand

Commit Message

Ming Liu May 15, 2022, 12:43 p.m. UTC
From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d98b06c9c6f480de1e5167bfe8392e39300fc02c)
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
---
 meta/recipes-devtools/mmc/mmc-utils_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Richard Purdie May 15, 2022, 9:42 p.m. UTC | #1
On Sun, 2022-05-15 at 14:43 +0200, liu.ming50@gmail.com wrote:
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> (cherry picked from commit d98b06c9c6f480de1e5167bfe8392e39300fc02c)
> Signed-off-by: Ming Liu <liu.ming50@gmail.com>
> ---
>  meta/recipes-devtools/mmc/mmc-utils_git.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Why does kirkstone need this though?

Cheers,

Richard
Richard Purdie May 15, 2022, 9:46 p.m. UTC | #2
On Sun, 2022-05-15 at 22:42 +0100, Richard Purdie via
lists.openembedded.org wrote:
> On Sun, 2022-05-15 at 14:43 +0200, liu.ming50@gmail.com wrote:
> > From: Alexander Kanavin <alex.kanavin@gmail.com>
> > 
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > (cherry picked from commit d98b06c9c6f480de1e5167bfe8392e39300fc02c)
> > Signed-off-by: Ming Liu <liu.ming50@gmail.com>
> > ---
> >  meta/recipes-devtools/mmc/mmc-utils_git.bb | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> 
> Why does kirkstone need this though?

Sorry, you cc'd me on the patch but not the cover letter which meant
this sorted badly in my mail folders but I noticed the cover letter
now.

You mention a compile failure in the cover letter, it would probably be
useful to give a little more info about the kind of compile failure
given we've not seen this anywhere else?

Cheers,

Richard
Ming Liu May 16, 2022, 7:17 a.m. UTC | #3
Hi, Richard:

Our products are based on LTS kirkstone, we found a build issue of
mmc-utils, which has been fixed by
https://kernel.googlesource.com/pub/scm/utils/mmc/mmc-utils/+/0d493fb091b592bde6004a618c28f1c3619af1a4

this uplift only involves in two commits including the above fix:

```
b7e4d5a mmc-utils: Add General command CMD56 read support
0d493fb mmc-utils: Fix build error MMC_BLOCK_MAJOR undeclared
```

considering kirkstone mmc-utils recipe fetches mmc-utils master branch and
does not stick to any release tag, so I think we can uplift mmc-utils to
the latest rather than backport that fix to kirkstone.

//Ming Liu


<richard.purdie@linuxfoundation.org> 於 2022年5月15日 週日 下午11:42寫道:

> On Sun, 2022-05-15 at 14:43 +0200, liu.ming50@gmail.com wrote:
> > From: Alexander Kanavin <alex.kanavin@gmail.com>
> >
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > (cherry picked from commit d98b06c9c6f480de1e5167bfe8392e39300fc02c)
> > Signed-off-by: Ming Liu <liu.ming50@gmail.com>
> > ---
> >  meta/recipes-devtools/mmc/mmc-utils_git.bb | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
>
> Why does kirkstone need this though?
>
> Cheers,
>
> Richard
>
Steve Sakoman May 16, 2022, 2:29 p.m. UTC | #4
On Sun, May 15, 2022 at 9:17 PM Ming Liu <liu.ming50@gmail.com> wrote:

> Our products are based on LTS kirkstone, we found a build issue of mmc-utils, which has been fixed by https://kernel.googlesource.com/pub/scm/utils/mmc/mmc-utils/+/0d493fb091b592bde6004a618c28f1c3619af1a4

So this error only occurs if you are using a BSP with a 5.4 kernel?
That would explain why I don't see this in my testing, since it uses
only 5.10 and 5.15

BTW, for future kirkstone patches you should cc me instead of Richard
since I am the kirkstone maintainer.

> this uplift only involves in two commits including the above fix:
>
> ```
> b7e4d5a mmc-utils: Add General command CMD56 read support
> 0d493fb mmc-utils: Fix build error MMC_BLOCK_MAJOR undeclared
> ```
>
> considering kirkstone mmc-utils recipe fetches mmc-utils master branch and does not stick to any release tag, so I think we can uplift mmc-utils to the latest rather than backport that fix to kirkstone.

This seems reasonable to me. I will add this patch to my test queue
and edit the commit message to include the above information.

Steve

> <richard.purdie@linuxfoundation.org> 於 2022年5月15日 週日 下午11:42寫道:
>>
>> On Sun, 2022-05-15 at 14:43 +0200, liu.ming50@gmail.com wrote:
>> > From: Alexander Kanavin <alex.kanavin@gmail.com>
>> >
>> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>> > Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
>> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>> > (cherry picked from commit d98b06c9c6f480de1e5167bfe8392e39300fc02c)
>> > Signed-off-by: Ming Liu <liu.ming50@gmail.com>
>> > ---
>> >  meta/recipes-devtools/mmc/mmc-utils_git.bb | 2 +-
>> >  1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>>
>> Why does kirkstone need this though?
>>
>> Cheers,
>>
>> Richard
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#165665): https://lists.openembedded.org/g/openembedded-core/message/165665
> Mute This Topic: https://lists.openembedded.org/mt/91117508/3620601
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [steve@sakoman.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Ming Liu May 17, 2022, 7:37 a.m. UTC | #5
Yes, this only occurs on 5.4 kernel, will CC to you next time for kirkstone
patches.

//Ming Liu

Steve Sakoman <steve@sakoman.com> 於 2022年5月16日 週一 下午4:29寫道:

> On Sun, May 15, 2022 at 9:17 PM Ming Liu <liu.ming50@gmail.com> wrote:
>
> > Our products are based on LTS kirkstone, we found a build issue of
> mmc-utils, which has been fixed by
> https://kernel.googlesource.com/pub/scm/utils/mmc/mmc-utils/+/0d493fb091b592bde6004a618c28f1c3619af1a4
>
> So this error only occurs if you are using a BSP with a 5.4 kernel?
> That would explain why I don't see this in my testing, since it uses
> only 5.10 and 5.15
>
> BTW, for future kirkstone patches you should cc me instead of Richard
> since I am the kirkstone maintainer.
>
> > this uplift only involves in two commits including the above fix:
> >
> > ```
> > b7e4d5a mmc-utils: Add General command CMD56 read support
> > 0d493fb mmc-utils: Fix build error MMC_BLOCK_MAJOR undeclared
> > ```
> >
> > considering kirkstone mmc-utils recipe fetches mmc-utils master branch
> and does not stick to any release tag, so I think we can uplift mmc-utils
> to the latest rather than backport that fix to kirkstone.
>
> This seems reasonable to me. I will add this patch to my test queue
> and edit the commit message to include the above information.
>
> Steve
>
> > <richard.purdie@linuxfoundation.org> 於 2022年5月15日 週日 下午11:42寫道:
> >>
> >> On Sun, 2022-05-15 at 14:43 +0200, liu.ming50@gmail.com wrote:
> >> > From: Alexander Kanavin <alex.kanavin@gmail.com>
> >> >
> >> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> >> > Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
> >> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> >> > (cherry picked from commit d98b06c9c6f480de1e5167bfe8392e39300fc02c)
> >> > Signed-off-by: Ming Liu <liu.ming50@gmail.com>
> >> > ---
> >> >  meta/recipes-devtools/mmc/mmc-utils_git.bb | 2 +-
> >> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >> >
> >>
> >> Why does kirkstone need this though?
> >>
> >> Cheers,
> >>
> >> Richard
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#165665):
> https://lists.openembedded.org/g/openembedded-core/message/165665
> > Mute This Topic: https://lists.openembedded.org/mt/91117508/3620601
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> steve@sakoman.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>

Patch

diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb
index addefe9abf..3e611d1306 100644
--- a/meta/recipes-devtools/mmc/mmc-utils_git.bb
+++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb
@@ -5,7 +5,7 @@  LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d"
 
 SRCBRANCH ?= "master"
-SRCREV = "4303889c8bd9a2357587eb6ebacecb70098a264d"
+SRCREV = "b7e4d5a6ae9942d26a11de9b05ae7d52c0802802"
 
 PV = "0.1+git${SRCPV}"