diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 2 | ||||
| -rw-r--r-- | toolchain/kernel-headers/Config.in | 9 | ||||
| -rw-r--r-- | toolchain/kernel-headers/kernel-headers-new.makefile | 14 |
3 files changed, 22 insertions, 3 deletions
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index 3c556d17d..2d69bdd94 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -295,7 +295,7 @@ $(GCC_BUILD_DIR2)/.libs_installed: $(GCC_BUILD_DIR2)/.installed ifeq ($(BR2_GCC_SHARED_LIBGCC),y) # These are in /lib, so... rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so* - -cp -dpf $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* $(TARGET_DIR)/lib/ + -cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* $(TARGET_DIR)/lib/ endif ifeq ($(BR2_INSTALL_LIBSTDCPP),y) -cp -dpf $(STAGING_DIR)/lib/libstdc++.so* $(TARGET_DIR)/lib/ diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index 76e0858c1..50a8756ee 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -6,7 +6,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" - default BR2_KERNEL_HEADERS_2_6_20 + default BR2_KERNEL_HEADERS_2_6_21 help Select the version of kernel header files you wish to use. You must select the correct set of header files to match @@ -45,9 +45,13 @@ choice bool "Linux 2.6.19.2 kernel headers" config BR2_KERNEL_HEADERS_2_6_20 - depends !BR2_nios2 + depends !BR2_nios2 && BR2_DEPRECATED bool "Linux 2.6.20 kernel headers" + config BR2_KERNEL_HEADERS_2_6_21 + depends !BR2_nios2 + bool "Linux 2.6.21.x kernel headers" + endchoice config BR2_DEFAULT_KERNEL_HEADERS @@ -61,3 +65,4 @@ config BR2_DEFAULT_KERNEL_HEADERS default "2.6.12" if BR2_KERNEL_HEADERS_2_6_12 default "2.6.19.2" if BR2_KERNEL_HEADERS_2_6_19_2 default "2.6.20.4" if BR2_KERNEL_HEADERS_2_6_20 + default "2.6.21.5" if BR2_KERNEL_HEADERS_2_6_21 diff --git a/toolchain/kernel-headers/kernel-headers-new.makefile b/toolchain/kernel-headers/kernel-headers-new.makefile index 78f8dfeb9..4aa10b9bb 100644 --- a/toolchain/kernel-headers/kernel-headers-new.makefile +++ b/toolchain/kernel-headers/kernel-headers-new.makefile @@ -3,6 +3,20 @@ # full kernel tarballs >= 2.6.19.1 # ############################################################# +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:=$(BUILD_DIR)/linux-$(LINUX_HEADERS_VERSION) +LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux +LINUX_HEADERS_IS_KERNEL=y +endif ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.20.4") VERSION:=2 |