[meta-arm] arm-bsp: Fix gem5 build break

Submitted by Jon Mason on June 11, 2020, 12:48 p.m. | Patch ID: 173475

Details

Message ID 20200611124826.29927-1-jon.mason@arm.com
State New
Headers show

Commit Message

Jon Mason June 11, 2020, 12:48 p.m.
OE-core removed DEPLOY_DIR_TOOLS, which is causing a build break on gem5
due to DEPLOY_DIR_TOOLS usage.  Temporarily define it in the recipe to
get it working.

Change-Id: I8d4d6e73009cab8ad7102045b855afcad34d3bf3
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm-bsp/conf/machine/gem5-arm64.conf | 2 ++
 1 file changed, 2 insertions(+)

Patch hide | download patch | download mbox

diff --git a/meta-arm-bsp/conf/machine/gem5-arm64.conf b/meta-arm-bsp/conf/machine/gem5-arm64.conf
index 4db86c9..fc31bcf 100644
--- a/meta-arm-bsp/conf/machine/gem5-arm64.conf
+++ b/meta-arm-bsp/conf/machine/gem5-arm64.conf
@@ -51,3 +51,5 @@  EXTRA_IMAGEDEPENDS += "gem5-aarch64-native"
 # rngd (Part of rng-tools) takes ~7 mins to init resulting in a slow boot time.
 PACKAGE_EXCLUDE_append = " rng-tools"
 IMAGE_INSTALL_append = " haveged"
+
+DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"

Comments

Diego Sueiro June 11, 2020, 1:18 p.m.
On Thu, Jun 11, 2020 at 01:48 PM, Jon Mason wrote:

>
> OE-core removed DEPLOY_DIR_TOOLS, which is causing a build break on gem5
> due to DEPLOY_DIR_TOOLS usage.  Temporarily define it in the recipe to
> get it working.
> 
> Change-Id: I8d4d6e73009cab8ad7102045b855afcad34d3bf3
> Signed-off-by: Jon Mason <jon.mason@arm.com>

Reviewed-by: Diego Sueiro <diego.sueiro@arm.com>

> ---
>  meta-arm-bsp/conf/machine/gem5-arm64.conf | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta-arm-bsp/conf/machine/gem5-arm64.conf
> b/meta-arm-bsp/conf/machine/gem5-arm64.conf
> index 4db86c9..fc31bcf 100644
> --- a/meta-arm-bsp/conf/machine/gem5-arm64.conf
> +++ b/meta-arm-bsp/conf/machine/gem5-arm64.conf
> @@ -51,3 +51,5 @@ EXTRA_IMAGEDEPENDS += "gem5-aarch64-native"
>  # rngd (Part of rng-tools) takes ~7 mins to init resulting in a slow boot
> time.
>  PACKAGE_EXCLUDE_append = " rng-tools"
>  IMAGE_INSTALL_append = " haveged"
> +
> +DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
> -- 
> 2.17.1
> 
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#609): https://lists.yoctoproject.org/g/meta-arm/message/609
Mute This Topic: https://lists.yoctoproject.org/mt/74817408/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Denys Dmytriyenko June 11, 2020, 5:36 p.m.
On Thu, Jun 11, 2020 at 08:48:26AM -0400, Jon Mason wrote:
> OE-core removed DEPLOY_DIR_TOOLS, which is causing a build break on gem5
> due to DEPLOY_DIR_TOOLS usage.  Temporarily define it in the recipe to
> get it working.

It's coming back, it's in master-next of OE-Core now:
https://git.openembedded.org/openembedded-core/commit/?h=master-next&id=6a6cb9bcf97dfad636ab782c1d337003a9118a82


