From 422a4e2883ea3be837411b0e65268816e036c087 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 20 Mar 2012 17:46:41 +0100
Subject: new kernels

---
 mk/kernel-ver.mk | 19 +++++++++++++++----
 mk/kernel.mk     |  6 +++---
 mk/linux.mk      |  4 +---
 3 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'mk')

diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index e64377cac..c0b93d549 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -1,25 +1,36 @@
 ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y)
 KERNEL_VERSION:=	2.6.39.4
+KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		a17c748c2070168f1e784e9605ca043d
 endif
 ifeq ($(ADK_KERNEL_VERSION_2_6_39_4),y)
 KERNEL_VERSION:=	2.6.39.4
+KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		a17c748c2070168f1e784e9605ca043d
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_0_22),y)
-KERNEL_VERSION:=	3.0.22
+ifeq ($(ADK_KERNEL_VERSION_3_0_25),y)
+KERNEL_VERSION:=	3.0.25
+KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		0cb510da24d9cf7bd17091ed49176178
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_1_10),y)
 KERNEL_VERSION:=	3.1.10
+KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		3649bdaa50ffd9114cc16486ec54d83a
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_2_10),y)
-KERNEL_VERSION:=	3.2.10
+ifeq ($(ADK_KERNEL_VERSION_3_2_12),y)
+KERNEL_VERSION:=	3.2.12
+KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		9c9ab852e069fef357e2a29a98cf03e7
 endif
+ifeq ($(ADK_KERNEL_VERSION_3_3),y)
+KERNEL_VERSION:=	3.3
+KERNEL_MOD_VERSION:=	3.3.0
+KERNEL_RELEASE:=	1
+KERNEL_MD5SUM:=		98a6cdd7d082b7ea72df9c89842bac74
+endif
diff --git a/mk/kernel.mk b/mk/kernel.mk
index d5288cd7e..01c0813ba 100644
--- a/mk/kernel.mk
+++ b/mk/kernel.mk
@@ -2,7 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 LINUX_KMOD_SUFFIX=ko
-MODULES_SUBDIR := lib/modules/$(KERNEL_VERSION)
+MODULES_SUBDIR := lib/modules/$(KERNEL_MOD_VERSION)
 LINUX_BUILD_DIR := $(BUILD_DIR)/linux-$(ADK_TARGET_ARCH)
 KMOD_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
 MODULES_DIR := $(LINUX_BUILD_DIR)/modules/$(MODULES_SUBDIR)
@@ -55,8 +55,8 @@ $$(PKG_$(1)):
 	    $(KERNEL_VERSION)-$(KERNEL_RELEASE) $(CPU_ARCH)
 	echo "Depends: $$(IDEPENDK_$(1))" >> $$(I_$(1))/CONTROL/control
 ifneq ($(strip $(3)),)
-	mkdir -p $$(I_$(1))/lib/modules/$(KERNEL_VERSION)
-	$(CP) $(foreach mod,$(3),$(mod).$(LINUX_KMOD_SUFFIX)) $$(I_$(1))/lib/modules/$(KERNEL_VERSION)
+	mkdir -p $$(I_$(1))/lib/modules/$(KERNEL_MOD_VERSION)
+	$(CP) $(foreach mod,$(3),$(mod).$(LINUX_KMOD_SUFFIX)) $$(I_$(1))/lib/modules/$(KERNEL_MOD_VERSION)
 ifneq ($(4),)
 	mkdir -p $$(I_$(1))/etc/modules.d
 	for module in $(notdir $(3)); do \
diff --git a/mk/linux.mk b/mk/linux.mk
index 8cc68467f..669d595f8 100644
--- a/mk/linux.mk
+++ b/mk/linux.mk
@@ -5,7 +5,5 @@ PKG_NAME:=	linux
 PKG_VERSION:=	$(KERNEL_VERSION)
 PKG_RELEASE:=	$(KERNEL_RELEASE)
 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)/}
+PKG_SITES:=  	${MASTER_SITE_KERNEL:=kernel/v3.0/}
 DISTFILES=	$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-- 
cgit v1.2.3