Skip to contentSkip to conversation

arm-bsp: Fix gem5 build break

PATCH In review Jon Mason 4 participants 5 messages Jun 11, 2020 – Jun 12, 2020

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/1 arm-bsp: Fix gem5 build break

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
---
 meta-arm-bsp/conf/machine/gem5-arm64.conf | 2 ++
 1 file changed, 2 insertions(+)
meta-arm-bsp/conf/machine/gem5-arm64.conf +2 -0
index 4db86c9..fc31bcf 100644
@@ -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"
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Jon Mason

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
Quoted 20 lines
---
 meta-arm-bsp/conf/machine/gem5-arm64.conf | 2 ++
 1 file changed, 2 insertions(+)
meta-arm-bsp/conf/machine/gem5-arm64.conf +0 -0
index 4db86c9..fc31bcf 100644
@@ -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"

meta-arm-bsp/conf/machine/gem5-arm64.conf +2 -0
+
+DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
Signature · 1 line
2.17.1
#2 lore raw
In reply to Jon Mason
Quoted 3 lines · Jon Mason

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

Quoted 21 lines
Change-Id I8d4d6e73009cab8ad7102045b855afcad34d3bf3
---
 meta-arm-bsp/conf/machine/gem5-arm64.conf | 2 ++
 1 file changed, 2 insertions(+)
meta-arm-bsp/conf/machine/gem5-arm64.conf +2 -0
index 4db86c9..fc31bcf 100644
@@ -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"
Signature · 1 line
2.17.1
#3 lore raw
Quoted 7 lines · Denys Dmytriyenko
Quoted 3 lines · Jon Mason

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

Quoted 26 lines
Quoted 23 lines
Change-Id I8d4d6e73009cab8ad7102045b855afcad34d3bf3
---
 meta-arm-bsp/conf/machine/gem5-arm64.conf | 2 ++
 1 file changed, 2 insertions(+)
meta-arm-bsp/conf/machine/gem5-arm64.conf +2 -0
index 4db86c9..fc31bcf 100644
@@ -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"
Signature · 1 line
2.17.1
#4 lore raw
Quoted 11 lines · Jon Mason
Quoted 7 lines · Denys Dmytriyenko
Quoted 3 lines · Jon Mason

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.

Signature · 1 line
Denys