jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-31 23:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unbreak multiple boards, add Ingo's rt patch

Browse Source
This commit is contained in:
Ulf Samuelsson 2007-09-12 04:06:54 +00:00
parent 206711de6a
commit 157d8decab
3 changed files with 98 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/linux/Makefile.in
View File

@ -110,7 +110,7 @@ ifneq ($(DOWNLOAD_LINUX26_VERSION),$(LINUX26_VERSION))
endif endif
touch $@ touch $@
$(LINUX26_DIR)/.patched: $(LINUX26_DIR)/.unpacked $(LINUX26_DIR)/.patched: $(LINUX26_DIR)/.unpacked $(LINUX_HEADERS_DEPENDS)
toolchain/patch-kernel.sh $(LINUX26_DIR) toolchain/kernel-headers \ toolchain/patch-kernel.sh $(LINUX26_DIR) toolchain/kernel-headers \
linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2} linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}
ifeq ($(BR2_KERNEL_HEADERS_IPMI),y) ifeq ($(BR2_KERNEL_HEADERS_IPMI),y)
@ -121,6 +121,9 @@ ifeq ($(BR2_KERNEL_HEADERS_LZMA),y)
toolchain/patch-kernel.sh $(LINUX26_DIR) toolchain/kernel-headers/lzma \ toolchain/patch-kernel.sh $(LINUX26_DIR) toolchain/kernel-headers/lzma \
linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2} linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}
endif endif
ifeq ($(BR2_KERNEL_HEADERS_RT),y)
toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) $(LINUX_RT_SOURCE)
endif
ifeq ($(BR2_KERNEL_HEADERS_PATCH_DIR),y) ifeq ($(BR2_KERNEL_HEADERS_PATCH_DIR),y)
toolchain/patch-kernel.sh $(LINUX26_DIR) $(KERNEL_HEADERS_PATCH_DIR) \ toolchain/patch-kernel.sh $(LINUX26_DIR) $(KERNEL_HEADERS_PATCH_DIR) \
linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2} linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}

40
toolchain/kernel-headers/Config.in
View File

