Skip to contentSkip to conversation

arm-bsp/u-boot: fix THISDIR name collision in u-boot_%.bbappend

PATCH Applied [email protected] 4 participants 5 messages Sep 17, 2020 – Sep 21, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm-bsp/u-boot: fix THISDIR name collision in u-boot_%.bbappend

Renamed ${THISDIR} user defined variable to ${THIS_DIR}, to prevent it from breaking ${THISDIR} macro in subsequent u-boot .bbappend files

Change-Id: I4473ee5c3ac5c0aea9310557294cc9757579bdf1
Issue-Id: SCM-1302

---
 meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +2 -2
index bf57242..5fc3723 100644
@@ -1,7 +1,7 @@
 # Machine specific u-boot
 
-THISDIR := "${THISDIR}"
-FILESEXTRAPATHS_prepend = "${THISDIR}/files/:${THISDIR}/${BP}:"
+THIS_DIR := "${THISDIR}"
+FILESEXTRAPATHS_prepend = "${THIS_DIR}/files/:${THIS_DIR}/${BP}:"
 FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp-common:"
 FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp-common:"
 
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Nathan Dunne

Renamed ${THISDIR} user defined variable to ${THIS_DIR}, to prevent it from breaking ${THISDIR} macro in subsequent u-boot .bbappend files

Change-Id: I4473ee5c3ac5c0aea9310557294cc9757579bdf1
Issue-Id: SCM-1302

---

Quoted 22 lines
 meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +2 -2
index bf57242..5fc3723 100644
@@ -1,7 +1,7 @@
 # Machine specific u-boot
 
-THISDIR := "${THISDIR}"
-FILESEXTRAPATHS_prepend = "${THISDIR}/files/:${THISDIR}/${BP}:"
+THIS_DIR := "${THISDIR}"
+FILESEXTRAPATHS_prepend = "${THIS_DIR}/files/:${THIS_DIR}/${BP}:"
 FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp-common:"
 FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp-common:"
 
Signature · 1 line
2.17.1
#2 lore raw
In reply to [email protected]
Quoted 15 lines · Nathan Dunne

Renamed ${THISDIR} user defined variable to ${THIS_DIR}, to prevent it from breaking ${THISDIR} macro in subsequent u-boot .bbappend files

Change-Id: I4473ee5c3ac5c0aea9310557294cc9757579bdf1
Issue-Id: SCM-1302

---
 meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +0 -0
index bf57242..5fc3723 100644

meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend line 6

Quoted 8 lines
meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +2 -2
@@ -1,7 +1,7 @@
 # Machine specific u-boot
 
-THISDIR := "${THISDIR}"
-FILESEXTRAPATHS_prepend = "${THISDIR}/files/:${THISDIR}/${BP}:"
+THIS_DIR := "${THISDIR}"
+FILESEXTRAPATHS_prepend = "${THIS_DIR}/files/:${THIS_DIR}/${BP}:"
 FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp-common:"
 FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp-common:"

Why not make these 3 lines above that prepend to FILESEXTRAPATHS consistent?

Quoted 8 lines
Signature · 2 lines
-- 
2.17.1
#3 lore raw
Quoted 21 lines · Denys Dmytriyenko
Quoted 18 lines · Nathan Dunne

Renamed ${THISDIR} user defined variable to ${THIS_DIR}, to prevent it from breaking ${THISDIR} macro in subsequent u-boot .bbappend files

Change-Id: I4473ee5c3ac5c0aea9310557294cc9757579bdf1
Issue-Id: SCM-1302

---
meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)
meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +0 -0
index bf57242..5fc3723 100644
@@ -1,7 +1,7 @@
 # Machine specific u-boot
 
Quoted 10 lines
Quoted 6 lines
meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +2 -2
-THISDIR := "${THISDIR}"
-FILESEXTRAPATHS_prepend = "${THISDIR}/files/:${THISDIR}/${BP}:"
+THIS_DIR := "${THISDIR}"
+FILESEXTRAPATHS_prepend = "${THIS_DIR}/files/:${THIS_DIR}/${BP}:"

FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp-common:" FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp-common:"

Why not make these 3 lines above that prepend to FILESEXTRAPATHS consistent?

Only the line with ${BP} needs the user defined THIS_DIR because it can't use immediate expansion due to ${BP} containing ${PV}, which is only set after parsing. This is not a problem for the other two lines, hence no need to make use of the ${THIS_DIR} intermediate variable. ${BP} is only being added to FILESEXTRAPATHS because meta-arm master currently needs to support u-boot from oe-core master and dunfell, so once we can drop support for multiple versions there will be less modifications to make if the other two lines aren't touched

The problem is the intermediate variable previously being named "THISDIR", as it should not be manually set and causes subsequent u-boot bbappend files using ${THISDIR} to reference this file's directory instead of their own.

Applied
#4 lore raw
In reply to [email protected]
Quoted 6 lines · Nathan Dunne

Renamed ${THISDIR} user defined variable to ${THIS_DIR}, to prevent it from breaking ${THISDIR} macro in subsequent u-boot .bbappend files

Change-Id: I4473ee5c3ac5c0aea9310557294cc9757579bdf1
Issue-Id: SCM-1302

Pushed to master.

Thanks,
Jon

Quoted 25 lines
---
 meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +2 -2
index bf57242..5fc3723 100644
@@ -1,7 +1,7 @@
 # Machine specific u-boot
 
-THISDIR := "${THISDIR}"
-FILESEXTRAPATHS_prepend = "${THISDIR}/files/:${THISDIR}/${BP}:"
+THIS_DIR := "${THISDIR}"
+FILESEXTRAPATHS_prepend = "${THIS_DIR}/files/:${THIS_DIR}/${BP}:"
 FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp-common:"
 FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp-common:"
 
Signature · 1 line
2.17.1