From ae9a1ab0f7306b19b269580e4e4368241efbc520 Mon Sep 17 00:00:00 2001 From: Ryan Eatmon Date: Wed, 8 May 2024 10:49:23 -0500 Subject: recipes: Update S = WORKDIR recipes to use ${S} correctly This is a corresponding patch to match one from Richard Purdie in oe-core. [1] Where recipes use S = ${WORKDIR}, ensure they are referencing ${S} correctly to access files as soon we want to stop doing this in WORKDIR at which point they would break unless corrected. [1] https://git.openembedded.org/openembedded-core/commit/?id=f25dd633fffe6560f191526d1869e657e129bad9 Signed-off-by: Ryan Eatmon --- meta-ti-bsp/recipes-core/udev/eudev_%.bbappend | 4 ++-- meta-ti-extras/recipes-ti/beagleboard/beaglebone-capes.bb | 4 ++-- meta-ti-extras/recipes-ti/beagleboard/gadget-init.bb | 10 +++++----- meta-ti-extras/recipes-ti/bios/ti-sysbios_6.76.03.01.bb | 2 +- meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb | 2 +- meta-ti-extras/recipes-ti/devtools/ti-cgt6x_8.3.2.bb | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta-ti-bsp/recipes-core/udev/eudev_%.bbappend b/meta-ti-bsp/recipes-core/udev/eudev_%.bbappend index ddb1e75d..8535ac70 100644 --- a/meta-ti-bsp/recipes-core/udev/eudev_%.bbappend +++ b/meta-ti-bsp/recipes-core/udev/eudev_%.bbappend @@ -8,6 +8,6 @@ SRC_URI:append:ti-soc = " \ PR:append:ti-soc = ".3" do_install:append:ti-soc() { - install -m 0644 ${WORKDIR}/omap-tty.rules ${D}${sysconfdir}/udev/rules.d/ - install -m 0644 ${WORKDIR}/firmware.rules ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${S}/omap-tty.rules ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${S}/firmware.rules ${D}${sysconfdir}/udev/rules.d/ } diff --git a/meta-ti-extras/recipes-ti/beagleboard/beaglebone-capes.bb b/meta-ti-extras/recipes-ti/beagleboard/beaglebone-capes.bb index ceefe0d6..a1f38e48 100644 --- a/meta-ti-extras/recipes-ti/beagleboard/beaglebone-capes.bb +++ b/meta-ti-extras/recipes-ti/beagleboard/beaglebone-capes.bb @@ -14,13 +14,13 @@ SRC_URI = "file://cape.service \ do_install() { install -d ${D}${base_libdir}/systemd/system/ - install -m 0644 ${WORKDIR}/cape.service ${D}${base_libdir}/systemd/system + install -m 0644 ${S}/cape.service ${D}${base_libdir}/systemd/system install -d ${D}${base_libdir}/systemd/system/basic.target.wants ln -sf ../cape.service ${D}${base_libdir}/systemd/system/basic.target.wants/ install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/cape*.sh ${D}${bindir} + install -m 0755 ${S}/cape*.sh ${D}${bindir} } FILES:${PN} += "${base_libdir}/systemd/system" diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init.bb b/meta-ti-extras/recipes-ti/beagleboard/gadget-init.bb index 3ab00ec3..37a61ca4 100644 --- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init.bb +++ b/meta-ti-extras/recipes-ti/beagleboard/gadget-init.bb @@ -22,19 +22,19 @@ SRC_URI = "file://storage-gadget-init.service \ do_install() { install -d ${D}${base_libdir}/systemd/system/basic.target.wants - install -m 0644 ${WORKDIR}/*.service ${D}${base_libdir}/systemd/system + install -m 0644 ${S}/*.service ${D}${base_libdir}/systemd/system - for i in ${WORKDIR}/storage-gadget-init.service ; do + for i in ${S}/storage-gadget-init.service ; do install -m 0644 $i ${D}${base_libdir}/systemd/system ln -sf ../$(basename $i) ${D}${base_libdir}/systemd/system/basic.target.wants/ done install -d ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/*.conf ${D}${sysconfdir} + install -m 0644 ${S}/*.rules ${D}${sysconfdir}/udev/rules.d + install -m 0644 ${S}/*.conf ${D}${sysconfdir} install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/*.sh ${D}${bindir} + install -m 0755 ${S}/*.sh ${D}${bindir} } PACKAGES =+ "${PN}-storage ${PN}-network ${PN}-udhcpd" diff --git a/meta-ti-extras/recipes-ti/bios/ti-sysbios_6.76.03.01.bb b/meta-ti-extras/recipes-ti/bios/ti-sysbios_6.76.03.01.bb index d242510f..1226bb19 100644 --- a/meta-ti-extras/recipes-ti/bios/ti-sysbios_6.76.03.01.bb +++ b/meta-ti-extras/recipes-ti/bios/ti-sysbios_6.76.03.01.bb @@ -10,7 +10,7 @@ SRC_URI[sysbiosbin.md5sum] = "647243209d66d5dd35503b0ec5a84ab9" SRC_URI[sysbiosbin.sha256sum] = "b762b7f2343d26d367f952488e529046785128005158cc921c3baef08e97116a" TI_BIN_UNPK_CMDS = "" -TI_BIN_UNPK_ARGS = "--mode unattended --prefix ${WORKDIR}" +TI_BIN_UNPK_ARGS = "--mode unattended --prefix ${S}" BINFILE = "bios_${PV}.run" SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/sysbios/${PV}/exports/${BINFILE};name=sysbiosbin" diff --git a/meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb b/meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb index c96113fe..0a52561b 100644 --- a/meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb +++ b/meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb @@ -31,7 +31,7 @@ do_install() { } do_install:class-target() { - ${WORKDIR}/${BINFILE} --prefix ${D} + ${S}/${BINFILE} --prefix ${D} } FILES:${PN} += "${datadir}/ti/*" diff --git a/meta-ti-extras/recipes-ti/devtools/ti-cgt6x_8.3.2.bb b/meta-ti-extras/recipes-ti/devtools/ti-cgt6x_8.3.2.bb index fd34657a..e7fda0f3 100644 --- a/meta-ti-extras/recipes-ti/devtools/ti-cgt6x_8.3.2.bb +++ b/meta-ti-extras/recipes-ti/devtools/ti-cgt6x_8.3.2.bb @@ -92,7 +92,7 @@ do_install() { } do_install:class-target() { - ${WORKDIR}/${BINFILE} --prefix ${D} + ${S}/${BINFILE} --prefix ${D} } FILES:${PN} += "${datadir}/ti/*" -- cgit v1.2.3-54-g00ecf