[PATCH v2 0/3] u-boot regression fix, cleanup restoration

[PATCH v2 0/3] u-boot regression fix, cleanup restoration

[Jan Kiszka]

See patches for details.

Urgent for downstream layers with multiple custom u-boot recipes.

Jan Kiszka (3):
  Revert "u-boot-custom: Use bitbake variables instead of hardcoded
    values"
  meta-isar: u-boot: Encode version in URL via PV
  u-boot-custom: Add -dev package to PROVIDES

 meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb | 2 +-
 meta/recipes-bsp/u-boot/files/debian/control   | 6 +++---
 meta/recipes-bsp/u-boot/u-boot-custom.inc      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

-- 
2.16.4

[PATCH v2 1/3] Revert "u-boot-custom: Use bitbake variables instead of hardcoded values"

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

This reverts commit 06f80abcb4e80b800e8fdbf512f2a0ddef51d35a.

This was wrong. The interface is that custom u-boot recipes provide
PN-independent (but MACHINE-dependent) targets. We will sort out
possible cleanups on top.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb | 2 +-
 meta/recipes-bsp/u-boot/files/debian/control   | 6 +++---
 meta/recipes-bsp/u-boot/u-boot-custom.inc      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb b/meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb
index 4ac0a5e..e0f756c 100644
--- a/meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb
+++ b/meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb
@@ -6,6 +6,6 @@
 require recipes-bsp/u-boot/u-boot-custom.inc
 
 SRC_URI += " \
-    ftp://ftp.denx.de/pub/${PN}/${P}.tar.bz2 \
+    ftp://ftp.denx.de/pub/u-boot/u-boot-2018.09.tar.bz2 \
     "
 SRC_URI[sha256sum] = "839bf23cfe8ce613a77e583a60375179d0ad324e92c82fbdd07bebf0fd142268"
diff --git a/meta/recipes-bsp/u-boot/files/debian/control b/meta/recipes-bsp/u-boot/files/debian/control
index e0ea3eb..6b4c839 100644
--- a/meta/recipes-bsp/u-boot/files/debian/control
+++ b/meta/recipes-bsp/u-boot/files/debian/control
@@ -5,15 +5,15 @@ Standards-Version: 3.9.6
 Build-Depends: @BUILD_DEPENDS@
 Maintainer: ISAR project <isar-users@googlegroups.com>
 
-Package: @PN@-@MACHINE@
+Package: u-boot-@MACHINE@
 Architecture: @DISTRO_ARCH@
 Description: @DESCRIPTION@, bootloader binaries
 
-Package: @PN@-@MACHINE@-dev
+Package: u-boot-@MACHINE@-dev
 Architecture: @DISTRO_ARCH@
 Description: @DESCRIPTION@, bootloader libraries
 
-Package: @PN@-tools
+Package: u-boot-tools
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: @DESCRIPTION@, companion tools
diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
index 4ec37d0..583cd47 100644
--- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
@@ -9,7 +9,7 @@ FILESPATH =. "${LAYERDIR_core}/recipes-bsp/u-boot/files:"
 
 DESCRIPTION ?= "Custom U-Boot"
 
-PROVIDES += "${PN}-${MACHINE} ${PN}-${MACHINE}-dev ${PN}-tools"
+PROVIDES += "u-boot-${MACHINE} u-boot-tools"
 
 inherit dpkg
 
-- 
2.16.4

[PATCH v2 2/3] meta-isar: u-boot: Encode version in URL via PV

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb b/meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb
index e0f756c..fe00b73 100644
--- a/meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb
+++ b/meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb
@@ -6,6 +6,6 @@
 require recipes-bsp/u-boot/u-boot-custom.inc
 
 SRC_URI += " \
-    ftp://ftp.denx.de/pub/u-boot/u-boot-2018.09.tar.bz2 \
+    ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
     "
 SRC_URI[sha256sum] = "839bf23cfe8ce613a77e583a60375179d0ad324e92c82fbdd07bebf0fd142268"
-- 
2.16.4

[PATCH v2 3/3] u-boot-custom: Add -dev package to PROVIDES

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/recipes-bsp/u-boot/u-boot-custom.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
index 583cd47..4b38c88 100644
--- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
@@ -9,7 +9,7 @@ FILESPATH =. "${LAYERDIR_core}/recipes-bsp/u-boot/files:"
 
 DESCRIPTION ?= "Custom U-Boot"
 
-PROVIDES += "u-boot-${MACHINE} u-boot-tools"
+PROVIDES += "u-boot-${MACHINE} u-boot-${MACHINE}-dev u-boot-tools"
 
 inherit dpkg
 
-- 
2.16.4

Re: [PATCH v2 0/3] u-boot regression fix, cleanup restoration

[Henning Schild]

Did you try putting MACHINE into PV and pinning on that? It is always
the same package and multiple versions are .... multiple versions.

Henning

Am Fri, 23 Nov 2018 20:09:44 +0100
schrieb Jan Kiszka <jan.kiszka@siemens.com>:

> See patches for details.
> 
> Urgent for downstream layers with multiple custom u-boot recipes.
> 
> Jan Kiszka (3):
>   Revert "u-boot-custom: Use bitbake variables instead of hardcoded
>     values"
>   meta-isar: u-boot: Encode version in URL via PV
>   u-boot-custom: Add -dev package to PROVIDES
> 
>  meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb | 2 +-
>  meta/recipes-bsp/u-boot/files/debian/control   | 6 +++---
>  meta/recipes-bsp/u-boot/u-boot-custom.inc      | 2 +-
>  3 files changed, 5 insertions(+), 5 deletions(-)
> 

Re: [PATCH v2 0/3] u-boot regression fix, cleanup restoration

[Jan Kiszka]

On 26.11.18 10:47, Henning Schild wrote:
> Did you try putting MACHINE into PV and pinning on that? It is always
> the same package and multiple versions are .... multiple versions.

That won't fly. We want recipes to generate results that be be exchanged 
(u-boot-myboard either from u-boot mainline or from some vendor recipe).

Jan

> 
> Henning
> 
> Am Fri, 23 Nov 2018 20:09:44 +0100
> schrieb Jan Kiszka <jan.kiszka@siemens.com>:
> 
>> See patches for details.
>>
>> Urgent for downstream layers with multiple custom u-boot recipes.
>>
>> Jan Kiszka (3):
>>    Revert "u-boot-custom: Use bitbake variables instead of hardcoded
>>      values"
>>    meta-isar: u-boot: Encode version in URL via PV
>>    u-boot-custom: Add -dev package to PROVIDES
>>
>>   meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb | 2 +-
>>   meta/recipes-bsp/u-boot/files/debian/control   | 6 +++---
>>   meta/recipes-bsp/u-boot/u-boot-custom.inc      | 2 +-
>>   3 files changed, 5 insertions(+), 5 deletions(-)
>>
> 

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

Re: [PATCH v2 0/3] u-boot regression fix, cleanup restoration

[Henning Schild]

Am Mon, 26 Nov 2018 10:49:53 +0100
schrieb Jan Kiszka <jan.kiszka@siemens.com>:

> On 26.11.18 10:47, Henning Schild wrote:
> > Did you try putting MACHINE into PV and pinning on that? It is
> > always the same package and multiple versions are .... multiple
> > versions.  
> 
> That won't fly. We want recipes to generate results that be be
> exchanged (u-boot-myboard either from u-boot mainline or from some
> vendor recipe).

Could you explain the problem in more detail? I do not understand the
issue yet. I know the pattern comes from multiconfig conflicts you have
found in jailhouse-images ... but messing with PN at runtime just
sounds like a very bad idea. I am not surprised that uncovered a
bitbake bug ....

Henning

> Jan
> 
> > 
> > Henning
> > 
> > Am Fri, 23 Nov 2018 20:09:44 +0100
> > schrieb Jan Kiszka <jan.kiszka@siemens.com>:
> >   
> >> See patches for details.
> >>
> >> Urgent for downstream layers with multiple custom u-boot recipes.
> >>
> >> Jan Kiszka (3):
> >>    Revert "u-boot-custom: Use bitbake variables instead of
> >> hardcoded values"
> >>    meta-isar: u-boot: Encode version in URL via PV
> >>    u-boot-custom: Add -dev package to PROVIDES
> >>
> >>   meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb | 2 +-
> >>   meta/recipes-bsp/u-boot/files/debian/control   | 6 +++---
> >>   meta/recipes-bsp/u-boot/u-boot-custom.inc      | 2 +-
> >>   3 files changed, 5 insertions(+), 5 deletions(-)
> >>  
> >   
> 

Re: [PATCH v2 0/3] u-boot regression fix, cleanup restoration

[Jan Kiszka]

On 26.11.18 11:16, Henning Schild wrote:
> Am Mon, 26 Nov 2018 10:49:53 +0100
> schrieb Jan Kiszka <jan.kiszka@siemens.com>:
> 
>> On 26.11.18 10:47, Henning Schild wrote:
>>> Did you try putting MACHINE into PV and pinning on that? It is
>>> always the same package and multiple versions are .... multiple
>>> versions.
>>
>> That won't fly. We want recipes to generate results that be be
>> exchanged (u-boot-myboard either from u-boot mainline or from some
>> vendor recipe).
> 
> Could you explain the problem in more detail? I do not understand the
> issue yet. I know the pattern comes from multiconfig conflicts you have
> found in jailhouse-images ... but messing with PN at runtime just
> sounds like a very bad idea. I am not surprised that uncovered a
> bitbake bug ....

This recipe is not messing with PN, neither before not after your patch. It is 
just defining its output package names independently of the PN. E.g., we have 
u-boot_xxx.bb as recipe to build packages from upstream U-Boot sources. Those 
shall carry the same, stable names as package built by some 
u-boot-downstream_xxx.bb which use a downstream source repo. That allows to 
switch providers by just defining PREFERRED_PROVIDER_u-boot-<machine>. Your 
patch would enforce to change also all recipes that pull that target. That's not 
desirable (and broke jailhouse-images as a pioneer user).

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