> Change-Id: I8d4d6e73009cab8ad7102045b855afcad34d3bf3
> Signed-off-by: Jon Mason <jon.mason@arm.com>
> ---
>  meta-arm-bsp/conf/machine/gem5-arm64.conf | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta-arm-bsp/conf/machine/gem5-arm64.conf b/meta-arm-bsp/conf/machine/gem5-arm64.conf
> index 4db86c9..fc31bcf 100644
> --- a/meta-arm-bsp/conf/machine/gem5-arm64.conf
> +++ b/meta-arm-bsp/conf/machine/gem5-arm64.conf
> @@ -51,3 +51,5 @@ EXTRA_IMAGEDEPENDS += "gem5-aarch64-native"
>  # rngd (Part of rng-tools) takes ~7 mins to init resulting in a slow boot time.
>  PACKAGE_EXCLUDE_append = " rng-tools"
>  IMAGE_INSTALL_append = " haveged"
> +
> +DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
> -- 
> 2.17.1
> 

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#624): https://lists.yoctoproject.org/g/meta-arm/message/624
Mute This Topic: https://lists.yoctoproject.org/mt/74817408/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Jon Mason June 12, 2020, 12:43 p.m.
On Thu, Jun 11, 2020 at 01:36:20PM -0400, Denys Dmytriyenko wrote:
> On Thu, Jun 11, 2020 at 08:48:26AM -0400, Jon Mason wrote:
> > OE-core removed DEPLOY_DIR_TOOLS, which is causing a build break on gem5
> > due to DEPLOY_DIR_TOOLS usage.  Temporarily define it in the recipe to
> > get it working.
> 
> It's coming back, it's in master-next of OE-Core now:
> https://git.openembedded.org/openembedded-core/commit/?h=master-next&id=6a6cb9bcf97dfad636ab782c1d337003a9118a82

Alright.  I'd prefer to wait rather than apply and revert.  So,
dropping this patch.

Thanks,
Jon

> 
> 
> > Change-Id: I8d4d6e73009cab8ad7102045b855afcad34d3bf3
> > Signed-off-by: Jon Mason <jon.mason@arm.com>
> > ---
> >  meta-arm-bsp/conf/machine/gem5-arm64.conf | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/meta-arm-bsp/conf/machine/gem5-arm64.conf b/meta-arm-bsp/conf/machine/gem5-arm64.conf
> > index 4db86c9..fc31bcf 100644
> > --- a/meta-arm-bsp/conf/machine/gem5-arm64.conf
> > +++ b/meta-arm-bsp/conf/machine/gem5-arm64.conf
> > @@ -51,3 +51,5 @@ EXTRA_IMAGEDEPENDS += "gem5-aarch64-native"
> >  # rngd (Part of rng-tools) takes ~7 mins to init resulting in a slow boot time.
> >  PACKAGE_EXCLUDE_append = " rng-tools"
> >  IMAGE_INSTALL_append = " haveged"
> > +
> > +DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
> > -- 
> > 2.17.1
> > 
> 
> > 
> 

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#648): https://lists.yoctoproject.org/g/meta-arm/message/648
Mute This Topic: https://lists.yoctoproject.org/mt/74817408/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Denys Dmytriyenko June 12, 2020, 5:41 p.m.
On Fri, Jun 12, 2020 at 08:43:08AM -0400, Jon Mason wrote:
> On Thu, Jun 11, 2020 at 01:36:20PM -0400, Denys Dmytriyenko wrote:
> > On Thu, Jun 11, 2020 at 08:48:26AM -0400, Jon Mason wrote:
> > > OE-core removed DEPLOY_DIR_TOOLS, which is causing a build break on gem5
> > > due to DEPLOY_DIR_TOOLS usage.  Temporarily define it in the recipe to
> > > get it working.
> > 
> > It's coming back, it's in master-next of OE-Core now:
> > https://git.openembedded.org/openembedded-core/commit/?h=master-next&id=6a6cb9bcf97dfad636ab782c1d337003a9118a82
> 
> Alright.  I'd prefer to wait rather than apply and revert.  So,
> dropping this patch.

Yes, it's in master as of this morning.