diff options
author | Ryan Eatmon <reatmon@ti.com> | 2024-05-08 10:49:23 -0500 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2024-05-08 11:00:31 -0500 |
commit | ae9a1ab0f7306b19b269580e4e4368241efbc520 (patch) | |
tree | 1f93aeca0e89e312d7f9c5e50d44578695b2a3f0 | |
parent | 3043308f2ea90c7677c92a65f39745d336d51ba4 (diff) | |
download | meta-ti-master-wip.tar.gz |
recipes: Update S = WORKDIR recipes to use ${S} correctlymaster-wip
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 <reatmon@ti.com>
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 = " \ | |||
8 | PR:append:ti-soc = ".3" | 8 | PR:append:ti-soc = ".3" |
9 | 9 | ||
10 | do_install:append:ti-soc() { | 10 | do_install:append:ti-soc() { |
11 | install -m 0644 ${WORKDIR}/omap-tty.rules ${D}${sysconfdir}/udev/rules.d/ | 11 | install -m 0644 ${S}/omap-tty.rules ${D}${sysconfdir}/udev/rules.d/ |
12 | install -m 0644 ${WORKDIR}/firmware.rules ${D}${sysconfdir}/udev/rules.d/ | 12 | install -m 0644 ${S}/firmware.rules ${D}${sysconfdir}/udev/rules.d/ |
13 | } | 13 | } |
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 \ | |||
14 | 14 | ||
15 | do_install() { | 15 | do_install() { |
16 | install -d ${D}${base_libdir}/systemd/system/ | 16 | install -d ${D}${base_libdir}/systemd/system/ |
17 | install -m 0644 ${WORKDIR}/cape.service ${D}${base_libdir}/systemd/system | 17 | install -m 0644 ${S}/cape.service ${D}${base_libdir}/systemd/system |
18 | 18 | ||
19 | install -d ${D}${base_libdir}/systemd/system/basic.target.wants | 19 | install -d ${D}${base_libdir}/systemd/system/basic.target.wants |
20 | ln -sf ../cape.service ${D}${base_libdir}/systemd/system/basic.target.wants/ | 20 | ln -sf ../cape.service ${D}${base_libdir}/systemd/system/basic.target.wants/ |
21 | 21 | ||
22 | install -d ${D}${bindir} | 22 | install -d ${D}${bindir} |
23 | install -m 0755 ${WORKDIR}/cape*.sh ${D}${bindir} | 23 | install -m 0755 ${S}/cape*.sh ${D}${bindir} |
24 | } | 24 | } |
25 | 25 | ||
26 | FILES:${PN} += "${base_libdir}/systemd/system" | 26 | 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 \ | |||
22 | 22 | ||
23 | do_install() { | 23 | do_install() { |
24 | install -d ${D}${base_libdir}/systemd/system/basic.target.wants | 24 | install -d ${D}${base_libdir}/systemd/system/basic.target.wants |
25 | install -m 0644 ${WORKDIR}/*.service ${D}${base_libdir}/systemd/system | 25 | install -m 0644 ${S}/*.service ${D}${base_libdir}/systemd/system |
26 | 26 | ||
27 | for i in ${WORKDIR}/storage-gadget-init.service ; do | 27 | for i in ${S}/storage-gadget-init.service ; do |
28 | install -m 0644 $i ${D}${base_libdir}/systemd/system | 28 | install -m 0644 $i ${D}${base_libdir}/systemd/system |
29 | ln -sf ../$(basename $i) ${D}${base_libdir}/systemd/system/basic.target.wants/ | 29 | ln -sf ../$(basename $i) ${D}${base_libdir}/systemd/system/basic.target.wants/ |
30 | done | 30 | done |
31 | 31 | ||
32 | install -d ${D}${sysconfdir}/udev/rules.d | 32 | install -d ${D}${sysconfdir}/udev/rules.d |
33 | install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d | 33 | install -m 0644 ${S}/*.rules ${D}${sysconfdir}/udev/rules.d |
34 | install -m 0644 ${WORKDIR}/*.conf ${D}${sysconfdir} | 34 | install -m 0644 ${S}/*.conf ${D}${sysconfdir} |
35 | 35 | ||
36 | install -d ${D}${bindir} | 36 | install -d ${D}${bindir} |
37 | install -m 0755 ${WORKDIR}/*.sh ${D}${bindir} | 37 | install -m 0755 ${S}/*.sh ${D}${bindir} |
38 | } | 38 | } |
39 | 39 | ||
40 | PACKAGES =+ "${PN}-storage ${PN}-network ${PN}-udhcpd" | 40 | 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" | |||
10 | SRC_URI[sysbiosbin.sha256sum] = "b762b7f2343d26d367f952488e529046785128005158cc921c3baef08e97116a" | 10 | SRC_URI[sysbiosbin.sha256sum] = "b762b7f2343d26d367f952488e529046785128005158cc921c3baef08e97116a" |
11 | 11 | ||
12 | TI_BIN_UNPK_CMDS = "" | 12 | TI_BIN_UNPK_CMDS = "" |
13 | TI_BIN_UNPK_ARGS = "--mode unattended --prefix ${WORKDIR}" | 13 | TI_BIN_UNPK_ARGS = "--mode unattended --prefix ${S}" |
14 | 14 | ||
15 | BINFILE = "bios_${PV}.run" | 15 | BINFILE = "bios_${PV}.run" |
16 | SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/sysbios/${PV}/exports/${BINFILE};name=sysbiosbin" | 16 | 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() { | |||
31 | } | 31 | } |
32 | 32 | ||
33 | do_install:class-target() { | 33 | do_install:class-target() { |
34 | ${WORKDIR}/${BINFILE} --prefix ${D} | 34 | ${S}/${BINFILE} --prefix ${D} |
35 | } | 35 | } |
36 | 36 | ||
37 | FILES:${PN} += "${datadir}/ti/*" | 37 | 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() { | |||
92 | } | 92 | } |
93 | 93 | ||
94 | do_install:class-target() { | 94 | do_install:class-target() { |
95 | ${WORKDIR}/${BINFILE} --prefix ${D} | 95 | ${S}/${BINFILE} --prefix ${D} |
96 | } | 96 | } |
97 | 97 | ||
98 | FILES:${PN} += "${datadir}/ti/*" | 98 | FILES:${PN} += "${datadir}/ti/*" |