| commit | c4e39cf251604ad522949f0857ae0117194653b4 | [log] [tgz] |
|---|---|---|
| author | Lei YU <mine260309@gmail.com> | Tue Jul 10 13:21:46 2018 +0800 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Mon Jul 16 02:48:29 2018 +0000 |
| tree | f4891543222025dbb18bb90070db25f5111317ba | |
| parent | 65d42a8d271eea42050451e28c0eb859f322b47f [diff] |
linux-aspeed: Fix defconfig SRC_URI
The defconfig in SRC_URI contains ast2400/2500 directory, when working
with devtool, it causes the defconfig to be copied into unexpected
subdirectory in working dir.
Fix it by specifying FILESEXTRAPATHS_prepend and remove the directory
from SRC_URI.
Resolves: openbmc/openbmc#3294
Tested: Build linux-apseed on both Palmetto and Romulus and verify the
defconfig is correctly used.
Build, clean, and rebuild linux-aspeed with devtool and verify
the defconfig is correctly used.
Change-Id: I3ec9ab71f39f26e434f2eb593b27fbb34b69bd54
Signed-off-by: Lei YU <mine260309@gmail.com>
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed/ast2400/defconfig b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2400/defconfig similarity index 100% rename from meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed/ast2400/defconfig rename to meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2400/defconfig
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed/ast2500/defconfig b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2500/defconfig similarity index 100% rename from meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed/ast2500/defconfig rename to meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2500/defconfig
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc index fcc40f1..9343393 100644 --- a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc +++ b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc
@@ -8,8 +8,10 @@ KSRC ?= "git://github.com/openbmc/linux;protocol=git;branch=${KBRANCH}" SRC_URI = "${KSRC}" -SRC_URI_append_ast2400 = " file://ast2400/defconfig" -SRC_URI_append_ast2500 = " file://ast2500/defconfig" +SRC_URI += " file://defconfig" + +FILESEXTRAPATHS_prepend_ast2400 := "${THISDIR}/ast2400:" +FILESEXTRAPATHS_prepend_ast2500 := "${THISDIR}/ast2500:" LINUX_VERSION_EXTENSION ?= "-${SRCREV}"