From b047da059a1042a27ba68b1bdc50dd187bd362f4 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 4 Dec 2009 18:10:24 +0100
Subject: update kernel to 2.6.32

- update some applications
  asterisk, curl, strace, radvd, rpm
- fix allconfig
- /dev for full build seems to need more than 64k
---
 mk/build.mk   | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 mk/modules.mk |  5 -----
 2 files changed, 45 insertions(+), 6 deletions(-)

(limited to 'mk')

diff --git a/mk/build.mk b/mk/build.mk
index aa97026cb..34ae7935a 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -13,7 +13,24 @@ CONFIG = config
 DEFCONFIG= 		ADK_DEVELSYSTEM=n \
 			ADK_DEBUG=n \
 			ADK_STATIC=n \
-			ADK_FORCE_PARALLEL=n
+			ADK_FORCE_PARALLEL=n \
+			BUSYBOX_SELINUX=n \
+			BUSYBOX_LOCALE_SUPPORT=n \
+			BUSYBOX_FEATURE_PREFER_APPLETS=n \
+			BUSYBOX_FEATURE_SUID=n \
+			BUSYBOX_SELINUXENABLED=n \
+			BUSYBOX_FEATURE_INSTALLER=n \
+			BUSYBOX_PAM=n \
+			BUSYBOX_FLASH_LOCK=n \
+			BUSYBOX_FLASH_UNLOCK=n \
+			BUSYBOX_FLASH_ERASEALL=n \
+			BUSYBOX_PIE=n \
+			BUSYBOX_DEBUG=n \
+			BUSYBOX_NOMMU=n \
+			BUSYBOX_WERROR=n \
+			BUSYBOX_STATIC=n \
+			ADK_KERNEL_RT2X00_DEBUG=n \
+			ADK_KERNEL_ATH5K_DEBUG=n
 
 noconfig_targets:=	menuconfig \
 			_config \
@@ -227,7 +244,26 @@ modconfig:
 			echo $$symbol >> $(TOPDIR)/all.config; \
 		done; \
 	fi
+	@if [ ! -z "$(FS)" ];then \
+		grep "^config" target/Config.in \
+			|grep -i "$(FS)" \
+			|sed -e "s#^config \(.*\)#\1=y#" \
+			>> $(TOPDIR)/all.config; \
+	fi
+	@if [ ! -z "$(PKG)" ];then \
+		grep "^config" target/Config.in \
+			|grep -i "$(PKG)" \
+			|sed -e "s#^config \(.*\)#\1=y#" \
+			>> $(TOPDIR)/all.config; \
+	fi
+	@if [ ! -z "$(LIBC)" ];then \
+		grep "^config" target/Config.in \
+			|grep -i "$(LIBC)" \
+			|sed -e "s#^config \(.*\)#\1=y#" \
+			>> $(TOPDIR)/all.config; \
+	fi
 ifneq (,$(filter %_qemu,${TARGET}))
+
 	@echo ADK_LINUX_QEMU=y >> $(TOPDIR)/all.config
 endif
 ifneq (,$(filter %_rescue,${TARGET}))
@@ -248,6 +284,14 @@ _mconfig: ${CONFIG}/conf _mconfig2 _config
 _mconfig2: ${CONFIG}/conf modconfig
 	@${CONFIG}/conf -m ${RCONFIG} >/dev/null
 
+# build all targets and combinations
+bulk:
+	mkdir $(TOPDIR)/bulk
+	$(MAKE) TARGET=alix1c LIBC=uclibc FS=nfsroot PKG=ipkg allmodconfig
+	$(MAKE) v
+	$(CP) $(BIN_DIR) $(TOPDIR)/bulk
+	$(MAKE) cleantarget
+	
 distclean:
 	@$(MAKE) -C $(CONFIG) clean
 	@rm -rf $(BUILD_DIR) $(TOOLS_BUILD_DIR) $(BIN_DIR) $(DISTDIR) \
diff --git a/mk/modules.mk b/mk/modules.mk
index 19ab1b14d..cbaaca78f 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -58,7 +58,6 @@ $(eval $(call KMOD_template,ATH5K,mac80211-ath5k,\
 ,20, kmod-led-class))
 
 $(eval $(call KMOD_template,RT2X00,mac80211-rt2x00,\
-	$(MODULES_DIR)/kernel/drivers/input/input-polldev \
 	$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00lib \
 	$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00pci \
 ,17))
@@ -490,10 +489,6 @@ $(eval $(call KMOD_template,IP_NF_TARGET_NETMAP,nf-ip-target-netmap,\
 	$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_NETMAP \
 ,65))
 
-$(eval $(call KMOD_template,IP_NF_TARGET_SAME,nf-ip-target-same,\
-	$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_SAME \
-,65))
-
 #
 # Mangle
 #
-- 
cgit v1.2.3