Re: [PATCH v2 0/3] u-boot regression fix, cleanup restoration

[Maxim Yu. Osipov]

On 11/23/18 10:09 PM, Jan Kiszka wrote:
> See patches for details.
> 
> Urgent for downstream layers with multiple custom u-boot recipes.

Applied to the 'next'.

Thanks,
Maxim.

> Jan Kiszka (3):
>    Revert "u-boot-custom: Use bitbake variables instead of hardcoded
>      values"
>    meta-isar: u-boot: Encode version in URL via PV
>    u-boot-custom: Add -dev package to PROVIDES
> 
>   meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb | 2 +-
>   meta/recipes-bsp/u-boot/files/debian/control   | 6 +++---
>   meta/recipes-bsp/u-boot/u-boot-custom.inc      | 2 +-
>   3 files changed, 5 insertions(+), 5 deletions(-)
> 


-- 
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov

Re: [PATCH v2 0/3] u-boot regression fix, cleanup restoration

[Henning Schild]

Am Mon, 26 Nov 2018 12:08:47 +0100
schrieb Jan Kiszka <jan.kiszka@siemens.com>:

> On 26.11.18 11:16, Henning Schild wrote:
> > Am Mon, 26 Nov 2018 10:49:53 +0100
> > schrieb Jan Kiszka <jan.kiszka@siemens.com>:
> >   
> >> On 26.11.18 10:47, Henning Schild wrote:  
> >>> Did you try putting MACHINE into PV and pinning on that? It is
> >>> always the same package and multiple versions are .... multiple
> >>> versions.  
> >>
> >> That won't fly. We want recipes to generate results that be be
> >> exchanged (u-boot-myboard either from u-boot mainline or from some
> >> vendor recipe).  
> > 
> > Could you explain the problem in more detail? I do not understand
> > the issue yet. I know the pattern comes from multiconfig conflicts
> > you have found in jailhouse-images ... but messing with PN at
> > runtime just sounds like a very bad idea. I am not surprised that
> > uncovered a bitbake bug ....  
> 
> This recipe is not messing with PN, neither before not after your
> patch. It is just defining its output package names independently of
> the PN. E.g., we have u-boot_xxx.bb as recipe to build packages from
> upstream U-Boot sources. Those shall carry the same, stable names as
> package built by some u-boot-downstream_xxx.bb which use a downstream
> source repo. That allows to switch providers by just defining
> PREFERRED_PROVIDER_u-boot-<machine>. Your patch would enforce to
> change also all recipes that pull that target. That's not desirable
> (and broke jailhouse-images as a pioneer user).

I still did not get all of it but the kernel is actually an example of
debian doing the same upstream. They add configuration strings to the
package name and do not distinguish multiple kernels by package version.
So i guess it is fair to do the same for the bootloader.

Henning

> Jan
> 

Re: [PATCH v2 0/3] u-boot regression fix, cleanup restoration

[Henning Schild]

Am Mon, 26 Nov 2018 12:08:47 +0100
schrieb Jan Kiszka <jan.kiszka@siemens.com>:

> On 26.11.18 11:16, Henning Schild wrote:
> > Am Mon, 26 Nov 2018 10:49:53 +0100
> > schrieb Jan Kiszka <jan.kiszka@siemens.com>:
> >   
> >> On 26.11.18 10:47, Henning Schild wrote:  
> >>> Did you try putting MACHINE into PV and pinning on that? It is
> >>> always the same package and multiple versions are .... multiple
> >>> versions.  
> >>
> >> That won't fly. We want recipes to generate results that be be
> >> exchanged (u-boot-myboard either from u-boot mainline or from some
> >> vendor recipe).  
> > 
> > Could you explain the problem in more detail? I do not understand
> > the issue yet. I know the pattern comes from multiconfig conflicts
> > you have found in jailhouse-images ... but messing with PN at
> > runtime just sounds like a very bad idea. I am not surprised that
> > uncovered a bitbake bug ....  
> 
> This recipe is not messing with PN, neither before not after your
> patch. It is just defining its output package names independently of
> the PN. E.g., we have u-boot_xxx.bb as recipe to build packages from
> upstream U-Boot sources. Those shall carry the same, stable names as
> package built by some u-boot-downstream_xxx.bb which use a downstream
> source repo. That allows to switch providers by just defining
> PREFERRED_PROVIDER_u-boot-<machine>. Your patch would enforce to
> change also all recipes that pull that target. That's not desirable
> (and broke jailhouse-images as a pioneer user).

Still one question left, because you reverted the PN in the control
file.

If you have u-boot-foo and u-boot-bar we are sure they can always share
u-boot-dev again? I think we would need u-boot-(foo|bar)-dev and
friends as well.

Henning

> Jan
>