From 7c5519b8b1dc782fd0fa50ac426094f9225de80a Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 8 Jun 2022 17:49:49 -0700 Subject: meta-xilinx-standalone-experimental: Wrap do_configure:prepend The do_configure prepend steps need to run in the 'S' directory, so wrap the operations to prevent them from changing the working directory for the rest of the do_configure operations. Signed-off-by: Mark Hatle --- .../recipes-libraries/freertos10-xilinx_git.bb | 2 ++ meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb | 2 ++ .../recipes-libraries/xilffs-example_git.bb | 2 ++ .../recipes-libraries/xilfpga-example_git.bb | 2 ++ .../recipes-libraries/xilmailbox-example_git.bb | 2 ++ .../recipes-libraries/xilnvm-example_git.bb | 2 ++ .../recipes-libraries/xilpuf-example_git.bb | 2 ++ .../recipes-libraries/xilsecure-example_git.bb | 2 ++ .../recipes-libraries/xilstandalone_git.bb | 2 ++ meta-xilinx-standalone-experimental/recipes-libraries/xiltimer_git.bb | 2 ++ 10 files changed, 20 insertions(+) (limited to 'meta-xilinx-standalone-experimental/recipes-libraries') diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/freertos10-xilinx_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/freertos10-xilinx_git.bb index 46c349bc..22d7955e 100644 --- a/meta-xilinx-standalone-experimental/recipes-libraries/freertos10-xilinx_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-libraries/freertos10-xilinx_git.bb @@ -7,7 +7,9 @@ DEPENDS += "libxil xilstandalone xiltimer" do_configure:prepend() { # This script should also not rely on relative paths and such + ( cd ${S} lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S} install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + ) } diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb index 09bf4192..bced1499 100644 --- a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb @@ -15,10 +15,12 @@ EXTRA_OECMAKE:append:xilinx-freertos += "-Dlwip_api_mode=SOCKET_API" do_configure:prepend() { # This script should also not rely on relative paths and such + ( cd ${S} lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S} install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 xtopology_g.c ${S}/${ESW_COMPONENT_SRC}/ + ) } do_install() { diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb index 7f3618c8..ff12a5df 100644 --- a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb @@ -5,10 +5,12 @@ ESW_COMPONENT_SRC = "/lib/sw_services/xilffs/examples/" DEPENDS += "xilffs xiltimer" do_configure:prepend() { + ( cd ${S} lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + ) } ESW_CUSTOM_LINKER_FILE ?= "None" diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb index 5137c591..df5c1bbe 100644 --- a/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb @@ -5,10 +5,12 @@ ESW_COMPONENT_SRC = "/lib/sw_services/xilfpga/examples/" DEPENDS += "xilfpga" do_configure:prepend() { + ( cd ${S} lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + ) } ESW_CUSTOM_LINKER_FILE ?= "None" diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb index a525e1bc..1e457d18 100644 --- a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb @@ -5,10 +5,12 @@ ESW_COMPONENT_SRC = "/lib/sw_services/xilmailbox/examples/" DEPENDS += "xilmailbox" do_configure:prepend() { + ( cd ${S} lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + ) } ESW_CUSTOM_LINKER_FILE ?= "None" diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb index ef8b6e64..a656e7ec 100644 --- a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb @@ -5,10 +5,12 @@ ESW_COMPONENT_SRC = "/lib/sw_services/xilnvm/examples/" DEPENDS += "xilnvm" do_configure:prepend() { + ( cd ${S} lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + ) } ESW_CUSTOM_LINKER_FILE ?= "None" diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb index d43b4da9..9f1e8baa 100644 --- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb @@ -5,10 +5,12 @@ ESW_COMPONENT_SRC = "/lib/sw_services/xilpuf/examples/" DEPENDS += "xilpuf" do_configure:prepend() { + ( cd ${S} lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + ) } ESW_CUSTOM_LINKER_FILE ?= "None" diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_git.bb index 4c2be337..2267571f 100644 --- a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_git.bb @@ -5,10 +5,12 @@ ESW_COMPONENT_SRC = "/lib/sw_services/xilsecure/examples/" DEPENDS += "xilsecure" do_configure:prepend() { + ( cd ${S} lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + ) } ESW_CUSTOM_LINKER_FILE ?= "None" diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb index 447c3cc3..70a46c5e 100644 --- a/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb @@ -7,8 +7,10 @@ DEPENDS += "libgloss" do_configure:prepend() { # This script should also not rely on relative paths and such + ( cd ${S} lopper ${DTS_FILE} -- baremetal_bspconfig_xlnx ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 MemConfig.cmake ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.c ${S}/${ESW_COMPONENT_SRC}/common/ + ) } diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xiltimer_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xiltimer_git.bb index 0e25bbb7..dd19671d 100644 --- a/meta-xilinx-standalone-experimental/recipes-libraries/xiltimer_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-libraries/xiltimer_git.bb @@ -7,7 +7,9 @@ DEPENDS += "libxil" do_configure:prepend() { # This script should also not rely on relative paths and such + ( cd ${S} lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S} install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + ) } -- cgit v1.2.3-54-g00ecf