From bef2bf9b155bb0eebc5439e8f2a3a3716f250725 Mon Sep 17 00:00:00 2001 From: Sai Hari Chandana Kalluri Date: Tue, 9 Jun 2020 15:15:55 -0700 Subject: u-boot-xlnx.inc: Explicitly set builddir path Previous Yocto releases, builddir path was set in u-boot.inc within poky layer. Since u-boot-xlnx.inc inherits u-boot.inc, makefile configures and compiles u-boot-xlnx in a build directory ( set by B) that is not the source directory. In Dunfell, build directory path is moved from u-boot.inc to u-boot-common.inc which is not inherited in u-boot-xlnx recipes. As a result, during the build, makefile configures and compiles u-boot-xlnx from source directory resulting in the following error: tmp/work/zcu102_zynqmp-xilinx-linux/u-boot-xlnx/v2020.01-xilinx-v2020.1+gitAUTOINC+86c84c0d0f-r0/git is not clean, please run 'make mrproper' To fix the error, set builddir path (B) explicitly within u-boot-xlnx.inc Signed-off-by: Sai Hari Chandana Kalluri --- meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx.inc b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx.inc index 40ca73ef..4b8c4efe 100644 --- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx.inc +++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx.inc @@ -13,6 +13,7 @@ UBRANCHARG = "${@['nobranch=1', 'branch=${UBRANCH}'][d.getVar('UBRANCH', True) ! SRC_URI = "${UBOOTURI};${UBRANCHARG}" S = "${WORKDIR}/git" +B = "${WORKDIR}/build" FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot:" -- cgit v1.2.3-54-g00ecf