From 1e9abb5e1e930fb43549575ac0708b753b3c7e80 Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sun, 23 Jan 2011 15:01:12 +0100 Subject: Toolchain: linux headers: add linux-2.6.36.3 and convert to use download and decrompress macros Signed-off-by: Abdoulaye Walsimou Gaye --- kconfig/linux-kconfigs/linux-2.6.36.kconfig | 3 +++ kconfig/linux.kconfig | 20 ++++++++++++++++++-- mk/kernel-headers.mk | 12 ++++++------ 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/kconfig/linux-kconfigs/linux-2.6.36.kconfig b/kconfig/linux-kconfigs/linux-2.6.36.kconfig index da0c7ff..e56bc92 100644 --- a/kconfig/linux-kconfigs/linux-2.6.36.kconfig +++ b/kconfig/linux-kconfigs/linux-2.6.36.kconfig @@ -28,6 +28,8 @@ choice help Linux v2.6.36.x series exact version to use. + config EMBTK_LINUX_VERSION_2_6_36_3 + bool "linux-2.6.36.3" config EMBTK_LINUX_VERSION_2_6_36_2 bool "linux-2.6.36.2" config EMBTK_LINUX_VERSION_2_6_36_1 @@ -38,6 +40,7 @@ endchoice config EMBTK_LINUX_VERSION_STRING string + default "2.6.36.3" if EMBTK_LINUX_VERSION_2_6_36_3 default "2.6.36.2" if EMBTK_LINUX_VERSION_2_6_36_2 default "2.6.36.1" if EMBTK_LINUX_VERSION_2_6_36_1 default "2.6.36" if EMBTK_LINUX_VERSION_2_6_36 diff --git a/kconfig/linux.kconfig b/kconfig/linux.kconfig index 012be2b..d5fedf7 100644 --- a/kconfig/linux.kconfig +++ b/kconfig/linux.kconfig @@ -31,42 +31,52 @@ choice config EMBTK_LINUX_VERSION_2_6_36_X bool "linux-2.6.36.x" + select EMBTK_LINUX_PKG_IS_TARBZ2 help Use a linux-2.6.36.x version. config EMBTK_LINUX_VERSION_2_6_35_X bool "linux-2.6.35.x" + select EMBTK_LINUX_PKG_IS_TARBZ2 help Use a linux-2.6.35.x version. config EMBTK_LINUX_VERSION_2_6_34_X bool "linux-2.6.34.x" + select EMBTK_LINUX_PKG_IS_TARBZ2 help Use a linux-2.6.34.x version. config EMBTK_LINUX_VERSION_2_6_33_X bool "linux-2.6.33.x" + select EMBTK_LINUX_PKG_IS_TARBZ2 help Use a linux-2.6.33.x version. config EMBTK_LINUX_VERSION_2_6_32_X bool "linux-2.6.32.x" + select EMBTK_LINUX_PKG_IS_TARBZ2 help Use a linux-2.6.32.x version. config EMBTK_LINUX_VERSION_2_6_31_X bool "linux-2.6.31.x" + select EMBTK_LINUX_PKG_IS_TARBZ2 help Use a linux-2.6.31.x version. config EMBTK_LINUX_VERSION_2_6_30_X bool "linux-2.6.30.x" + select EMBTK_LINUX_PKG_IS_TARBZ2 help Use a linux-2.6.30.x version. config EMBTK_LINUX_VERSION_2_6_29_X bool "linux-2.6.29.x" + select EMBTK_LINUX_PKG_IS_TARBZ2 help Use a linux-2.6.29.x version. config EMBTK_LINUX_VERSION_2_6_28_X bool "linux-2.6.28.x" + select EMBTK_LINUX_PKG_IS_TARBZ2 help Use a linux-2.6.28.x version. config EMBTK_LINUX_VERSION_2_6_27_X bool "linux-2.6.27.x" + select EMBTK_LINUX_PKG_IS_TARBZ2 help Use a linux-2.6.27.x version. endchoice @@ -114,11 +124,17 @@ endif config EMBTK_LINUX_HAVE_MIRROR bool "Use a linux mirror" help - specify an alternate location where to download linux sources + specify an alternate location where to download linux sources. config EMBTK_LINUX_HAVE_MIRROR_SITE depends on EMBTK_LINUX_HAVE_MIRROR string "Mirror site" default "ftp://ftp.free.fr/pub/linux/kernel/v2.6" help - specify an alternate location where to download linux sources + specify an alternate location where to download linux sources +config EMBTK_LINUX_NEED_PATCH + bool +config EMBTK_LINUX_PKG_IS_TARGZ + bool +config EMBTK_LINUX_PKG_IS_TARBZ2 + bool diff --git a/mk/kernel-headers.mk b/mk/kernel-headers.mk index 4d96a5d..7b025d4 100644 --- a/mk/kernel-headers.mk +++ b/mk/kernel-headers.mk @@ -23,13 +23,16 @@ # \date May 2009 ################################################################################ -LINUX_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_LINUX_VERSION_STRING))) +LINUX_NAME := linux +LINUX_VERSION := $(call EMBTK_GET_PKG_VERSION,LINUX) ifeq ($(CONFIG_EMBTK_LINUX_HAVE_MIRROR),y) LINUX_SITE := $(subst ",,$(strip $(CONFIG_EMBTK_LINUX_HAVE_MIRROR_SITE))) else LINUX_SITE := http://ftp.kernel.org/pub/linux/kernel/v2.6 endif +LINUX_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror LINUX_PACKAGE := linux-$(LINUX_VERSION).tar.bz2 +LINUX_SRC_DIR := $(TOOLS_BUILD)/linux-$(LINUX_VERSION) LINUX_BUILD_DIR := $(TOOLS_BUILD)/linux-$(LINUX_VERSION) kernel-headers_install: download_linux $(LINUX_BUILD_DIR)/.decompressed @@ -41,11 +44,8 @@ kernel-headers_install: download_linux $(LINUX_BUILD_DIR)/.decompressed $(MAKE) -C $(LINUX_BUILD_DIR) headers_install INSTALL_HDR_PATH=$(HOSTTOOLS)/usr download_linux: - @test -e $(DOWNLOAD_DIR)/$(LINUX_PACKAGE) || \ - wget -O $(DOWNLOAD_DIR)/$(LINUX_PACKAGE) $(LINUX_SITE)/$(LINUX_PACKAGE) + $(call EMBTK_DOWNLOAD_PKG,LINUX) $(LINUX_BUILD_DIR)/.decompressed: - $(call EMBTK_DECOMPRESS_MSG,$(LINUX_PACKAGE)) - @tar -C $(TOOLS_BUILD) -xjf $(DOWNLOAD_DIR)/$(LINUX_PACKAGE) - @touch $@ + $(call EMBTK_DECOMPRESS_HOSTPKG,LINUX) -- cgit v1.2.3