@ -6,7 +6,7 @@ menu "Kernel Header Options"
choice choice
prompt "Kernel Headers" prompt "Kernel Headers"
default BR2_KERNEL_HEADERS_2_6_22 default BR2_KERNEL_HEADERS_2_6_22_1
help help
Select the version of kernel header files you wish to use. Select the version of kernel header files you wish to use.
You must select the correct set of header files to match You must select the correct set of header files to match
@ -40,42 +40,61 @@ choice
depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
bool "Linux 2.6.12 kernel headers" bool "Linux 2.6.12 kernel headers"
config BR2_KERNEL_HEADERS_2_6_20_4
depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
bool "Linux 2.6.20.4 kernel headers"
config BR2_KERNEL_HEADERS_2_6_20 config BR2_KERNEL_HEADERS_2_6_20
depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
bool "Linux 2.6.20 kernel headers" bool "Latest Linux 2.6.20.x kernel headers"
config BR2_KERNEL_HEADERS_2_6_21_5
depends !BR2_avr32 && !BR2_nios2
bool "Linux 2.6.21.5 kernel headers"
config BR2_KERNEL_HEADERS_2_6_21 config BR2_KERNEL_HEADERS_2_6_21
depends !BR2_avr32 && !BR2_nios2 depends !BR2_avr32 && !BR2_nios2
bool "Linux 2.6.21.x kernel headers" bool "Latest Linux 2.6.21.x kernel headers"
config BR2_KERNEL_HEADERS_2_6_22_1
depends !BR2_nios2
bool "Linux 2.6.22.1 kernel headers"
config BR2_KERNEL_HEADERS_2_6_22 config BR2_KERNEL_HEADERS_2_6_22
depends !BR2_nios2 depends !BR2_avr32 && !BR2_nios2
bool "Linux 2.6.22.x kernel headers" bool "Latest Linux 2.6.22.x kernel headers"
endchoice endchoice
config BR2_KERNEL_HEADERS_IPMI config BR2_KERNEL_HEADERS_IPMI
bool "use ipmi kernel patches" bool "use ipmi kernel patches"
default n default n
depends BR2_KERNEL_HEADERS_2_6_20 || BR2_KERNEL_HEADERS_2_6_21 || BR2_KERNEL_HEADERS_2_6_22 depends BR2_KERNEL_HEADERS_2_6_20_4 || BR2_KERNEL_HEADERS_2_6_21_5 || BR2_KERNEL_HEADERS_2_6_22_1
help help
Apply patches which add IPMI sensor support. Apply patches which add IPMI sensor support.
config BR2_KERNEL_HEADERS_LZMA config BR2_KERNEL_HEADERS_LZMA
bool "use lzma initramfs kernel patches" bool "use lzma initramfs kernel patches"
default n default n
depends BR2_KERNEL_HEADERS_2_6_21 || BR2_KERNEL_HEADERS_2_6_22 depends BR2_KERNEL_HEADERS_2_6_21_5 || BR2_KERNEL_HEADERS_2_6_22_1
help help
Apply patches which allow for lzma compressed Apply patches which allow for lzma compressed
initramfs filesystems. This requires the lzma initramfs filesystems. This requires the lzma
program in your development environment. program in your development environment.
config BR2_KERNEL_HEADERS_RT
bool "use realtime (-rt) kernel patches"
default n
depends BR2_KERNEL_HEADERS_2_6_21_5 || BR2_KERNEL_HEADERS_2_6_22_1
help
Apply Ingo's realtime extensions to linux
config BR2_KERNEL_HEADERS_PATCH_DIR config BR2_KERNEL_HEADERS_PATCH_DIR
bool "Add additional headers from $(KERNEL_HEADERS_PATCH_DIR)" bool "Add additional headers from $(KERNEL_HEADERS_PATCH_DIR)"
default n default n
depends BR2_KERNEL_HEADERS_2_6_20 || BR2_KERNEL_HEADERS_2_6_21 || BR2_KERNEL_HEADERS_2_6_22 depends BR2_KERNEL_HEADERS_2_6_20_4 || BR2_KERNEL_HEADERS_2_6_21_5 || BR2_KERNEL_HEADERS_2_6_22_1
help help
Apply additonal kernel patches defined by KERNEL_HEADERS_PATCH_DIR Apply additional kernel patches defined by KERNEL_HEADERS_PATCH_DIR
in your board directory. in your board directory.
config BR2_DEFAULT_KERNEL_HEADERS config BR2_DEFAULT_KERNEL_HEADERS
@ -87,8 +106,11 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "2.6.9" if BR2_KERNEL_HEADERS_2_6_9 default "2.6.9" if BR2_KERNEL_HEADERS_2_6_9
default "2.6.11" if BR2_KERNEL_HEADERS_2_6_11 default "2.6.11" if BR2_KERNEL_HEADERS_2_6_11
default "2.6.12" if BR2_KERNEL_HEADERS_2_6_12 default "2.6.12" if BR2_KERNEL_HEADERS_2_6_12
default "2.6.20.4" if BR2_KERNEL_HEADERS_2_6_20_4
default "2.6.20.19" if BR2_KERNEL_HEADERS_2_6_20 default "2.6.20.19" if BR2_KERNEL_HEADERS_2_6_20
default "2.6.21.5" if BR2_KERNEL_HEADERS_2_6_21_5
default "2.6.21.7" if BR2_KERNEL_HEADERS_2_6_21 default "2.6.21.7" if BR2_KERNEL_HEADERS_2_6_21
default "2.6.22.1" if BR2_KERNEL_HEADERS_2_6_22_1
default "2.6.22.6" if BR2_KERNEL_HEADERS_2_6_22 default "2.6.22.6" if BR2_KERNEL_HEADERS_2_6_22
endmenu endmenu

65
toolchain/kernel-headers/kernel-headers-new.makefile
View File

