From f7fb97a8e2160a791487f5a2cd9f744b04cf39bb Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 25 Feb 2015 19:26:26 +0100
Subject: always use .defconfig, otherwise make menuconfig and ADK_APPLIANCE
 does not work

---
 mk/build.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'mk/build.mk')

diff --git a/mk/build.mk b/mk/build.mk
index 214c52e88..0e41b0002 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -458,9 +458,7 @@ endif
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(ADK_TOPDIR)/.defconfig; \
 	fi
-	@if [ ! -z "$(ADK_APPLIANCE)" ];then \
-		$(CONFIG)/conf --defconfig=.defconfig $(CONFIG_CONFIG_IN); \
-	fi
+	@$(CONFIG)/conf --defconfig=.defconfig $(CONFIG_CONFIG_IN)
 
 allconfig:
 ifeq (${OStype},Linux)
-- 
cgit v1.2.3


From 8c769691094121b098709c66001c5aca6d34f0bb Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Thu, 26 Feb 2015 20:51:09 +0100
Subject: Revert "always use .defconfig, otherwise make menuconfig and
 ADK_APPLIANCE does not work"

This reverts commit f7fb97a8e2160a791487f5a2cd9f744b04cf39bb.
---
 mk/build.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'mk/build.mk')

diff --git a/mk/build.mk b/mk/build.mk
index 0e41b0002..214c52e88 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -458,7 +458,9 @@ endif
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(ADK_TOPDIR)/.defconfig; \
 	fi
-	@$(CONFIG)/conf --defconfig=.defconfig $(CONFIG_CONFIG_IN)
+	@if [ ! -z "$(ADK_APPLIANCE)" ];then \
+		$(CONFIG)/conf --defconfig=.defconfig $(CONFIG_CONFIG_IN); \
+	fi
 
 allconfig:
 ifeq (${OStype},Linux)
-- 
cgit v1.2.3


From a1f303c316be60e5a282a6a6a27726152b529a51 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil.sutter@viprinet.com>
Date: Tue, 24 Feb 2015 12:46:47 +0100
Subject: extend KERNEL_MAKE_OPTS by the target directory

This change is straightforward but in toolchain/kernel-headers/Makefile
which seems to be called before ${BUILD_DIR}/linux symlink exists.
Therefore define LINUX_DIR to the correct value in between inclusion of
vars.mk (through rules.mk) and kernel-vars.mk.
---
 mk/build.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mk/build.mk')

diff --git a/mk/build.mk b/mk/build.mk
index 214c52e88..29c99bd6f 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -223,7 +223,7 @@ kernelconfig:
 	${KERNEL_MAKE_ENV} ${MAKE} \
 		ARCH=$(ADK_TARGET_ARCH) \
 		${KERNEL_MAKE_OPTS} \
-		-C $(BUILD_DIR)/linux menuconfig
+		menuconfig
 
 # create a new package from package/.template
 newpackage:
-- 
cgit v1.2.3


From 52031164db0fce19696de66cfe0cb1c92f9cb954 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 1 Mar 2015 13:36:43 +0100
Subject: match exactly

---
 mk/build.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mk/build.mk')

diff --git a/mk/build.mk b/mk/build.mk
index 29c99bd6f..d8d1a047c 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -514,7 +514,7 @@ endif
 	@if [ ! -z "$(ADK_TARGET_SYSTEM)" ];then \
 		system=$$(echo "$(ADK_TARGET_SYSTEM)" |sed -e "s/-/_/g"); \
 		grep -h "^config" target/*/Config.in.systems \
-			|grep -i "$$system" \
+			|grep -i "$$system$$" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(ADK_TOPDIR)/all.config; \
 	fi
-- 
cgit v1.2.3