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

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

[Jan Kiszka]

This widely reverts commit 06f80abcb4e80b800e8fdbf512f2a0ddef51d35a.

We can leave the mainline u-boot recipe change, but the one to the core
is wrong. The interface is that custom u-boot recipes provide stable,
PN-independent targets.

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

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

Re: [PATCH] Revert "u-boot-custom: Use bitbake variables instead of hardcoded values"

[Jan Kiszka]

On 23.11.18 19:29, [ext] Jan Kiszka wrote:
> This widely reverts commit 06f80abcb4e80b800e8fdbf512f2a0ddef51d35a.
> 
> We can leave the mainline u-boot recipe change, but the one to the core

... we can't even do that. Full revert follows, along with patches to restore 
real cleanups.

Jan

> is wrong. The interface is that custom u-boot recipes provide stable,
> PN-independent targets.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>   meta/recipes-bsp/u-boot/files/debian/control | 6 +++---
>   meta/recipes-bsp/u-boot/u-boot-custom.inc    | 2 +-
>   2 files changed, 4 insertions(+), 4 deletions(-)
> 
> 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
>   
> 
-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux