Patchwork Multilib build fixes

login
register
mail settings
Submitter Bogdan Marinescu
Date July 19, 2012, noon
Message ID <1342699213-435-1-git-send-email-bogdan.a.marinescu@intel.com>
Download mbox | patch
Permalink /patch/32505/
State Accepted
Commit 71907775f601f0a48b995cc3277b61645d2e5068
Headers show

Comments

Bogdan Marinescu - July 19, 2012, noon
1. STAGING_KERNEL_DIR was getting an invalid MLPREFIX. Fix this by forcing the expansion in multilib.conf.
2. Added multilib rule for 'perf'.
---
 meta/conf/multilib.conf |    2 ++
 1 file changed, 2 insertions(+)
Saul Wold - July 20, 2012, 4:05 a.m.
On 07/19/2012 05:00 AM, Bogdan Marinescu wrote:
> 1. STAGING_KERNEL_DIR was getting an invalid MLPREFIX. Fix this by forcing the expansion in multilib.conf.
> 2. Added multilib rule for 'perf'.
> ---
>   meta/conf/multilib.conf |    2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
> index bb21815..6a89a53 100644
> --- a/meta/conf/multilib.conf
> +++ b/meta/conf/multilib.conf
> @@ -6,6 +6,7 @@ MULTILIB_SAVE_VARNAME = "DEFAULTTUNE"
>
>   MULTILIBS ??= "multilib:lib32"
>
> +STAGING_KERNEL_DIR := "${STAGING_KERNEL_DIR}"
>   STAGING_DIR_HOST = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"
>   STAGING_DIR_TARGET = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"
>
> @@ -512,6 +513,7 @@ BBCLASSEXTEND_append_pn-pax-utils = " ${MULTILIBS}"
>   BBCLASSEXTEND_append_pn-pciutils = " ${MULTILIBS}"
>   BBCLASSEXTEND_append_pn-pcmanfm = " ${MULTILIBS}"
>   BBCLASSEXTEND_append_pn-pcmciautils = " ${MULTILIBS}"
> +BBCLASSEXTEND_append_pn-perf = " ${MULTILIBS}"
>   BBCLASSEXTEND_append_pn-perl = " ${MULTILIBS}"
>   BBCLASSEXTEND_append_pn-pixman = " ${MULTILIBS}"
>   BBCLASSEXTEND_append_pn-pkgconfig = " ${MULTILIBS}"
>
Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index bb21815..6a89a53 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -6,6 +6,7 @@  MULTILIB_SAVE_VARNAME = "DEFAULTTUNE"
 
 MULTILIBS ??= "multilib:lib32"
 
+STAGING_KERNEL_DIR := "${STAGING_KERNEL_DIR}"
 STAGING_DIR_HOST = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"
 STAGING_DIR_TARGET = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"
 
@@ -512,6 +513,7 @@  BBCLASSEXTEND_append_pn-pax-utils = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-pciutils = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-pcmanfm = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-pcmciautils = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-perf = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-perl = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-pixman = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-pkgconfig = " ${MULTILIBS}"