From: Felix Fietkau Date: Mon, 25 Dec 2006 09:12:57 +0000 (+0000) Subject: store the default kernel version for our ports in a single place (target makefiles... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=35bccdd4baa9ee6378762ed5b16c01a2543d0dcc;p=openwrt%2Fstaging%2Fnbd.git store the default kernel version for our ports in a single place (target makefiles can still override it if necessary) SVN-Revision: 5899 --- diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 6643d46586..6d9c9d978d 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -33,8 +33,8 @@ ifeq ($(DUMP),1) else all: compile endif -KERNEL:=2.$(word 2,$(subst ., ,$(strip $(LINUX_VERSION)))) +include $(INCLUDE_DIR)/kernel-version.mk include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/kernel.mk diff --git a/include/kernel-version.mk b/include/kernel-version.mk new file mode 100644 index 0000000000..af457a2485 --- /dev/null +++ b/include/kernel-version.mk @@ -0,0 +1,15 @@ +# Use the default kernel version if the Makefile doesn't override it + +ifeq ($(LINUX_VERSION),) + ifeq ($(KERNEL),2.4) + LINUX_VERSION:=2.4.33.4 + LINUX_RELEASE:=1 + LINUX_KERNEL_MD5SUM:=aca0257549c385a227088ad8853a72a2 + else + LINUX_VERSION:=2.6.19.1 + LINUX_RELEASE:=1 + LINUX_KERNEL_MD5SUM:=2ab08fdfddc00e09b3d5bc7397d3c8be + endif +endif +KERNEL:=2.$(word 2,$(subst ., ,$(strip $(LINUX_VERSION)))) + diff --git a/target/linux/ar7-2.4/Makefile b/target/linux/ar7-2.4/Makefile index f9d3290b62..970bb4bbdf 100644 --- a/target/linux/ar7-2.4/Makefile +++ b/target/linux/ar7-2.4/Makefile @@ -15,9 +15,7 @@ define Target/Description Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2) endef -LINUX_VERSION:=2.4.33.4 -LINUX_RELEASE:=1 -LINUX_KERNEL_MD5SUM:=aca0257549c385a227088ad8853a72a2 +KERNEL:=2.4 include $(INCLUDE_DIR)/kernel-build.mk DEFAULT_PACKAGES += kmod-avalanche-cpmac diff --git a/target/linux/aruba-2.6/Makefile b/target/linux/aruba-2.6/Makefile index 989f321b06..5d3e19ea2f 100644 --- a/target/linux/aruba-2.6/Makefile +++ b/target/linux/aruba-2.6/Makefile @@ -15,10 +15,6 @@ define Target/Description Build firmware images for Aruba boards endef -LINUX_VERSION:=2.6.19.1 -LINUX_RELEASE:=1 -LINUX_KERNEL_MD5SUM:=2ab08fdfddc00e09b3d5bc7397d3c8be - include $(INCLUDE_DIR)/kernel-build.mk DEFAULT_PACKAGES += kmod-madwifi diff --git a/target/linux/atheros-2.6/Makefile b/target/linux/atheros-2.6/Makefile index f3f3ca6b4e..92f9d361c4 100644 --- a/target/linux/atheros-2.6/Makefile +++ b/target/linux/atheros-2.6/Makefile @@ -15,10 +15,6 @@ define Target/Description Build firmware images for Atheros SoC boards (currently AR2315-AR2317) endef -LINUX_VERSION:=2.6.19 -LINUX_RELEASE:=1 -LINUX_KERNEL_MD5SUM:=443c265b57e87eadc0c677c3acc37e20 - include $(INCLUDE_DIR)/kernel-build.mk DEFAULT_PACKAGES += kmod-madwifi diff --git a/target/linux/au1000-2.6/Makefile b/target/linux/au1000-2.6/Makefile index 4b20032f95..2f2a92b0e1 100644 --- a/target/linux/au1000-2.6/Makefile +++ b/target/linux/au1000-2.6/Makefile @@ -16,10 +16,6 @@ define Target/Description (e.g. 4G-Systems Mesh/Access Cube ...) endef -LINUX_VERSION:=2.6.19.1 -LINUX_RELEASE:=1 -LINUX_KERNEL_MD5SUM:=2ab08fdfddc00e09b3d5bc7397d3c8be - include $(INCLUDE_DIR)/kernel-build.mk define Kernel/BuildImage diff --git a/target/linux/brcm-2.4/Makefile b/target/linux/brcm-2.4/Makefile index 226da5623e..4e1267df35 100644 --- a/target/linux/brcm-2.4/Makefile +++ b/target/linux/brcm-2.4/Makefile @@ -20,9 +20,7 @@ define Target/Description with TFTP client too. endef -LINUX_VERSION:=2.4.33.4 -LINUX_RELEASE:=1 -LINUX_KERNEL_MD5SUM:=aca0257549c385a227088ad8853a72a2 +KERNEL:=2.4 include $(INCLUDE_DIR)/kernel-build.mk DEFAULT_PACKAGES += kmod-switch nvram diff --git a/target/linux/brcm-2.6/Makefile b/target/linux/brcm-2.6/Makefile index c30e150f4a..8e69332c28 100644 --- a/target/linux/brcm-2.6/Makefile +++ b/target/linux/brcm-2.6/Makefile @@ -20,10 +20,6 @@ define Target/Description with TFTP client too. endef -LINUX_VERSION:=2.6.19.1 -LINUX_RELEASE:=1 -LINUX_KERNEL_MD5SUM:=2ab08fdfddc00e09b3d5bc7397d3c8be - include $(INCLUDE_DIR)/kernel-build.mk DEFAULT_PACKAGES += kmod-switch diff --git a/target/linux/brcm63xx-2.6/Makefile b/target/linux/brcm63xx-2.6/Makefile index 4757eff899..5b98e909c3 100644 --- a/target/linux/brcm63xx-2.6/Makefile +++ b/target/linux/brcm63xx-2.6/Makefile @@ -16,10 +16,6 @@ define Target/Description (e.g. Inventel Livebox, Siemens SE515) endef -LINUX_VERSION:=2.6.19.1 -LINUX_RELEASE:=1 -LINUX_KERNEL_MD5SUM:=2ab08fdfddc00e09b3d5bc7397d3c8be - include $(INCLUDE_DIR)/kernel-build.mk define Profile/Broadcom diff --git a/target/linux/ixp4xx-2.6/Makefile b/target/linux/ixp4xx-2.6/Makefile index 1d08708a32..352671ee69 100644 --- a/target/linux/ixp4xx-2.6/Makefile +++ b/target/linux/ixp4xx-2.6/Makefile @@ -14,9 +14,5 @@ FEATURES:=jffs2 define Target/Description endef -LINUX_VERSION:=2.6.19.1 -LINUX_RELEASE:=1 -LINUX_KERNEL_MD5SUM:=2ab08fdfddc00e09b3d5bc7397d3c8be - include $(INCLUDE_DIR)/kernel-build.mk $(eval $(call BuildKernel)) diff --git a/target/linux/magicbox-2.6/Makefile b/target/linux/magicbox-2.6/Makefile index 0dcc1e7c14..b829965a50 100644 --- a/target/linux/magicbox-2.6/Makefile +++ b/target/linux/magicbox-2.6/Makefile @@ -11,9 +11,5 @@ BOARD:=magicbox BOARDNAME:=Magicbox FEATURES:=jffs2 -LINUX_VERSION:=2.6.19.1 -LINUX_RELEASE:=1 -LINUX_KERNEL_MD5SUM:=2ab08fdfddc00e09b3d5bc7397d3c8be - include $(INCLUDE_DIR)/kernel-build.mk $(eval $(call BuildKernel)) diff --git a/target/linux/rb532-2.6/Makefile b/target/linux/rb532-2.6/Makefile index ae28b87afe..6ec9bdcd38 100644 --- a/target/linux/rb532-2.6/Makefile +++ b/target/linux/rb532-2.6/Makefile @@ -11,9 +11,5 @@ BOARD:=rb532 BOARDNAME:=Mikrotik RouterBoard 532 FEATURES:=jffs2 -LINUX_VERSION:=2.6.19.1 -LINUX_RELEASE:=1 -LINUX_KERNEL_MD5SUM:=2ab08fdfddc00e09b3d5bc7397d3c8be - include $(INCLUDE_DIR)/kernel-build.mk $(eval $(call BuildKernel)) diff --git a/target/linux/rdc-2.6/Makefile b/target/linux/rdc-2.6/Makefile index 3fbd700c34..f1f751eee6 100644 --- a/target/linux/rdc-2.6/Makefile +++ b/target/linux/rdc-2.6/Makefile @@ -16,10 +16,6 @@ define Target/Description (e.g. Airlink101 AR525W) endef -LINUX_VERSION:=2.6.19.1 -LINUX_RELEASE:=1 -LINUX_KERNEL_MD5SUM:=2ab08fdfddc00e09b3d5bc7397d3c8be - include $(INCLUDE_DIR)/kernel-build.mk define Profile/Ralink diff --git a/target/linux/sibyte-2.6/Makefile b/target/linux/sibyte-2.6/Makefile index 2dd590c5ac..364d116d4d 100644 --- a/target/linux/sibyte-2.6/Makefile +++ b/target/linux/sibyte-2.6/Makefile @@ -11,9 +11,5 @@ BOARD:=sibyte BOARDNAME:=SiByte MIPS FEATURES:=broken -LINUX_VERSION:=2.6.19.1 -LINUX_RELEASE:=1 -LINUX_KERNEL_MD5SUM:=2ab08fdfddc00e09b3d5bc7397d3c8be - include $(INCLUDE_DIR)/kernel-build.mk $(eval $(call BuildKernel)) diff --git a/target/linux/uml-2.6/Makefile b/target/linux/uml-2.6/Makefile index ff2297f3c8..33bf8060fe 100644 --- a/target/linux/uml-2.6/Makefile +++ b/target/linux/uml-2.6/Makefile @@ -10,9 +10,5 @@ ARCH:=i386 BOARD:=uml BOARDNAME:=User Mode Linux -LINUX_VERSION:=2.6.19.1 -LINUX_RELEASE:=1 -LINUX_KERNEL_MD5SUM:=2ab08fdfddc00e09b3d5bc7397d3c8be - include $(INCLUDE_DIR)/kernel-build.mk $(eval $(call BuildKernel)) diff --git a/target/linux/x86-2.6/Makefile b/target/linux/x86-2.6/Makefile index f7e3fa8373..25e7356877 100644 --- a/target/linux/x86-2.6/Makefile +++ b/target/linux/x86-2.6/Makefile @@ -11,10 +11,6 @@ BOARD:=x86 BOARDNAME:=x86 FEATURES:=jffs2 ext2 -LINUX_VERSION:=2.6.19.1 -LINUX_RELEASE:=1 -LINUX_KERNEL_MD5SUM:=2ab08fdfddc00e09b3d5bc7397d3c8be - include $(INCLUDE_DIR)/kernel-build.mk $(eval $(call BuildKernel))