aboutsummaryrefslogtreecommitdiff
path: root/toolchain/kernel-headers
diff options
context:
space:
mode:
authorGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-08-19 22:01:27 +0000
committerGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-08-19 22:01:27 +0000
commit3978c675708a217ea9c390c84cc890d383253980 (patch)
tree08e9b1d7767335e96e304d7565fa2cfd52f86e0c /toolchain/kernel-headers
parentcdb7c0167baa2bdaef34aa1049c77232877007a0 (diff)
downloadbuildroot-3978c675708a217ea9c390c84cc890d383253980.tar.gz
buildroot-3978c675708a217ea9c390c84cc890d383253980.tar.bz2
Make ipmi kernelpatch selectable, add possibility for custom kernel patch
Diffstat (limited to 'toolchain/kernel-headers')
-rw-r--r--toolchain/kernel-headers/Config.in27
-rw-r--r--toolchain/kernel-headers/ipmi/linux-2.6.20.4-ipmisensors-20070314-1214.patch (renamed from toolchain/kernel-headers/linux-2.6.20.4-ipmisensors-20070314-1214.patch)0
-rw-r--r--toolchain/kernel-headers/ipmi/linux-2.6.21.5-007-ipmisensors-20070314-1214.patch (renamed from toolchain/kernel-headers/linux-2.6.21.5-007-ipmisensors-20070314-1214.patch)0
-rw-r--r--toolchain/kernel-headers/ipmi/linux-2.6.22.1-007-ipmisensors-20070314-1214.patch (renamed from toolchain/kernel-headers/linux-2.6.22.1-007-ipmisensors-20070314-1214.patch)0
-rw-r--r--toolchain/kernel-headers/kernel-headers-new.makefile7
-rw-r--r--toolchain/kernel-headers/kernel-headers-old.makefile1
6 files changed, 30 insertions, 5 deletions
diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 9244f088ed..720fb07f9e 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -2,11 +2,11 @@
# ignored if you are building your own kernel or using the system kernel.
#
-comment "Kernel Header Options"
+menu "Kernel Header Options"
choice
prompt "Kernel Headers"
- default BR2_KERNEL_HEADERS_2_6_21
+ default BR2_KERNEL_HEADERS_2_6_22
help
Select the version of kernel header files you wish to use.
You must select the correct set of header files to match
@@ -58,9 +58,20 @@ choice
endchoice
+config BR2_KERNEL_HEADERS_IPMI
+ bool "use ipmi kernel patches"
+ default n
+ depends BR2_KERNEL_HEADERS_2_6_20 || BR2_KERNEL_HEADERS_2_6_21 || BR2_KERNEL_HEADERS_2_6_22
+ help
+ Apply patches which allow for lzma compressed
+ initramfs filesystems. This requires the lzma
+ program in your development environment.
+
+
config BR2_KERNEL_HEADERS_LZMA
bool "use lzma initramfs kernel patches"
default n
+ depends BR2_KERNEL_HEADERS_2_6_21 || BR2_KERNEL_HEADERS_2_6_22
help
Apply patches which allow for lzma compressed
initramfs filesystems. This requires the lzma
@@ -68,6 +79,8 @@ config BR2_KERNEL_HEADERS_LZMA
config BR2_KERNEL_HEADERS_LZMA_INSTALL
bool "Install lzma in /usr/local/bin (Requires system password) for sudo"
+ depends on BR2_KERNEL_HEADERS_2_6_21 || BR2_KERNEL_HEADERS_2_6_22
+ depends on BR2_KERNEL_HEADERS_LZMA
default n
help
Install the lzma package in the /usr/local/bin directory
@@ -77,6 +90,14 @@ config BR2_KERNEL_HEADERS_LZMA_INSTALL
to complete the linux build, ifl you apply the lzma patches
is to have '$(STAGING_DIR)/usr/bin' in your path.
+config BR2_KERNEL_HEADERS_PATCH_DIR
+ bool "Add additional headers from $(KERNEL_HEADERS_PATCH_DIR)"
+ default n
+ depends BR2_KERNEL_HEADERS_2_6_20 || BR2_KERNEL_HEADERS_2_6_21 || BR2_KERNEL_HEADERS_2_6_22
+ help
+ Apply additonal kernel patches defined by KERNEL_HEADERS_PATCH_DIR
+ in your board directory.
+
config BR2_DEFAULT_KERNEL_HEADERS
string
default "2.4.25" if BR2_KERNEL_HEADERS_2_4_25
@@ -90,3 +111,5 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "2.6.20.4" if BR2_KERNEL_HEADERS_2_6_20
default "2.6.21.5" if BR2_KERNEL_HEADERS_2_6_21
default "2.6.22.1" if BR2_KERNEL_HEADERS_2_6_22
+
+endmenu
diff --git a/toolchain/kernel-headers/linux-2.6.20.4-ipmisensors-20070314-1214.patch b/toolchain/kernel-headers/ipmi/linux-2.6.20.4-ipmisensors-20070314-1214.patch
index aca57c37b0..aca57c37b0 100644
--- a/toolchain/kernel-headers/linux-2.6.20.4-ipmisensors-20070314-1214.patch
+++ b/toolchain/kernel-headers/ipmi/linux-2.6.20.4-ipmisensors-20070314-1214.patch
diff --git a/toolchain/kernel-headers/linux-2.6.21.5-007-ipmisensors-20070314-1214.patch b/toolchain/kernel-headers/ipmi/linux-2.6.21.5-007-ipmisensors-20070314-1214.patch
index aca57c37b0..aca57c37b0 100644
--- a/toolchain/kernel-headers/linux-2.6.21.5-007-ipmisensors-20070314-1214.patch
+++ b/toolchain/kernel-headers/ipmi/linux-2.6.21.5-007-ipmisensors-20070314-1214.patch
diff --git a/toolchain/kernel-headers/linux-2.6.22.1-007-ipmisensors-20070314-1214.patch b/toolchain/kernel-headers/ipmi/linux-2.6.22.1-007-ipmisensors-20070314-1214.patch
index 5fe74954f3..5fe74954f3 100644
--- a/toolchain/kernel-headers/linux-2.6.22.1-007-ipmisensors-20070314-1214.patch
+++ b/toolchain/kernel-headers/ipmi/linux-2.6.22.1-007-ipmisensors-20070314-1214.patch
diff --git a/toolchain/kernel-headers/kernel-headers-new.makefile b/toolchain/kernel-headers/kernel-headers-new.makefile
index fd5dc344f3..f9dfcbc510 100644
--- a/toolchain/kernel-headers/kernel-headers-new.makefile
+++ b/toolchain/kernel-headers/kernel-headers-new.makefile
@@ -51,6 +51,7 @@ endif
ifeq ($(LINUX_HEADERS_IS_KERNEL),y)
$(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)
+ @echo "*** Using kernel-headers generated from kernel source"
rm -rf $(LINUX_HEADERS_DIR)
[ -d $(BUILD_DIR) ] || $(INSTALL) -d $(BUILD_DIR)
$(LINUX_HEADERS_CAT) $(DL_DIR)/$(LINUX_HEADERS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
@@ -63,9 +64,9 @@ ifeq ($(BR2_KERNEL_HEADERS_LZMA),y)
toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers/lzma \
linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
endif
-ifneq ($(LINUX26_HEADERS_PATCH_DIR),)
- toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) $(LINUX26_HEADERS_PATCH_DIR) \
- linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
+ifeq ($(BR2_KERNEL_HEADERS_PATCH_DIR),y)
+ toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) $(KERNEL_HEADERS_PATCH_DIR) \
+ \*.patch{,.gz,.bz2}
endif
ifeq ($(BR2_PACKAGE_OPENSWAN),y)
toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) package/openswan \
diff --git a/toolchain/kernel-headers/kernel-headers-old.makefile b/toolchain/kernel-headers/kernel-headers-old.makefile
index 6b490cab1e..b510ac793c 100644
--- a/toolchain/kernel-headers/kernel-headers-old.makefile
+++ b/toolchain/kernel-headers/kernel-headers-old.makefile
@@ -107,6 +107,7 @@ endif
ifeq ($(LINUX_HEADERS_IS_KERNEL),n)
$(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)
+ @echo "Using old sanitized kernel-headers"
rm -rf $(LINUX_HEADERS_DIR)
$(LINUX_HEADERS_CAT) $(DL_DIR)/$(LINUX_HEADERS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
ifneq ($(LINUX_HEADERS_UNPACK_DIR),$(LINUX_HEADERS_DIR))