diff options
Diffstat (limited to 'toolchain')
-rw-r--r-- | toolchain/kernel-headers/Config.in | 6 | ||||
-rw-r--r-- | toolchain/kernel-headers/kernel-headers.mk | 9 | ||||
-rw-r--r-- | toolchain/kernel-headers/linux-3.0.64-headers_install-fix-__packed-in-exported-kernel-head.patch (renamed from toolchain/kernel-headers/linux-3.0.62-headers_install-fix-__packed-in-exported-kernel-head.patch) | 0 | ||||
-rw-r--r-- | toolchain/uClibc/uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch | 36 |
4 files changed, 39 insertions, 12 deletions
diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index 38e051f92..ea65b4fbd 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -58,13 +58,13 @@ config BR2_DEFAULT_KERNEL_VERSION config BR2_DEFAULT_KERNEL_HEADERS string - default "3.0.62" if BR2_KERNEL_HEADERS_3_0 + default "3.0.64" if BR2_KERNEL_HEADERS_3_0 default "3.1.10" if BR2_KERNEL_HEADERS_3_1 default "3.2.38" if BR2_KERNEL_HEADERS_3_2 default "3.3.8" if BR2_KERNEL_HEADERS_3_3 - default "3.4.29" if BR2_KERNEL_HEADERS_3_4 + default "3.4.31" if BR2_KERNEL_HEADERS_3_4 default "3.5.7" if BR2_KERNEL_HEADERS_3_5 default "3.6.11" if BR2_KERNEL_HEADERS_3_6 - default "3.7.6" if BR2_KERNEL_HEADERS_3_7 + default "3.7.8" if BR2_KERNEL_HEADERS_3_7 default "2.6" if BR2_KERNEL_HEADERS_SNAP default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index 76602d849..073d609e1 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -36,15 +36,6 @@ LINUX_HEADERS_CAT:=$(BZCAT) LINUX_HEADERS_UNPACK_DIR:=$(TOOLCHAIN_DIR)/linux-$(LINUX_HEADERS_VERSION) LINUX_HEADERS_DIR:=$(TOOLCHAIN_DIR)/linux -# long term support kernels are stored in a longterm/v2.6.x subdir -ifeq ($(BR2_KERNEL_HEADERS_2_6_35),y) -DEFAULT_KERNEL_HEADERS_MAJOR := \ - $(shell echo $(DEFAULT_KERNEL_HEADERS) | sed 's/\.[0-9]*$$//') -# += adds a space between -LINUX_HEADERS_SITE:= \ - $(LINUX_HEADERS_SITE)longterm/v$(DEFAULT_KERNEL_HEADERS_MAJOR)/ -endif - LINUX_HEADERS_DEPENDS:= $(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE) diff --git a/toolchain/kernel-headers/linux-3.0.62-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.64-headers_install-fix-__packed-in-exported-kernel-head.patch index 8777b7163..8777b7163 100644 --- a/toolchain/kernel-headers/linux-3.0.62-headers_install-fix-__packed-in-exported-kernel-head.patch +++ b/toolchain/kernel-headers/linux-3.0.64-headers_install-fix-__packed-in-exported-kernel-head.patch diff --git a/toolchain/uClibc/uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch b/toolchain/uClibc/uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch new file mode 100644 index 000000000..2ad00328d --- /dev/null +++ b/toolchain/uClibc/uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch @@ -0,0 +1,36 @@ +From 3d1b82c7d9dce11c733fe23a85df7f975c7e2486 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard <jacmet@sunsite.dk> +Date: Tue, 3 Jul 2012 15:54:57 +0200 +Subject: [PATCH] bits/time.h: sync with glibc 2.16 + +CLOCK_MONOTONIC_RAW is available since 2.6.28 +(2d42244ae71d: clocksource: introduce CLOCK_MONOTONIC_RAW), and +CLOCK_*_COARSE since 2.6.32 (da15cfdae033: time: Introduce +CLOCK_REALTIME_COARSE). + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> +--- + libc/sysdeps/linux/common/bits/time.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libc/sysdeps/linux/common/bits/time.h b/libc/sysdeps/linux/common/bits/time.h +index 7ed54bf..c871223 100644 +--- a/libc/sysdeps/linux/common/bits/time.h ++++ b/libc/sysdeps/linux/common/bits/time.h +@@ -54,6 +54,12 @@ + # define CLOCK_PROCESS_CPUTIME_ID 2 + /* Thread-specific CPU-time clock. */ + # define CLOCK_THREAD_CPUTIME_ID 3 ++/* Monotonic system-wide clock, not adjusted for frequency scaling. */ ++# define CLOCK_MONOTONIC_RAW 4 ++/* Identifier for system-wide realtime clock, updated only on ticks. */ ++# define CLOCK_REALTIME_COARSE 5 ++/* Monotonic system-wide clock, updated only on ticks. */ ++# define CLOCK_MONOTONIC_COARSE 6 + + /* Flag to indicate time is absolute. */ + # define TIMER_ABSTIME 1 +-- +1.7.10.4 + |