diff options
| author | stk <stk@ableton.com> | 2018-05-02 12:07:33 +0200 |
|---|---|---|
| committer | stk <stk@ableton.com> | 2018-05-02 13:42:15 +0200 |
| commit | 682240a04779f6ae24144940acbf6e640f56cac2 (patch) | |
| tree | b8bbe8b606626180583c87d7eb3fce5289f77cbc /mk | |
| parent | 2773eda14966d7eb0db71f0452aeb649b9d9ec42 (diff) | |
Fix bug related to renaming of ADK_TARGET_KERNEL_*
I'm not sure if this correct, or complete. I only know that it's the diff hunk
in mk/kernel-build.mk that we need. The other ones were found by searching for
ADK_TARGET_KERNEL_USE_CUSTOMCONFIG; I suspect these code blocks need to be
duplicated for ADK_TARGET_WALDUX_KERNEL_USE_CUSTOMCONFIG?
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 8 | ||||
| -rw-r--r-- | mk/kernel-build.mk | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mk/build.mk b/mk/build.mk index 5680a5be9..014ba470c 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -249,13 +249,13 @@ kernelconfig: ${KERNEL_MAKE_OPTS} \ menuconfig -ifeq ($(ADK_TARGET_KERNEL_USE_CUSTOMCONFIG),y) +ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG),y) savekconfig: - @echo "Saving kernel configuration to $(ADK_TOPDIR)/$(ADK_TARGET_KERNEL_CUSTOMCONFIG_PATH)" - $(CP) $(LINUX_DIR)/.config $(ADK_TOPDIR)/$(ADK_TARGET_KERNEL_CUSTOMCONFIG_PATH) + @echo "Saving kernel configuration to $(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH)" + $(CP) $(LINUX_DIR)/.config $(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH) else savekconfig: - @echo "You have to enable ADK_TARGET_KERNEL_USE_CUSTOMCONFIG to be able to save the current kernel configuration." + @echo "You have to enable ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG to be able to save the current kernel configuration." endif diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index fb43cd930..fb7ffc955 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -80,7 +80,7 @@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG)$(ADK_TARGET_WALDUX_KERNEL_USE_DEFCONFIG),y) ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} $(ADK_TARGET_KERNEL_DEFCONFIG) $(MAKE_TRACE) else ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG),y) - @if [ ! -f $(ADK_TOPDIR)/$(ADK_TARGET_KERNEL_CUSTOMCONFIG_PATH) ];then \ + @if [ ! -f $(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH) ];then \ echo "no kernel configuration found in $(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH)"; \ exit 1; \ fi |