Patchwork bitbake.conf: Add PACKAGE_ARCHS to include TUNE_PKGARCH

login
register
mail settings
Submitter Kumar Gala
Date July 28, 2011, 8:46 p.m.
Message ID <1311885993-13462-1-git-send-email-galak@kernel.crashing.org>
Download mbox | patch
Permalink /patch/8819/
State New, archived
Headers show

Comments

Kumar Gala - July 28, 2011, 8:46 p.m.
Recent changes to how TUNE_PKGARCH is composed means it might not be in
the PACKAGE_EXTRA_ARCHS_tune list.  Rather than having to update all
such lists we just add TUNE_PKGARCH to PACKAGE_ARCHS.

An example, for ppc603e TUNE_PKGARCH is now:

	powerpcppc603e

However, PACKAGE_EXTRA_ARCHS_tune-ppc603e = "powerpc ppc603e"

Thus we run into issues during things like rpm packagine since it will
not end up dealing the rpms created in a 'powerpcppc603e' directory.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 meta/conf/bitbake.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Kumar Gala - July 28, 2011, 10:36 p.m.
On Jul 28, 2011, at 3:46 PM, Kumar Gala wrote:

> Recent changes to how TUNE_PKGARCH is composed means it might not be in
> the PACKAGE_EXTRA_ARCHS_tune list.  Rather than having to update all
> such lists we just add TUNE_PKGARCH to PACKAGE_ARCHS.
> 
> An example, for ppc603e TUNE_PKGARCH is now:
> 
> 	powerpcppc603e
> 
> However, PACKAGE_EXTRA_ARCHS_tune-ppc603e = "powerpc ppc603e"
> 
> Thus we run into issues during things like rpm packagine since it will
> not end up dealing the rpms created in a 'powerpcppc603e' directory.
> 
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
> meta/conf/bitbake.conf |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)

Hmm, this does cause some issues like:

ERROR:  Poky's config sanity checker detected a potential misconfiguration.
    Either fix the cause of this error or at your own risk disable the checker (see sanity.conf).
    Following is the list of potential problems / advisories:

    Error, the PACKAGE_ARCHS variable contains duplicates. The following archs are listed more than once: ppc603e
ERROR: Execution of event handler 'check_sanity_eventhandler' failed

- k
Saul Wold - Aug. 2, 2011, 6:09 p.m.
On 07/28/2011 01:46 PM, Kumar Gala wrote:
> Recent changes to how TUNE_PKGARCH is composed means it might not be in
> the PACKAGE_EXTRA_ARCHS_tune list.  Rather than having to update all
> such lists we just add TUNE_PKGARCH to PACKAGE_ARCHS.
>
> An example, for ppc603e TUNE_PKGARCH is now:
>
> 	powerpcppc603e
>
> However, PACKAGE_EXTRA_ARCHS_tune-ppc603e = "powerpc ppc603e"
>
> Thus we run into issues during things like rpm packagine since it will
> not end up dealing the rpms created in a 'powerpcppc603e' directory.
>
> Signed-off-by: Kumar Gala<galak@kernel.crashing.org>
> ---
>   meta/conf/bitbake.conf |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 9c80f11..d8b9f36 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -104,7 +104,7 @@ SDK_CC_ARCH = "${BUILD_CC_ARCH}"
>   PACKAGE_ARCH = "${TUNE_PKGARCH}"
>   MACHINE_ARCH = "${@[bb.data.getVar('TUNE_PKGARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))].replace('-', '_')}"
>   PACKAGE_EXTRA_ARCHS ??= "${PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE}}"
> -PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}"
> +PACKAGE_ARCHS = "all any noarch ${TUNE_PKGARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}"
>   # MACHINE_ARCH shouldn't be included here as a variable dependency
>   # since machine specific packages are handled using multimachine
>   PACKAGE_ARCHS[vardepsexclude] = "MACHINE_ARCH"


Not pulled, this has been fixed in another way

Thanks
	Sau!

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 9c80f11..d8b9f36 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -104,7 +104,7 @@  SDK_CC_ARCH = "${BUILD_CC_ARCH}"
 PACKAGE_ARCH = "${TUNE_PKGARCH}"
 MACHINE_ARCH = "${@[bb.data.getVar('TUNE_PKGARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))].replace('-', '_')}"
 PACKAGE_EXTRA_ARCHS ??= "${PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE}}"
-PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}"
+PACKAGE_ARCHS = "all any noarch ${TUNE_PKGARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}"
 # MACHINE_ARCH shouldn't be included here as a variable dependency
 # since machine specific packages are handled using multimachine
 PACKAGE_ARCHS[vardepsexclude] = "MACHINE_ARCH"