diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2020-08-19 00:07:31 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2020-08-19 00:07:31 +0800 |
| commit | 468a72df81e56ab8ec3b7822d741849632847f9a (patch) | |
| tree | a074fca2da0f336190fe2f3f6c2f4f761d490c75 | |
| parent | 4e2906759f69a1d0dea5b057c3faf850ad7ba1ea (diff) | |
| download | goldfish-modules-468a72df81e56ab8ec3b7822d741849632847f9a.tar.gz | |
build.config*: set KERNEL_DIR explicitly
to work with the build.config* in the KERNEL_DIR
when the setting of KERNEL_DIR removed from build.config.common
Test: build test with the config of goldfish-modules/build.config.goldfish.aarch64
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: I1cf11b33fb367179648a4fd77a872868121661e4
| -rw-r--r-- | build.config.goldfish | 6 | ||||
| -rw-r--r-- | build.config.goldfish.aarch64 | 6 | ||||
| -rw-r--r-- | build.config.goldfish.x86_64 | 6 |
3 files changed, 10 insertions, 8 deletions
diff --git a/build.config.goldfish b/build.config.goldfish index 3f961ba..e8ceb0a 100644 --- a/build.config.goldfish +++ b/build.config.goldfish @@ -1,5 +1,7 @@ -. ${ROOT_DIR}/common/build.config.common -. ${ROOT_DIR}/common/build.config.gki +KERNEL_DIR=common + +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki EXT_MODULES="goldfish-modules" FRAGMENT_DEFCONFIG_PATH="${ROOT_DIR}/goldfish-modules/goldfish_defconfig.fragment" diff --git a/build.config.goldfish.aarch64 b/build.config.goldfish.aarch64 index a0b0c36..c2469d7 100644 --- a/build.config.goldfish.aarch64 +++ b/build.config.goldfish.aarch64 @@ -1,9 +1,9 @@ . ${ROOT_DIR}/goldfish-modules/build.config.goldfish -. ${ROOT_DIR}/common/build.config.aarch64 +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64 DEFCONFIG=goldfish_aarch64_defconfig -DEFCONFIG_PATH="${ROOT_DIR}/common/arch/arm64/configs" -PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${DEFCONFIG_PATH}/${DEFCONFIG} ${ROOT_DIR}/common/scripts/kconfig/merge_config.sh -m -r ${DEFCONFIG_PATH}/gki_defconfig ${FRAGMENT_DEFCONFIG_PATH}" +DEFCONFIG_PATH="${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs" +PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${DEFCONFIG_PATH}/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${DEFCONFIG_PATH}/gki_defconfig ${FRAGMENT_DEFCONFIG_PATH}" POST_DEFCONFIG_CMDS="rm ${DEFCONFIG_PATH}/${DEFCONFIG}" # Not building/saving any kernel images. This build step is meant purely to generate the .kos. diff --git a/build.config.goldfish.x86_64 b/build.config.goldfish.x86_64 index 365c900..ac524ac 100644 --- a/build.config.goldfish.x86_64 +++ b/build.config.goldfish.x86_64 @@ -1,9 +1,9 @@ . ${ROOT_DIR}/goldfish-modules/build.config.goldfish -. ${ROOT_DIR}/common/build.config.x86_64 +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64 DEFCONFIG=goldfish_86_64_defconfig -DEFCONFIG_PATH="${ROOT_DIR}/common/arch/x86/configs" -PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${DEFCONFIG_PATH}/${DEFCONFIG} ${ROOT_DIR}/common/scripts/kconfig/merge_config.sh -m -r ${DEFCONFIG_PATH}/gki_defconfig ${FRAGMENT_DEFCONFIG_PATH}" +DEFCONFIG_PATH="${ROOT_DIR}/${KERNEL_DIR}/arch/x86/configs" +PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${DEFCONFIG_PATH}/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${DEFCONFIG_PATH}/gki_defconfig ${FRAGMENT_DEFCONFIG_PATH}" POST_DEFCONFIG_CMDS="rm ${DEFCONFIG_PATH}/${DEFCONFIG}" # Not building/saving any kernel images. This build step is meant purely to generate the .kos. |