diff options
| author | Lei YU <mine260309@gmail.com> | 2018-07-10 13:21:46 +0800 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-07-16 02:48:29 +0000 |
| commit | c4e39cf251604ad522949f0857ae0117194653b4 (patch) | |
| tree | f4891543222025dbb18bb90070db25f5111317ba /meta-openbmc-bsp | |
| parent | 65d42a8d271eea42050451e28c0eb859f322b47f (diff) | |
| download | talos-openbmc-c4e39cf251604ad522949f0857ae0117194653b4.tar.gz talos-openbmc-c4e39cf251604ad522949f0857ae0117194653b4.zip | |
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>
Diffstat (limited to 'meta-openbmc-bsp')
| -rw-r--r-- | meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2400/defconfig (renamed from meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed/ast2400/defconfig) | 0 | ||||
| -rwxr-xr-x | meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/ast2500/defconfig (renamed from meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed/ast2500/defconfig) | 0 | ||||
| -rw-r--r-- | meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc | 6 |
3 files changed, 4 insertions, 2 deletions
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 index 01272e788..01272e788 100644 --- a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed/ast2400/defconfig +++ b/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 index bab5f07a0..bab5f07a0 100755 --- a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed/ast2500/defconfig +++ b/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 fcc40f1b1..93433939d 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 @@ KCONFIG_MODE="--alldefconfig" 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}" |
