[meta-swupdate][PATCH] update SRC_URI | fix mtd broken build

[llewellyn-evo]

Signed-off-by: llewellyn-evo <llewellyn...@evologics.de>
---
recipes-devtools/mtd/mtd-utils_%.bbappend | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/recipes-devtools/mtd/mtd-utils_%.bbappend b/recipes-devtools/mtd/mtd-utils_%.bbappend
index aad5e79..dc10170 100644
--- a/recipes-devtools/mtd/mtd-utils_%.bbappend
+++ b/recipes-devtools/mtd/mtd-utils_%.bbappend
@@ -3,6 +3,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILES_${PN}-staticdev += "ubi-utils/libubi.a ${libdir}/*.a"

SRCREV = "7b986779342021bda87c04da3bf729718736d8ab"
+
+SRC_URI = "git://git.infradead.org/mtd-utils.git \
+ file://add-exclusion-to-mkfs-jffs2-git-2.patch \
+ "
+
PV = "2.1.2"

PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd"
--
2.25.1

[Stefano Babic]

Hi Llewellyn.


On 14.12.20 18:12, llewellyn-evo wrote:
> Signed-off-by: llewellyn-evo <llewellyn...@evologics.de>
> ---

ok, but which is the issue or why is broken ?

That mtd-utils in thud is then too old, it is clear. It is arguable if
this must be solved in meta-swupdate. But let's say we want to fix in
meta-swupdate. Why do you update SRC_URI ?

> recipes-devtools/mtd/mtd-utils_%.bbappend | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/recipes-devtools/mtd/mtd-utils_%.bbappend b/recipes-devtools/mtd/mtd-utils_%.bbappend
> index aad5e79..dc10170 100644
> --- a/recipes-devtools/mtd/mtd-utils_%.bbappend
> +++ b/recipes-devtools/mtd/mtd-utils_%.bbappend
> @@ -3,6 +3,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
> FILES_${PN}-staticdev += "ubi-utils/libubi.a ${libdir}/*.a"
>
> SRCREV = "7b986779342021bda87c04da3bf729718736d8ab"
> +
> +SRC_URI = "git://git.infradead.org/mtd-utils.git \
> + file://add-exclusion-to-mkfs-jffs2-git-2.patch \

^==> this is in OE, not in meta-swupdate

Then it is not the best to reference a patch here that is really in a a
different layer (OE-Core / poky).

Fix should be :

SRC_URI_remove =
"file://0001-Revert-Return-correct-error-number-in-ubi_get_vol_in.patch"

Because it is the last one causing the problem (already merged into
mtd-utils).

Best regards,
Stefano Babic

> + "
> +
> PV = "2.1.2"
>
> PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd"
>


--

=====================================================================
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: sba...@denx.de
=====================================================================

[Llewellyn Fernandes]

Hi stefano

In thud the version used is 2.0.2

Which is updated to 2.1.2 in meta-swupdate

This creates a conflicting patch present in SRC_URI

file://0001-Revert-Return-correct-error-number-in-ubi_get_vol_in.patch

Which can be solved either using SRC_URI_ remove or redefining SRC_URI in meta-swupdate

I was not sure of which way would be better. 

Regards

Llewellyn Fernandes

Get BlueMail for Android

[Stefano Babic]

On 14.12.20 17:52, Llewellyn Fernandes wrote:
> Hi stefano
>
> In thud the version used is 2.0.2
>
> Which is updated to 2.1.2 in meta-swupdate
> This creates a conflicting patch present in SRC_URI
> file://0001-Revert-Return-correct-error-number-in-ubi_get_vol_in.patch

Yes, I know.

>
> Which can be solved either using SRC_URI_ remove or redefining SRC_URI
> in meta-swupdate

I prefer to not overwrite the original SRC_URI, so please send an
updated patch with the _remove variant.

Best regards,
Stefano Babic

>
> I was not sure of which way would be better. 
>
> Regards
> Llewellyn Fernandes
>

> Get BlueMail for Android <http://www.bluemail.me/r?b=16117>

> On Dec 14, 2020, at 17:35, Stefano Babic <sba...@denx.de

> <mailto:sba...@denx.de>> wrote:
>
> Hi Llewellyn.
>
>
> On 14.12.20 18:12, llewellyn-evo wrote:
>
> Signed-off-by: llewellyn-evo <llewellyn...@evologics.de>
> ---
>
>
> ok, but which is the issue or why is broken ?
>
> That mtd-utils in thud is then too old, it is clear. It is arguable if
> this must be solved in meta-swupdate. But let's say we want to fix in
> meta-swupdate. Why do you update SRC_URI ?
>
> recipes-devtools/mtd/mtd-utils_%.bbappend | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/recipes-devtools/mtd/mtd-utils_%.bbappend
> b/recipes-devtools/mtd/mtd-utils_%.bbappend
> index aad5e79..dc10170 100644
> --- a/recipes-devtools/mtd/mtd-utils_%.bbappend
> +++ b/recipes-devtools/mtd/mtd-utils_%.bbappend
> @@ -3,6 +3,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
> FILES_${PN}-staticdev += "ubi-utils/libubi.a ${libdir}/*.a"
>
> SRCREV = "7b986779342021bda87c04da3bf729718736d8ab"
> +
> +SRC_URI = "git://git.infradead.org/mtd-utils.git

> <http://git.infradead.org/mtd-utils.git> \

> + file://add-exclusion-to-mkfs-jffs2-git-2.patch \
>
> ^==> this is in OE, not in meta-swupdate
>
> Then it is not the best to reference a patch here that is really in a a
> different layer (OE-Core / poky).
>
> Fix should be :
>
> SRC_URI_remove =
> "file://0001-Revert-Return-correct-error-number-in-ubi_get_vol_in.patch"
>
> Because it is the last one causing the problem (already merged into
> mtd-utils).
>
> Best regards,
> Stefano Babic
>
> + "
> +
> PV = "2.1.2"
>
> PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd"
>
>

> --
> You received this message because you are subscribed to the Google
> Groups "swupdate" group.
> To unsubscribe from this group and stop receiving emails from it, send
> an email to swupdate+u...@googlegroups.com
> <mailto:swupdate+u...@googlegroups.com>.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/swupdate/03b04830-14c5-4761-9a7a-1b6cd28bbef3%40evologics.de
> <https://groups.google.com/d/msgid/swupdate/03b04830-14c5-4761-9a7a-1b6cd28bbef3%40evologics.de?utm_medium=email&utm_source=footer>.