From 529bd52c5def63a02755640cb990c0f936c2b8a3 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 4 Nov 2022 22:46:29 +0000 Subject: linux-ti-mainline: unbreak devtool devtool has a long-standing bug where it cannot handle references to ${WORKDIR} due to externalsrc: https://bugzilla.yoctoproject.org/show_bug.cgi?id=12677 linux-ti-mainline clones additional ti-upstream-tools repo alongside the kernel sources into ${WORKDIR}, which exposes this devtool bug. Work around the issue by moving ti-upstream-tools inside the kernel source tree, i.e. inside ${S} Reported-by: Radoslav Pesek Signed-off-by: Denys Dmytriyenko Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko Signed-off-by: Ryan Eatmon --- meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb') diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb index 0fe54cda..6c1b1825 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" inherit kernel -DEFCONFIG_BUILDER = "${WORKDIR}/ti-upstream-tools/config/defconfig_builder.sh" +DEFCONFIG_BUILDER = "${S}/ti-upstream-tools/config/defconfig_builder.sh" require recipes-kernel/linux/setup-defconfig.inc require recipes-kernel/linux/kernel-rdepends.inc require recipes-kernel/linux/ti-kernel.inc @@ -32,7 +32,7 @@ KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.g KERNEL_GIT_PROTOCOL = "https" SRC_URI += " \ ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH};name=linux \ - git://git.ti.com/git/ti-linux-kernel/ti-upstream-tools.git;branch=${TOOLS_BRANCH};protocol=${KERNEL_GIT_PROTOCOL};name=ti-upstream-tools;destsuffix=ti-upstream-tools \ + git://git.ti.com/git/ti-linux-kernel/ti-upstream-tools.git;branch=${TOOLS_BRANCH};protocol=${KERNEL_GIT_PROTOCOL};name=ti-upstream-tools;destsuffix=git/ti-upstream-tools \ file://defconfig \ " @@ -43,7 +43,7 @@ KERNEL_DEVICETREE = "" kernel_do_compile:append() { oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} - oe_runmake -C ${WORKDIR}/ti-upstream-tools LINUX=${S} DTC=${B}/scripts/dtc/dtc O=${B} CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} + oe_runmake -C ${S}/ti-upstream-tools LINUX=${S} DTC=${B}/scripts/dtc/dtc O=${B} CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} } do_install:append() { -- cgit v1.2.3-54-g00ecf