| Message ID | 20250625180610.17641-1-reatmon@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-arago,master,1/5] meta-arago/all: set S from UNPACKDIR in recipes that use only local files | expand |
diff --git a/meta-arago-distro/recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb b/meta-arago-distro/recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb index 0753a6aa..57070459 100644 --- a/meta-arago-distro/recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb +++ b/meta-arago-distro/recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb @@ -8,9 +8,6 @@ CLEANBROKEN = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" - BOOSTRAP_IMAGE = "tisdk-bootstrap-base-image" TARGET = "bootstrap-rootfs-${MACHINE}.cpio" diff --git a/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable.bb b/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable.bb index 0e7b446d..f0a574cf 100644 --- a/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable.bb +++ b/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable.bb @@ -9,8 +9,7 @@ SRC_URI = " \ PR = "r1" -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" +S = "${UNPACKDIR}" INITSCRIPT_NAME = "bt-enable.sh" INITSCRIPT_PARAMS = "defaults 99" diff --git a/meta-arago-distro/recipes-connectivity/initscript-telnetd/initscript-telnetd.bb b/meta-arago-distro/recipes-connectivity/initscript-telnetd/initscript-telnetd.bb index 973dc8e7..8398e7f3 100644 --- a/meta-arago-distro/recipes-connectivity/initscript-telnetd/initscript-telnetd.bb +++ b/meta-arago-distro/recipes-connectivity/initscript-telnetd/initscript-telnetd.bb @@ -5,8 +5,7 @@ PR = "r1" SRC_URI = "file://telnetd" -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" +S = "${UNPACKDIR}" INITSCRIPT_NAME = "telnetd" INITSCRIPT_PARAMS = "defaults 10" diff --git a/meta-arago-distro/recipes-connectivity/systemd-telnetd/systemd-telnetd.bb b/meta-arago-distro/recipes-connectivity/systemd-telnetd/systemd-telnetd.bb index 4d84bed4..ff52213e 100644 --- a/meta-arago-distro/recipes-connectivity/systemd-telnetd/systemd-telnetd.bb +++ b/meta-arago-distro/recipes-connectivity/systemd-telnetd/systemd-telnetd.bb @@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://telnetd.service;beginline=1;endline=17;md5=d134d0d385 SRC_URI = "file://telnetd.service" -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" +S = "${UNPACKDIR}" inherit systemd diff --git a/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb b/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb index 79fcd7ae..ace82fb0 100644 --- a/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb +++ b/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb @@ -4,8 +4,7 @@ LIC_FILES_CHKSUM = "file://print-gplv3-packages.sh;beginline=2;endline=18;md5=d1 PR = "r3" -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" +S = "${UNPACKDIR}" INITSCRIPT_NAME = "gplv3-notice" INITSCRIPT_PARAMS = "defaults 99" diff --git a/meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb b/meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb index 7942b52c..804641a9 100644 --- a/meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb +++ b/meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb @@ -9,8 +9,7 @@ SRC_URI = "\ PR = "r3" PV = "1.0" -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" +S = "${UNPACKDIR}" do_install () { install -d ${D}/board-support/prebuilt-images diff --git a/meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion.bb b/meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion.bb index 51f0dd3e..f92556d1 100644 --- a/meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion.bb +++ b/meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion.bb @@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 SRC_URI = "file://opkg-bash-completion" -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" +S = "${UNPACKDIR}" do_install() { install -d ${D}${datadir}/bash-completion/completions diff --git a/meta-arago-extras/recipes-extended/sysrepo/nw-configurator.bb b/meta-arago-extras/recipes-extended/sysrepo/nw-configurator.bb index 5f9d53e7..9bbca2bf 100644 --- a/meta-arago-extras/recipes-extended/sysrepo/nw-configurator.bb +++ b/meta-arago-extras/recipes-extended/sysrepo/nw-configurator.bb @@ -5,13 +5,14 @@ LIC_FILES_CHKSUM = "file://nw-configurator.c;beginline=1;endline=33;md5=3538caaf SRC_URI = "file://nw-configurator.c" -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" +S = "${UNPACKDIR}" DEPENDS = "sysrepo" inherit pkgconfig +CFLAGS:remove = "-g" + do_compile() { ${CC} ${CFLAGS} ${LDFLAGS} -I=${STAGING_INCDIR} ${S}/nw-configurator.c -o nw-configurator -lsysrepo } diff --git a/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb b/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb index 7b69e89b..3f3aeaad 100644 --- a/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb +++ b/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb @@ -8,9 +8,6 @@ LIC_FILES_CHKSUM = "file://init;beginline=2;endline=11;md5=4b2e3b15f01cf63d2cb79 PR = "r4" -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" - INITSCRIPT_NAME = "ts-calibrate" # Start this init script early enough for other processes to be started later @@ -23,6 +20,8 @@ inherit update-rc.d SRC_URI = "file://init" +S = "${UNPACKDIR}" + do_install(){ # Install the init script # TODO: replace init script with systemd files diff --git a/meta-arago-test/recipes-benchmark/arm-ddr-bandwidth/arm-ddr-bandwidth.bb b/meta-arago-test/recipes-benchmark/arm-ddr-bandwidth/arm-ddr-bandwidth.bb index bf08c320..29db78c3 100644 --- a/meta-arago-test/recipes-benchmark/arm-ddr-bandwidth/arm-ddr-bandwidth.bb +++ b/meta-arago-test/recipes-benchmark/arm-ddr-bandwidth/arm-ddr-bandwidth.bb @@ -1,7 +1,7 @@ SUMMARY = "Benchmark for checking DDR bandwidth" HOMEPAGE = "https://git.ti.com/cgit/matrix-gui-v2/matrix-gui-v2-apps/tree/arm_apps/arm_ddr_bandwidth/runLmDDRBandwidth.sh" LICENSE = "CC-BY-SA-3.0" -LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE;md5=6e0ae7214f6c74c149cb25f373057fa9" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6e0ae7214f6c74c149cb25f373057fa9" PV = "1.0" @@ -12,8 +12,7 @@ SRC_URI = " \ SRC_URI[runLmDDRBandwidth.sha256sum] = "67997d721b351344d8788200a15bb3640093045bc25f2b5307dd331ebd1556a3" SRC_URI[license.sha256sum] = "7febd1df714fa4b1e44fe0b0f73ceac7f9b9f97326695a0cc7074bd6c8d263e3" -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" +S = "${UNPACKDIR}" do_install() { install -d ${D}${datadir}/matrix-gui-2.0/apps diff --git a/meta-arago-test/recipes-benchmark/openssl-perf/openssl-perf.bb b/meta-arago-test/recipes-benchmark/openssl-perf/openssl-perf.bb index 1939b2cf..04a3fb79 100644 --- a/meta-arago-test/recipes-benchmark/openssl-perf/openssl-perf.bb +++ b/meta-arago-test/recipes-benchmark/openssl-perf/openssl-perf.bb @@ -24,8 +24,7 @@ SRC_URI[openssl_gen_sha1hash.sha256sum] = "f338f8c3067ebb1c5710b16b91e8b9e38685b SRC_URI[openssl_start_server.sha256sum] = "e23499210f701ef831d39a8c732f34f4b06fb3ba2d069c4a95ef25ae59f3c93e" SRC_URI[license.sha256sum] = "7febd1df714fa4b1e44fe0b0f73ceac7f9b9f97326695a0cc7074bd6c8d263e3" -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" +S = "${UNPACKDIR}" do_install() { install -d ${D}${bindir}
There is no need to have two assignments; also setting S from UNPACKDIR (and not vice versa) is more logical as unpack task comes first, and tasks that come after unpack use S to access unpack results. Signed-off-by: Ryan Eatmon <reatmon@ti.com> --- .../recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb | 3 --- .../recipes-connectivity/bt-enable/bt-enable.bb | 3 +-- .../initscript-telnetd/initscript-telnetd.bb | 3 +-- .../recipes-connectivity/systemd-telnetd/systemd-telnetd.bb | 3 +-- .../recipes-core/arago-gpl-notice/arago-gpl-notice.bb | 3 +-- meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb | 3 +-- .../recipes-devtools/opkg/opkg-bash-completion.bb | 3 +-- .../recipes-extended/sysrepo/nw-configurator.bb | 5 +++-- .../recipes-graphics/tslib/ts-calibrate-init_1.0.bb | 5 ++--- .../recipes-benchmark/arm-ddr-bandwidth/arm-ddr-bandwidth.bb | 5 ++--- .../recipes-benchmark/openssl-perf/openssl-perf.bb | 3 +-- 11 files changed, 14 insertions(+), 25 deletions(-)