@ -3,6 +3,7 @@
# full kernel tarballs >= 2.6.19.1 # full kernel tarballs >= 2.6.19.1
# #
############################################################# #############################################################
ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.22.6") ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.22.6")
VERSION:=2 VERSION:=2
PATCHLEVEL:=6 PATCHLEVEL:=6
@ -18,6 +19,22 @@ LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
LINUX_HEADERS_IS_KERNEL=y LINUX_HEADERS_IS_KERNEL=y
endif endif
ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.22.1")
VERSION:=2
PATCHLEVEL:=6
SUBLEVEL:=22
EXTRAVERSION:=.1
LOCALVERSION:=
LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
LINUX_HEADERS_SITE:=http://www.kernel.org/pub/linux/kernel/v2.6/
LINUX_HEADERS_SOURCE:=linux-$(LINUX_HEADERS_VERSION).tar.bz2
LINUX_HEADERS_CAT:=$(BZCAT)
LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-$(LINUX_HEADERS_VERSION)
LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
LINUX_HEADERS_IS_KERNEL=y
LINUX_RT_VERSION:=rt9
endif
ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.21.7") ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.21.7")
VERSION:=2 VERSION:=2
PATCHLEVEL:=6 PATCHLEVEL:=6
@ -33,6 +50,22 @@ LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
LINUX_HEADERS_IS_KERNEL=y LINUX_HEADERS_IS_KERNEL=y
endif endif
ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.21.5")
VERSION:=2
PATCHLEVEL:=6
SUBLEVEL:=21
EXTRAVERSION:=.5
LOCALVERSION:=
LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
LINUX_HEADERS_SITE:=http://www.kernel.org/pub/linux/kernel/v2.6/
LINUX_HEADERS_SOURCE:=linux-$(LINUX_HEADERS_VERSION).tar.bz2
LINUX_HEADERS_CAT:=$(BZCAT)
LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-$(LINUX_HEADERS_VERSION)
LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
LINUX_HEADERS_IS_KERNEL=y
LINUX_RT_VERSION:=rt20
endif
ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.20.19") ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.20.19")
VERSION:=2 VERSION:=2
PATCHLEVEL:=6 PATCHLEVEL:=6
@ -48,19 +81,44 @@ LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
LINUX_HEADERS_IS_KERNEL=y LINUX_HEADERS_IS_KERNEL=y
endif endif
ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.20.4")
VERSION:=2
PATCHLEVEL:=6
SUBLEVEL:=20
EXTRAVERSION:=.4
LOCALVERSION:=
LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
LINUX_HEADERS_SITE:=http://www.kernel.org/pub/linux/kernel/v2.6/
LINUX_HEADERS_SOURCE:=linux-$(LINUX_HEADERS_VERSION).tar.bz2
LINUX_HEADERS_CAT:=$(BZCAT)
LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-$(LINUX_HEADERS_VERSION)
LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
LINUX_HEADERS_IS_KERNEL=y
endif
ifeq ($(LINUX_HEADERS_IS_KERNEL),y) ifeq ($(LINUX_HEADERS_IS_KERNEL),y)
# Need to redefine KERNEL_HEADERS_PATCH_DIR if you want # Need to redefine KERNEL_HEADERS_PATCH_DIR if you want
# board specific kernel headers # board specific kernel headers
KERNEL_HEADERS_PATCH_DIR:=toolchain/kernel-headers/empty KERNEL_HEADERS_PATCH_DIR:=toolchain/kernel-headers/empty
LINUX_HEADERS_DEPENDS:=
$(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE) ifeq ($(BR2_KERNEL_HEADERS_RT),y)
LINUX_RT_SOURCE:=patch-$(LINUX_HEADERS_VERSION)-$(LINUX_RT_VERSION)
LINUX_RT_SITE:=http://www.kernel.org/pub/linux/kernel/projects/rt/older/
LINUX_HEADERS_DEPENDS+=$(DL_DIR)/$(LINUX_RT_SOURCE)
$(DL_DIR)/$(LINUX_RT_SOURCE):
$(WGET) -P $(DL_DIR) $(LINUX_RT_SITE)/$(LINUX_RT_SOURCE)
endif
$(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)
@echo "*** Using kernel-headers generated from kernel source" @echo "*** Using kernel-headers generated from kernel source"
rm -rf $(LINUX_HEADERS_DIR) rm -rf $(LINUX_HEADERS_DIR)
[ -d $(TOOL_BUILD_DIR) ] || $(INSTALL) -d $(TOOL_BUILD_DIR) [ -d $(TOOL_BUILD_DIR) ] || $(INSTALL) -d $(TOOL_BUILD_DIR)
$(LINUX_HEADERS_CAT) $(DL_DIR)/$(LINUX_HEADERS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - $(LINUX_HEADERS_CAT) $(DL_DIR)/$(LINUX_HEADERS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
touch $@ touch $@
$(LINUX_HEADERS_UNPACK_DIR)/.patched: $(LINUX_HEADERS_UNPACK_DIR)/.unpacked $(LINUX_HEADERS_UNPACK_DIR)/.patched: $(LINUX_HEADERS_UNPACK_DIR)/.unpacked $(LINUX_HEADERS_DEPENDS)
toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers \ toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers \
linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2} linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
ifeq ($(BR2_KERNEL_HEADERS_IPMI),y) ifeq ($(BR2_KERNEL_HEADERS_IPMI),y)
@ -71,6 +129,9 @@ ifeq ($(BR2_KERNEL_HEADERS_LZMA),y)
toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers/lzma \ toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers/lzma \
linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2} linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
endif endif
ifeq ($(BR2_KERNEL_HEADERS_RT),y)
toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) $(DL_DIR) $(LINUX_RT_SOURCE)
endif
ifeq ($(BR2_KERNEL_HEADERS_PATCH_DIR),y) ifeq ($(BR2_KERNEL_HEADERS_PATCH_DIR),y)
toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) $(KERNEL_HEADERS_PATCH_DIR) \ toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) $(KERNEL_HEADERS_PATCH_DIR) \
\*.patch{,.gz,.bz2} \*.patch{,.gz,.bz2}