From ec437ac8b251eca744d484207a7858eb8b70362a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 15 Oct 2011 20:22:08 +0200
Subject: allow more than one kernel to be configured, add shuttle pc support

---
 mk/build.mk      | 3 +++
 mk/kernel-ver.mk | 7 +++++++
 mk/linux.mk      | 6 ++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'mk')

diff --git a/mk/build.mk b/mk/build.mk
index ed1165050..cb531addb 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -95,6 +95,9 @@ POSTCONFIG=		-@\
 			touch .rebuild.bkeymaps;\
 			rebuild=1;\
 		fi; \
+		if [ "$$(grep ^ADK_KERNEL_VERSION .config|md5sum)" != "$$(grep ^ADK_KERNEL_VERSION .config.old|md5sum)" ];then \
+			make cleankernel ;\
+		fi; \
 		if [ $$rebuild -eq 1 ];then \
 			cp .config .config.old;\
 		fi; \
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 46e8e9e5c..6a6202fbc 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -1,3 +1,10 @@
+ifeq ($(ADK_KERNEL_VERSION_2_6_39),y)
 KERNEL_VERSION:=	2.6.39
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		1aab7a741abe08d42e8eccf20de61e05
+endif
+ifeq ($(ADK_KERNEL_VERSION_3_0_4),y)
+KERNEL_VERSION:=	3.0.4
+KERNEL_RELEASE:=	1
+KERNEL_MD5SUM:=		dff86c657cabe813bda84c72bfb93ae8
+endif
diff --git a/mk/linux.mk b/mk/linux.mk
index c880d8c2a..8cc68467f 100644
--- a/mk/linux.mk
+++ b/mk/linux.mk
@@ -4,6 +4,8 @@
 PKG_NAME:=	linux
 PKG_VERSION:=	$(KERNEL_VERSION)
 PKG_RELEASE:=	$(KERNEL_RELEASE)
-PKG_MD5SUM=	$(KERNEL_MD5SUM)
-PKG_SITES=  	${MASTER_SITE_KERNEL:=kernel/v2.6/}
+PKG_MD5SUM:=	$(KERNEL_MD5SUM)
+PKG_VERSION_MAJOR:=$(word 1,$(subst ., ,$(subst -, ,$(PKG_VERSION))))
+PKG_VERSION_MINOR:=$(word 2,$(subst ., ,$(subst -, ,$(PKG_VERSION))))
+PKG_SITES:=  	${MASTER_SITE_KERNEL:=kernel/v$(PKG_VERSION_MAJOR).$(PKG_VERSION_MINOR)/}
 DISTFILES=	$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-- 
cgit v1.2.3