meta-ti/linux: Update for S changes
PATCH 1/7 meta-ti/linux: Update for S changes
The kernel class operates a little differently. The kernel is downloaded and then moved to the "global" shared location and a symlink is created to point to that location. Since we cannot set S = "${WORKDIR}/git" anymore, just choose a new name under UNPACKDIR. The value for BB_GIT_DEFAULT_DESTSUFFIX is the subdir name that is used by default when fetching git repositories, so just use that name.
--- meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb | 2 +- meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb | 2 +- meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb | 2 +- meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 2 +- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb | 2 +- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb | 2 +- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)
meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb +1 -1
@@ -53,7 +53,7 @@ PB-MIKROBUS-0.dtbo \ PB-MIKROBUS-1.dtbo \ " -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" # 6.1.83 version for 32-bit SRCREV:armv7a = "be9b910b08dfd674e47a2643f35080b005ac3792"
meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb +1 -1
@@ -53,7 +53,7 @@ ${DT_VENDOR_PREFIX}PB-MIKROBUS-0.dtbo \ ${DT_VENDOR_PREFIX}PB-MIKROBUS-1.dtbo \ " -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" # 6.12.22 version for 32-bit SRCREV:armv7a = "d7f560ef48a867b94959f040b4c3c57053f4e32d"
meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb +1 -1
@@ -53,7 +53,7 @@ ${DT_VENDOR_PREFIX}PB-MIKROBUS-0.dtbo \ ${DT_VENDOR_PREFIX}PB-MIKROBUS-1.dtbo \ " -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" # 6.6.58 version for 32-bit SRCREV:armv7a = "0d043a88f69f48789e43526d7a807ab744708071"
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +1 -1
@@ -11,7 +11,7 @@ DEPENDS += "gmp-native libmpc-native" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}" -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" # 6.12 Mainline version SRCREV = "adc218676eef25575469234709c2d87185ca223a"
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb +1 -1
@@ -19,7 +19,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ ${EXTRA_DTC_ARGS}" -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" BRANCH ?= "ti-linux-6.1.y"
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb +1 -1
@@ -19,7 +19,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ ${EXTRA_DTC_ARGS}" -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" BRANCH ?= "ti-linux-6.12.y"
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb +1 -1
@@ -19,7 +19,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ ${EXTRA_DTC_ARGS}" -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" BRANCH ?= "ti-linux-6.6.y"
Signature · 1 line
2.17.1
PATCH 2/7 meta-ti/all: set S from UNPACKDIR in recipes that fetch prebuilt files
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.
--- meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb | 3 +-- meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb +1 -2
@@ -11,8 +11,7 @@ SRC_URI = "http://downloads.ti.com/dsps/dsps_public_sw/glsdk/vis/01_50_07_15/exp SRC_URI[md5sum] = "fe8b00e398fb3b7ada0c15b601867acb" SRC_URI[sha256sum] = "6e2aa47ae892910616ebdc96646af778af9a59ca0657716ab4fa4b24a9afae69" -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" +S = "${UNPACKDIR}" DSPAPP = "dra7-dsp1-fw-radio.xe66" GPPAPP = "RadioApp"
meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb +1 -2
@@ -24,8 +24,7 @@ SRC_URI[cgt-pru-x86.sha256sum] = "1f1405167214f2c0ef848591b17a7799fdcd9f55f11bc9 SRC_URI[cgt-pru-arm.md5sum] = "648a6d7d8162fd6a89f381c7b974e6b0" SRC_URI[cgt-pru-arm.sha256sum] = "8390cb77b46b728ce2940595b81406f76d86dfed58c21258e3206a7c1232ccf2" -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" +S = "${UNPACKDIR}" do_install() { install -d ${D}${TI_CGT_PRU_INSTALL_DIR_RECIPE}
Signature · 1 line
2.17.1
PATCH 3/7 meta-ti/all: remove S in recipes that fetch from git via setting BB_GIT_DEFAULT_DESTSUFFIX
In reply to Ryan EatmonRemoving all the S = ${WORKDIR}/git assignments works because BB_GIT_DEFAULT_DESTSUFFIX is set to match S from bitbake.conf (which itself is set to match typical tarball releases).
--- meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb | 2 -- meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb | 2 -- .../powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb | 2 -- .../powervr-drivers/ti-img-rogue-driver_24.2.6643903.bb | 2 -- .../recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 2 -- .../recipes-bsp/ti-img-encode-decode/ti-vxe-vxd-driver_6.12.bb | 2 -- .../recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb | 2 -- .../recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb | 2 -- meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 2 -- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 2 -- meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb | 2 -- .../recipes-bsp/zephyr-fw/zephyr-openamp-rsc-table-fw.bb | 2 -- meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb | 2 -- meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb | 2 -- meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb | 2 -- meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb | 2 -- .../powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb | 3 +-- .../powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb | 2 -- meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc | 2 -- meta-ti-bsp/recipes-ti/ipc/ti-librpmsg-dma_1.0.bb | 2 -- meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc | 2 -- meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb | 2 -- meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb | 2 -- meta-ti-extras/recipes-bsp/cc33xx-fw/cc33xx-fw_git.bb | 2 -- meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb | 2 -- meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb | 2 -- meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb | 2 -- .../cc33xx-target-scripts/cc33xx-target-scripts_git.bb | 2 -- meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb | 2 -- .../wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb | 2 -- .../wl18xx-target-scripts/wl18xx-target-scripts_8.8.1.bb | 2 -- meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.15.00.bb | 1 - .../recipes-ti/beagleboard/beaglebone-getting-started.bb | 2 -- meta-ti-extras/recipes-ti/dsplib/dsplib.inc | 2 -- meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc | 1 - meta-ti-extras/recipes-ti/mathlib/mathlib.inc | 2 -- meta-ti-extras/recipes-ti/swtools/swtools_git.bb | 1 - 37 files changed, 1 insertion(+), 71 deletions(-)
meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb +0 -2
@@ -11,8 +11,6 @@ BRANCH ?= "ti-v4.1.y" SRC_URI = "git://git.ti.com/git/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=https;branch=${BRANCH}" -S = "${WORKDIR}/git" - do_compile() { make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc -std=gnu11 ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS} ${DEBUG_PREFIX_MAP}" }
meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb +0 -2
@@ -13,8 +13,6 @@ SRCREV = "91f1628507bf7f8716f0bc7cafe88ad7f14c94f5" SRC_URI = "git://git.ti.com/git/glsdk/ti-eth-fw.git;protocol=${PROTOCOL};branch=${BRANCH}" -S = "${WORKDIR}/git" - CPSW9G_FW_DIR = "${S}/ethfw" CPSW9G_FW_FILENAME = "app_remoteswitchcfg_server_pdk_mem_map_strip.xer5f"
meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb +0 -2
@@ -17,8 +17,6 @@ BRANCH = "linuxws/kirkstone/k6.1/${PV}" SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}" -S = "${WORKDIR}/git" - SRCREV = "c838bc06a163abad46dcc193c8fb9a4fb9e2e356" TARGET_PRODUCT:j721e = "j721e_linux"
meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.2.6643903.bb +0 -2
@@ -17,8 +17,6 @@ BRANCH = "linuxws/scarthgap/k6.12/${PV}" SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}" -S = "${WORKDIR}/git" - SRCREV = "8eaff654a8871118c08cfafe53795f57e3b6b396" TARGET_PRODUCT:j721e = "j721e_linux"
meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +0 -2
@@ -17,8 +17,6 @@ BRANCH = "${PV}/mesa/k6.1" SRC_URI = "git://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git;protocol=https;branch=${BRANCH}" -S = "${WORKDIR}/git" - SRCREV = "9ae0fa4998b1c624408945e062bf8fb0ea7efb9d" TARGET_PRODUCT:omap-a15 = "ti572x_linux"
meta-ti-bsp/recipes-bsp/ti-img-encode-decode/ti-vxe-vxd-driver_6.12.bb +0 -2
@@ -18,6 +18,4 @@ SRCREV = "038d9263c67900ea4eff631820b088a3dc3a6ad5" TARGET_PRODUCT:j721e = "j721e_linux" -S = "${WORKDIR}/git" - EXTRA_OEMAKE += 'KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
meta-ti-bsp/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb +0 -2
@@ -16,5 +16,3 @@ TARGET_CC_ARCH += "${LDFLAGS}" BRANCH = "master" SRC_URI = "git://git.ti.com/git/jacinto7_multimedia/viddec-test-app.git;protocol=https;branch=${BRANCH}" - -S = "${WORKDIR}/git"
meta-ti-bsp/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb +0 -2
@@ -16,5 +16,3 @@ TARGET_CC_ARCH += "${LDFLAGS}" BRANCH = "master" SRC_URI = "git://git.ti.com/git/jacinto7_multimedia/videnc-test-app.git;protocol=https;branch=${BRANCH}" - -S = "${WORKDIR}/git"
meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc +0 -2
@@ -30,8 +30,6 @@ TI_LINUX_FW_GIT_BRANCH ?= "branch=${BRANCH}" SRC_URI = "${TI_LINUX_FW_GIT_URI};protocol=${TI_LINUX_FW_GIT_PROTOCOL};${TI_LINUX_FW_GIT_BRANCH}" -S = "${WORKDIR}/git" - CLEANBROKEN = "1" # Make sure that lib/firmware, and all its contents are part of the package
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +0 -2
@@ -98,8 +98,6 @@ PKG:${PN} = "u-boot" PKG:${PN}-dev = "u-boot-dev" PKG:${PN}-dbg = "u-boot-dbg" -S = "${WORKDIR}/git" - # Support for secure devices - detailed info is in doc/README.ti-secure inherit ti-secdev
meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb +0 -2
@@ -16,8 +16,6 @@ BRANCH ?= "master" SRC_URI = "git://git.ti.com/git/vpe_tests/vpe_tests.git;protocol=https;branch=${BRANCH}" -S = "${WORKDIR}/git" - FLOATABI = "${@bb.utils.contains("TUNE_FEATURES", "vfp", bb.utils.contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}" # The test application needs additional include headers from the kernel
meta-ti-bsp/recipes-bsp/zephyr-fw/zephyr-openamp-rsc-table-fw.bb +0 -2
@@ -23,8 +23,6 @@ SRCREV = "ef5aec48e589902839ebae7ad753c68cf498c15f" PV = "3.6.0" #PR = "r1" -S = "${WORKDIR}/git" - FW_PLAT = "" FW_PLAT:am62xx = "am62" FW_PLAT:am64xx = "am64"
meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb +0 -2
@@ -13,5 +13,3 @@ BRANCH ?= "master" SRCREV = "ea9938bf9cafd9c0cb05ef060a713ab4ac72270f" SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}" - -S = "${WORKDIR}/git"
meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb +0 -2
@@ -34,8 +34,6 @@ TARGET_PRODUCT = "jacinto6evm" PR = "r3" -S = "${WORKDIR}/git" - EXTRA_OEMAKE += "DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} LIBDIR=${libdir}" do_install() {
meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb +0 -2
@@ -23,8 +23,6 @@ SRC_URI = " \ file://0001-gallium-Fix-build-with-llvm-18-and-19.patch \ " -S = "${WORKDIR}/git" - PACKAGECONFIG:append = " \ ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver', 'pvr', '', d)} \ ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \
meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb +0 -2
@@ -21,8 +21,6 @@ SRC_URI = " \ file://0001-Update-lp_bld_misc.cpp-to-support-llvm-19.patch \ " -S = "${WORKDIR}/git" - PACKAGECONFIG:append = " \ ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver', 'pvr', '', d)} \ ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \
meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb +1 -2
@@ -1,7 +1,7 @@ SUMMARY = "Userspace libraries for PowerVR Rogue GPU on TI SoCs" HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-umlibs" LICENSE = "TI-TFL" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|j742s2|am62xx|am62pxx|j722s"
@@ -11,7 +11,6 @@ PR = "r4" BRANCH = "linuxws/scarthgap/k6.12/${PV}" SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}" SRCREV = "1ed9ee185cd876200e6747192854015b8e94a7b0" -S = "${WORKDIR}/git" TARGET_PRODUCT:j721e = "j721e_linux" TARGET_PRODUCT:j721s2 = "j721s2_linux"
meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb +0 -2
@@ -44,8 +44,6 @@ RDEPENDS:${PN} += "libdrm" RRECOMMENDS:${PN} += "ti-sgx-ddk-km" -S = "${WORKDIR}/git" - EXTRA_OEMAKE += "DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} ${PACKAGECONFIG_CONFARGS}" do_configure[noexec] = "1"
meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc +0 -2
@@ -17,5 +17,3 @@ SRC_URI = "${TI_IPC_GIT_URI};protocol=${TI_IPC_GIT_PROTOCOL};branch=${BRANCH};na SRCREV = "${TI_IPC_SRCREV}" CFLAGS += "-fcommon" - -S = "${WORKDIR}/git"
meta-ti-bsp/recipes-ti/ipc/ti-librpmsg-dma_1.0.bb +0 -2
@@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=744e63d2bb8c6151dcdd97f49aa02c53" SRC_URI = "git://github.com/TexasInstruments/rpmsg-dma.git;protocol=https;branch=main" SRCREV = "609fd72f458ba56f80d06810509ef88d010d2c03" -S = "${WORKDIR}/git" - inherit cmake DEPENDS = "ti-rpmsg-char"
meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc +0 -2
@@ -12,6 +12,4 @@ SRCREV = "09b064c6663ed46e4a402291dd87c8fe96135bd7" PV = "0.6.9+git" -S = "${WORKDIR}/git" - COMPATIBLE_MACHINE = "^(k3)$"
meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb +0 -2
@@ -20,8 +20,6 @@ GIT_SRCREV = "ed6951fd3877c6cac7f1237311f7278ac21634f3" SRC_URI = "${GIT_URI};protocol=${GIT_PROTOCOL};branch=${GIT_BRANCH}" SRCREV = "${GIT_SRCREV}" -S = "${WORKDIR}/git" - do_install() { CP_ARGS="-Prf --preserve=mode,links,timestamps --no-preserve=ownership" install -d ${D}${TI_K3_SECDEV_INSTALL_DIR_RECIPE}
meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb +0 -2
@@ -10,8 +10,6 @@ SRCREV = "0ee619b598d023fffc77679f099bc2a4815510e4" BRANCH = "master" SRC_URI = "git://git.ti.com/git/ti-bt/service-packs.git;protocol=https;branch=${BRANCH}" -S = "${WORKDIR}/git" - do_compile() { : }
meta-ti-extras/recipes-bsp/cc33xx-fw/cc33xx-fw_git.bb +0 -2
@@ -9,8 +9,6 @@ PV = "1.7.0.120" CLEANBROKEN = "1" -S = "${WORKDIR}/git" - do_compile[no_exec] = "1" EXTRA_OEMAKE = "DEST_DIR=${D} BASE_LIB_DIR=${nonarch_base_libdir}"
meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +0 -2
@@ -15,8 +15,6 @@ SRC_URI = "git://git.ti.com/git/ivimm/ipumm.git;protocol=https;branch=master" SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5" -S = "${WORKDIR}/git" - PV = "3.00.15.00" PR = "r7"
meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb +0 -2
@@ -29,8 +29,6 @@ RDEPENDS:${PN}:append = " \ DEPENDS = "ti-cgt-pru-native" -S = "${WORKDIR}/git" - export PRU_CGT = "${TI_CGT_PRU_INSTALL_DIR}" export PRU_SSP = "${S}"
meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb +0 -2
@@ -7,8 +7,6 @@ SRC_URI = "git://git.ti.com/git/wilink8-wlan/wl18xx_fw.git;protocol=https;branch SRCREV = "5ec05007f2662f460f881c5868311fd3ab7e6e71" BRANCH = "master" -S = "${WORKDIR}/git" - CLEANBROKEN = "1" do_compile() {
meta-ti-extras/recipes-connectivity/cc33xx-target-scripts/cc33xx-target-scripts_git.bb +0 -2
@@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=904443cf7fae5c09c3d5f83f8557c265" SRCREV = "4371c93ea01b339f6f73f77d6d6bfcc185def8c0" SRC_URI = "git://git.ti.com/git/cc33xx-wlan/cc33xx-target-scripts.git;protocol=https;branch=master" -S = "${WORKDIR}/git" - FILES:${PN} += "${datadir}/cc33xx/" do_install() {
meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb +0 -2
@@ -10,8 +10,6 @@ inherit update-rc.d SRCREV = "a75f45be2d5c74fc1dd913d08afc30f09a230aa9" SRC_URI = "git://git.ti.com/git/ti-bt/uim.git;branch=master;protocol=https" -S = "${WORKDIR}/git" - do_install() { install -d ${D}${bindir} install -m 0755 uim ${D}${bindir}
meta-ti-extras/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb +0 -2
@@ -11,8 +11,6 @@ SRC_URI = "git://git.ti.com/git/wilink8-wlan/18xx-ti-utils.git;branch=master;pro file://0001-plt.h-Do-not-define-EFUSE_PARAMETER_TYPE_ENMT-type-e.patch \ " -S = "${WORKDIR}/git" - export CROSS_COMPILE = "${TARGET_PREFIX}" EXTRA_OEMAKE = "CFLAGS="${CFLAGS} -I${STAGING_INCDIR}/libnl3/ -DCONFIG_LIBNL32 " \
meta-ti-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.8.1.bb +0 -2
@@ -11,8 +11,6 @@ file://0001-print_stat.sh-replace-system-bin-sh-with-bin-sh.patch \ PR = "r1" -S = "${WORKDIR}/git" - FILES:${PN} += "${datadir}/wl18xx/" do_install() {
meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.15.00.bb +0 -1
@@ -10,7 +10,6 @@ SRC_URI = "git://git.ti.com/git/omapzoom/libdce.git;protocol=https;branch=master SRCREV = "182aea18596eb2b3a82cffc536a6404f5000fb30" -S = "${WORKDIR}/git" EXTRA_OECONF += "IPC_HEADERS=${STAGING_INCDIR}/ti/ipc/mm" COMPATIBLE_HOST ?= "null"
meta-ti-extras/recipes-ti/beagleboard/beaglebone-getting-started.bb +0 -2
@@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f6f02761e31334c48f7021fb94c89aaa" SRCREV = "05bedba192646152b7bc80b0accaea75aef864e5" SRC_URI = "git://github.com/jadonk/beaglebone-getting-started.git;protocol=https;branch=master" -S = "${WORKDIR}/git" - do_install() { install -d ${D}${datadir}/${PN} cp -R --no-dereference --preserve=mode,links ${S}/* ${D}${datadir}/${PN}
meta-ti-extras/recipes-ti/dsplib/dsplib.inc +0 -2
@@ -13,8 +13,6 @@ DEPENDS = "ti-cgt6x-native \ doxygen-native \ swtools" -S = "${WORKDIR}/git" - DSPLIB_GIT_BRANCH = "master" DSPLIB_GIT_PROTOCOL = "https" DSPLIB_GIT_URI = "git://git.ti.com/git/ep-processor-libraries/dsplib.git"
meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc +0 -1
@@ -43,7 +43,6 @@ export JH_ARCH = "${@map_jh_arch(d.getVar('TARGET_ARCH', True), d)}" COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" -S = "${WORKDIR}/git" B = "${S}" DEPENDS = "virtual/kernel dtc-native python3-mako-native python3-mako make-native"
meta-ti-extras/recipes-ti/mathlib/mathlib.inc +0 -2
@@ -13,8 +13,6 @@ DEPENDS = "ti-cgt6x-native \ doxygen-native \ swtools" -S = "${WORKDIR}/git" - MATHLIB_GIT_BRANCH = "master" MATHLIB_GIT_PROTOCOL = "https" MATHLIB_GIT_URI = "git://git.ti.com/git/ep-processor-libraries/mathlib.git"
meta-ti-extras/recipes-ti/swtools/swtools_git.bb +0 -1
@@ -12,7 +12,6 @@ DEPENDS = "ti-cgt6x-native \ PV = "5_0_8" PR = "r3" -S = "${WORKDIR}/git" SWTOOLS_GIT_BRANCH = "master" SWTOOLS_GIT_PROTOCOL = "https"
Signature · 1 line
2.17.1
PATCH 4/7 meta-ti/all: Handle S when building a subdir of the git repo
In reply to Ryan EatmonIf a recipe is fetching an entire git repo and then just building a single dir, then we need to update S to lock into the sub directory. Easiest fix is to simply append the subdir to whatever the system wants to set S to by default.
--- .../recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb | 2 +- .../powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb | 4 ++-- meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb | 2 +- meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb | 2 +- meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb | 2 +- .../recipes-connectivity/cc33calibrator/cc33calibrator_git.bb | 2 +- meta-ti-extras/recipes-connectivity/cc33conf/cc33conf_git.bb | 2 +- meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb | 2 +- meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb | 2 +- meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb | 2 +- .../recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb | 2 +- meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-)
meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb +1 -1
@@ -14,7 +14,7 @@ SRCREV = "83afddf9dbf6a8458267b4dae21ee35bfb11f3d1" SRC_URI = "git://git.ti.com/git/graphics/ti-gc320-driver.git;protocol=https;branch=${BRANCH}" -S = "${WORKDIR}/git/src" +S:append = "/src" EXTRA_OEMAKE += "-f Kbuild AQROOT=${S} KERNEL_DIR=${STAGING_KERNEL_DIR} TOOLCHAIN_PATH=${TOOLCHAIN_PATH} CROSS_COMPILE=${TARGET_PREFIX} ARCH_TYPE=${TARGET_ARCH}"
meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb +2 -2
@@ -1,7 +1,7 @@ SUMMARY = "Userspace libraries for PowerVR Rogue GPU on TI SoCs" HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-umlibs" LICENSE = "TI-TFL" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f" +LIC_FILES_CHKSUM = "file://git/LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f" inherit bin_package
@@ -15,7 +15,7 @@ PR = "r3" BRANCH = "linuxws/kirkstone/k6.1/${PV}" SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}" SRCREV = "0b9e64254269be2fa95c4f3e1dd925d6e4d58199" -S = "${WORKDIR}/git/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}" +S:append = "/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}" TARGET_PRODUCT:j721e = "j721e_linux" TARGET_PRODUCT:j721s2 = "j721s2_linux"
meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb +1 -1
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=9d4316fe434ba450dca4da25348ca5a3" PV:append = "+git" -S = "${WORKDIR}/git/debugss_module/debugss-mod" +S:append = "/debugss_module/debugss-mod" inherit module
meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb +1 -1
@@ -6,7 +6,7 @@ DEPENDS = "libulm ncurses" PR = "${INC_PR}.2" -S = "${WORKDIR}/git/dsptop" +S:append = "/dsptop" DEVICE = "" DEVICE:dra7xx = "DRA7xx"
meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb +1 -1
@@ -9,7 +9,7 @@ REQUIRED_MACHINE_FEATURES = "dsp" DEPENDS = "ti-cgt6x-native" PR = "${INC_PR}.0" -S = "${WORKDIR}/git/dsptop/ulm" +S:append = "/dsptop/ulm" DEVICE = "" DEVICE:dra7xx = "DRA7xx"
meta-ti-extras/recipes-connectivity/cc33calibrator/cc33calibrator_git.bb +1 -1
@@ -9,7 +9,7 @@ PV = "1.0.0.50" DEPENDS = "libnl" -S = "${WORKDIR}/git/cc33calibrator" +S:append = "/cc33calibrator" export CROSS_COMPILE = "${TARGET_PREFIX}"
meta-ti-extras/recipes-connectivity/cc33conf/cc33conf_git.bb +1 -1
@@ -7,7 +7,7 @@ SRC_URI = "git://git.ti.com/git/cc33xx-wlan/cc33xx-utils.git;branch=master;proto PV = "1.7.0.120" -S = "${WORKDIR}/git/cc33conf" +S:append = "/cc33conf" EXTRA_OEMAKE = "CC="${CC}""
meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb +1 -1
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=adc05a1903d3f107f85 SRCREV = "5048b59a444ac59ba7171d6e122d5a84581aebf2" SRC_URI = "git://git.ti.com/git/wilink8-wlan/18xx-ti-utils.git;branch=master;protocol=https" -S = "${WORKDIR}/git/wlconf" +S:append = "/wlconf" EXTRA_OEMAKE = "CC="${CC}""
meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb +1 -1
@@ -14,7 +14,7 @@ SRC_URI:append = " \ file://0001-libbfd.h-suppress-GCC9-Wstringop-truncation.patch;striplevel=2 \ " -S = "${WORKDIR}/git/gdbc6x" +S:append = "/gdbc6x" inherit update-rc.d inherit gettext
meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb +1 -1
@@ -6,7 +6,7 @@ DEPENDS = "ti-xdais ti-framework-components ti-cgt6x-native ti-sysbios ti-xdctoo PR = "${INC_PR}.0" -S = "${WORKDIR}/git/gdbserver-c6x/src" +S:append = "/gdbserver-c6x/src" PLATFORM = "" PLATFORM:dra7xx = "DRA7xx_PLATFORM"
meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb +1 -1
@@ -9,7 +9,7 @@ SRC_URI:append = "\ file://0002-Support-Linux-kernels-v6.6.patch;patchdir=../.. \ " -S = "${WORKDIR}/git/kernel_module/gdbproxy-mod" +S:append = "/kernel_module/gdbproxy-mod" inherit module
meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb +1 -1
@@ -13,7 +13,7 @@ SRCREV = "de7954abab0f0caa8a2c7b53095c30226d901a31" DEPENDS = "ti-cgt6x-native" PR = "r0" -S = "${WORKDIR}/git/aet" +S:append = "/aet" DEVICE = "" DEVICE:dra7xx = "DRA7xx"
Signature · 1 line
2.17.1
PATCH 5/7 meta-ti/all: set S to be in UNPACKDIR in recipes that explicitly set S
In reply to Ryan Eatmon--- meta-ti-extras/recipes-devtools/cuia/cuia_1.0.0.13.bb | 2 +- meta-ti-extras/recipes-ti/bios/ti-sysbios.inc | 2 +- meta-ti-extras/recipes-ti/bios/ti-sysbios_6.76.03.01.bb | 2 +- .../recipes-ti/codec-engine/ti-codec-engine_3.24.00.08.bb | 2 +- .../devtools/gcc-arm-baremetal_7-2018-q2-update.bb | 2 +- meta-ti-extras/recipes-ti/devtools/ti-cg-xml_2.61.00.bb | 2 +- meta-ti-extras/recipes-ti/devtools/ti-cgt-arm_18.12.5.bb | 2 +- meta-ti-extras/recipes-ti/devtools/ti-cgt470.inc | 2 +- meta-ti-extras/recipes-ti/devtools/ti-cgt6x-7_7.4.16.bb | 6 +++--- meta-ti-extras/recipes-ti/devtools/ti-cgt7x_1.2.0.bb | 4 ++-- .../recipes-ti/devtools/ti-xdctools_3.55.02.22.bb | 2 +- .../framework-components/ti-framework-components.inc | 2 +- meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc | 2 +- meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc | 2 +- meta-ti-extras/recipes-ti/xdais/ti-xdais.inc | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-)
meta-ti-extras/recipes-devtools/cuia/cuia_1.0.0.13.bb +1 -1
@@ -9,7 +9,7 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_ccstudio/UIA/SCMCSD SRC_URI[cuia.md5sum] = "ef53989ac70c191841cd656cdc8770be" SRC_URI[cuia.sha256sum] = "f16d138a9146fdc7d52cba77bd30596da65835f6ffe4092baf2b33d1c1a4fb0d" -S = "${WORKDIR}/cuia_${CUIA_PV}${CUIA_PVExtra}" +S = "${UNPACKDIR}/cuia_${CUIA_PV}${CUIA_PVExtra}" CLEANBROKEN = "1"
meta-ti-extras/recipes-ti/bios/ti-sysbios.inc +1 -1
@@ -7,7 +7,7 @@ require ../includes/ti-paths.inc require ../includes/ti-staging.inc require ../includes/ti-eula-unpack.inc -S = "${WORKDIR}/bios_${PV}" +S = "${UNPACKDIR}/bios_${PV}" SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/sysbios/${PV}/exports/bios_setuplinux_${PV}.bin;name=sysbiosbin" BINFILE = "bios_${PV}.bin"
meta-ti-extras/recipes-ti/bios/ti-sysbios_6.76.03.01.bb +1 -1
@@ -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 ${UNPACKDIR}" 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"
meta-ti-extras/recipes-ti/codec-engine/ti-codec-engine_3.24.00.08.bb +1 -1
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://codec_engine_${PV}_Manifest.html;md5=de7d9c2594a6f386 SRC_URI[cetarball.md5sum] = "d66a8ccbd6cdfe9f735af9f4a07e2b9b" SRC_URI[cetarball.sha256sum] = "ed7b7399903bbf76af06ee6457836f344ad75b903618339bae82b3967f27ffa1" -S = "${WORKDIR}/codec_engine_${PV}" +S = "${UNPACKDIR}/codec_engine_${PV}" SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ce/${PV}/exports/codec_engine_${PV},lite.tar.gz;name=cetarball "
meta-ti-extras/recipes-ti/devtools/gcc-arm-baremetal_7-2018-q2-update.bb +1 -1
@@ -10,7 +10,7 @@ SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc SRC_URI[gcc-arm-none.md5sum] = "299ebd3f1c2c90930d28ab82e5d8d6c0" SRC_URI[gcc-arm-none.sha256sum] = "bb17109f0ee697254a5d4ae6e5e01440e3ea8f0277f2e8169bf95d07c7d5fe69" -S = "${WORKDIR}/gcc-arm-none-eabi-7-2018-q2-update" +S = "${UNPACKDIR}/gcc-arm-none-eabi-7-2018-q2-update" # only x86_64 is supported COMPATIBLE_HOST = "x86_64.*-linux"
meta-ti-extras/recipes-ti/devtools/ti-cg-xml_2.61.00.bb +1 -1
@@ -9,7 +9,7 @@ require recipes-ti/includes/ti-unpack.inc PV = "2.61.00" PE = "1" -S = "${WORKDIR}/cg_xml_${PV}" +S = "${UNPACKDIR}/cg_xml_${PV}" SRC_URI = "\ http://software-dl.ti.com/ccs/non-esd/releases/other/applications_packages/cg_xml/cg_xml_v${@'${PV}'.replace('.','_')}/cgxml-${PV}-linux-installer.run;name=cgxmlbin_linux \
meta-ti-extras/recipes-ti/devtools/ti-cgt-arm_18.12.5.bb +1 -1
@@ -8,7 +8,7 @@ require recipes-ti/includes/ti-unpack.inc require recipes-ti/includes/ti-staging.inc require recipes-ti/includes/ti-paths.inc -S = "${WORKDIR}/ti-cgt-arm-${PV}" +S = "${UNPACKDIR}/ti-cgt-arm-${PV}" PE = "1" PR = "r0"
meta-ti-extras/recipes-ti/devtools/ti-cgt470.inc +1 -1
@@ -9,7 +9,7 @@ require ../includes/ti-paths.inc require ../includes/ti-staging.inc require ../includes/ti-eula-unpack.inc -S = "${WORKDIR}/cgt470_${PV}" +S = "${UNPACKDIR}/cgt470_${PV}" SRC_URI = "http://install.source.dir.local/ti_cgt_tms470_${PVwithdots}_setup_linux_x86.bin;name=cgt470bin"
meta-ti-extras/recipes-ti/devtools/ti-cgt6x-7_7.4.16.bb +3 -3
@@ -11,14 +11,14 @@ LICENSE = "TI-TSPA" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b6311962635a4f15630e36ec2d875eca" -S = "${WORKDIR}/c6000_7.4.16" +S = "${UNPACKDIR}/c6000_7.4.16" require recipes-ti/includes/ti-paths.inc require recipes-ti/includes/ti-unpack.inc BINFILE = "ti_cgt_c6000_7.4.16_linux_installer_x86.bin" BINFILE_NAME = "cgt6x_7.4.16_x86_installer" -TI_BIN_UNPK_ARGS = "--prefix ${WORKDIR} --mode unattended" +TI_BIN_UNPK_ARGS = "--prefix ${UNPACKDIR} --mode unattended" TI_BIN_UNPK_CMDS = "" SRC_URI = "http://install.source.dir.local/${BINFILE};name=${BINFILE_NAME}"
@@ -32,7 +32,7 @@ COMPATIBLE_HOST:class-target = "null" do_install() { install -d ${D}/${TI_CGT6X_7_INSTALL_DIR_RECIPE} - cp -rP --preserve=mode,links,timestamps --no-preserve=ownership ${WORKDIR}/c6000_7.4.16/. ${D}/${TI_CGT6X_7_INSTALL_DIR_RECIPE} + cp -rP --preserve=mode,links,timestamps --no-preserve=ownership ${UNPACKDIR}/c6000_7.4.16/. ${D}/${TI_CGT6X_7_INSTALL_DIR_RECIPE} } FILES:${PN} += "${TI_CGT6X_7_INSTALL_DIR_RECIPE}"
meta-ti-extras/recipes-ti/devtools/ti-cgt7x_1.2.0.bb +2 -2
@@ -30,11 +30,11 @@ TI_BIN_UNPK_CMDS = "" SRC_URI[cgt7x_x86_installer.md5sum] = "813840908f333dd2a31f92edec71c1fb" SRC_URI[cgt7x_x86_installer.sha256sum] = "21379811a8857489f72ca8ec45a46eb086ced0bdbb58e78f73a86e63984ab2f5" -S = "${WORKDIR}/c7000_${PV}" +S = "${UNPACKDIR}/c7000_${PV}" do_install() { install -d ${D}/${TI_CGT7X_INSTALL_DIR_RECIPE} - cp -rP --preserve=mode,links,timestamps --no-preserve=ownership ${WORKDIR}/c7000_${PV}/ti-cgt-c7000_${PV}.STS/. ${D}/${TI_CGT7X_INSTALL_DIR_RECIPE} + cp -rP --preserve=mode,links,timestamps --no-preserve=ownership ${UNPACKDIR}/c7000_${PV}/ti-cgt-c7000_${PV}.STS/. ${D}/${TI_CGT7X_INSTALL_DIR_RECIPE} }
meta-ti-extras/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb +1 -1
@@ -70,7 +70,7 @@ COMPATIBLE_HOST:ti-soc = "(.*)" COMPATIBLE_HOST:class-native = "(.*)" COMPATIBLE_HOST:class-nativesdk = "(.*)" -S = "${WORKDIR}/xdctools_${PV}_core" +S = "${UNPACKDIR}/xdctools_${PV}_core" SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/${PV}/exports/xdccore/xdctools_${PV}_core_linux.zip;name=xdczip"
meta-ti-extras/recipes-ti/framework-components/ti-framework-components.inc +1 -1
@@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause" require recipes-ti/includes/ti-paths.inc -S = "${WORKDIR}/framework_components_${PV}" +S = "${UNPACKDIR}/framework_components_${PV}" SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/fc/${PV}/exports/framework_components_${PV},lite.tar.gz;name=fctarball"
meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc +1 -1
@@ -12,7 +12,7 @@ COMPATIBLE_MACHINE = "omap-a15" SRC_URI = "http://software-dl.ti.com/sdoemb/sdoemb_public_sw/imglib/${PV}/exports/${BINFILE};name=imglib" -S = "${WORKDIR}/imglib-c66x-${PV}" +S = "${UNPACKDIR}/imglib-c66x-${PV}" BINFILE = "imglib_c66x_${PV}_Linux.bin" TI_BIN_UNPK_ARGS = "--mode silent --prefix ${S}"
meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc +1 -1
@@ -11,7 +11,7 @@ COMPATIBLE_MACHINE = "omap-a15" SRC_URI = "http://software-dl.ti.com/libs/vlib/${PV}//exports/vlib_c66x_obj_${PV}_Linux.bin;name=vlibbin" -S = "${WORKDIR}/vlib_c66x_${PV}" +S = "${UNPACKDIR}/vlib_c66x_${PV}" BINFILE = "vlib_c66x_obj_${PV}_Linux.bin" TI_BIN_UNPK_ARGS = "--mode silent --prefix ${S}"
meta-ti-extras/recipes-ti/xdais/ti-xdais.inc +1 -1
@@ -6,7 +6,7 @@ SECTION = "devel" require ../includes/ti-paths.inc require ../includes/ti-staging.inc -S = "${WORKDIR}/xdais_${PV}" +S = "${UNPACKDIR}/xdais_${PV}" SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/xdais/${PV}/exports/xdais_${PV}.tar.gz;name=xdaistarball"
Signature · 1 line
2.17.1
PATCH 6/7 meta-ti/all: Remove S where not needed
In reply to Ryan EatmonThe default setting for S works fine, there is no nead to change the value.
--- meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb | 1 - 1 file changed, 1 deletion(-)
meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb +0 -1
@@ -9,7 +9,6 @@ SRC_URI = "http://downloads.ti.com/dsps/dsps_public_sw/glsdk/vpdma-fw/03-2012/ex SRC_URI[dra7xx-evm.md5sum] = "80176df1350c21d9efa90171789c546e" SRC_URI[dra7xx-evm.sha256sum] = "a0b254ffd0c7f481cb3989e632088f5e4a233c73a1c676faa3061721ea60dc90" -S = "${WORKDIR}/vpdma-fw-${PV}" TARGET = "vpdma-1b8.bin" do_install() {
Signature · 1 line
2.17.1
PATCH 7/7 ti-ipc-rtos: Update to handle nested git repos
In reply to Ryan EatmonWhen specifying multiple git repos in the SRC_URI and you want the "secondary" repositories to appear within the directory structure of the primary repository, then we need to make sure that the destsuffix is correct. With the change to calculating the value of S to use BB_GIT_DEFAULT_DESTSUFFIX, we need to make sure that the destsuffix is based on that variable as well.
Also, update the paths for S to be within new source location.
--- meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc +4 -4
@@ -1,7 +1,7 @@ require recipes-ti/includes/ti-paths.inc TI_IPC_EXAMPLES_GIT_URI = "git://git.ti.com/git/ipc/ipc-examples.git" -TI_IPC_EXAMPLES_DEST_SUFFIX = "git/ipc-examples" +TI_IPC_EXAMPLES_DEST_SUFFIX = "${BB_GIT_DEFAULT_DESTSUFFIX}/ipc-examples" TI_IPC_EXAMPLES_GIT_PROTOCOL = "https" TI_IPC_EXAMPLES_GIT_BRANCH = "master" TI_IPC_EXAMPLES_NAME = "ipc-examples"
@@ -13,7 +13,7 @@ branch=${TI_IPC_EXAMPLES_GIT_BRANCH};\ name=${TI_IPC_EXAMPLES_NAME}" TI_IPC_METADATA_GIT_URI = "git://git.ti.com/git/ipc/ipc-metadata.git" -TI_IPC_METADATA_DEST_SUFFIX = "git/ipc-metadata" +TI_IPC_METADATA_DEST_SUFFIX = "${BB_GIT_DEFAULT_DESTSUFFIX}/ipc-metadata" TI_IPC_METADATA_GIT_PROTOCOL = "https" TI_IPC_METADATA_GIT_BRANCH = "master" TI_IPC_METADATA_NAME = "ipc-metadata"
@@ -33,8 +33,8 @@ SRCREV_FORMAT = "default" SRCREV_ipc-metadata = "${TI_IPC_METADATA_SRCREV}" SRCREV_ipc-examples = "${TI_IPC_EXAMPLES_SRCREV}" -S_ipc-examples = "${WORKDIR}/git/ipc-examples" -S_ipc-metadata = "${WORKDIR}/git/ipc-metadata" +S_ipc-examples = "${S}/ipc-examples" +S_ipc-metadata = "${S}/ipc-metadata" RELEASE_TYPE = "GA" RELEASE_SUFFIX = ""
Signature · 1 line
2.17.1