diff options
author | Andrea Adami <andrea.adami@gmail.com> | 2012-05-13 23:49:02 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-05-14 16:02:03 +0200 |
commit | 14869e500c1a2f6be4704bf7399435fda00dc34c (patch) | |
tree | 73b8a2eaaad9c11d2d811709f6e55bf062e5ef1f /meta-initramfs | |
parent | d983ea32f125325c6524731d9f8055a3a8155247 (diff) | |
download | meta-openembedded-14869e500c1a2f6be4704bf7399435fda00dc34c.tar.gz |
klibc: upgrade to latest git (pre 2.0)
* remove cherry-picked patch applied in master
* remove comments in klcc recipe
* remove slashes from paths in klibc recipe
* revert involontary oe_runmake install changes
* reset INC_PR
* v2 removes obolete cleanings wrt headers_install
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-initramfs')
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.26+2.0.bb (renamed from meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.26.bb) | 5 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/dash_readopt.patch (renamed from meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/dash_readopt.patch) | 0 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/fstype-sane-vfat-and-jffs2-for-1.5.patch (renamed from meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/fstype-sane-vfat-and-jffs2-for-1.5.patch) | 0 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/klcc_prefix.patch (renamed from meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klcc_prefix.patch) | 0 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/klibc-config-eabi.patch (renamed from meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klibc-config-eabi.patch) | 0 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/klibc-linux-libc-dev.patch (renamed from meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klibc-linux-libc-dev.patch) | 0 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/modprobe.patch (renamed from meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/modprobe.patch) | 0 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/prefix.patch (renamed from meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/prefix.patch) | 0 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/staging.patch (renamed from meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/staging.patch) | 0 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/use-env-for-perl.patch (renamed from meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/use-env-for-perl.patch) | 0 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/wc.patch (renamed from meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/wc.patch) | 0 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/kernel_3.2__aligned_u64.patch | 46 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.26+2.0.bb (renamed from meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.26.bb) | 0 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.26+2.0.bb (renamed from meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.26.bb) | 0 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc.inc | 9 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc_1.5.26+2.0.bb (renamed from meta-initramfs/recipes-devtools/klibc/klibc_1.5.26.bb) | 6 |
16 files changed, 5 insertions, 61 deletions
diff --git a/meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.26.bb b/meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.26+2.0.bb index 5a6739d4e..56456f7a8 100644 --- a/meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.26.bb +++ b/meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.26+2.0.bb | |||
@@ -11,11 +11,6 @@ DEPENDS = "klibc" | |||
11 | 11 | ||
12 | FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" | 12 | FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" |
13 | 13 | ||
14 | # ${TARGET_PREFIX}klcc is just a | ||
15 | # perl wrapper around gcc-cross | ||
16 | # so give it the same arch and path | ||
17 | #PACKAGE_ARCH = "${TUNE_PKGARCH}" | ||
18 | |||
19 | inherit cross | 14 | inherit cross |
20 | 15 | ||
21 | do_configure () { | 16 | do_configure () { |
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/dash_readopt.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/dash_readopt.patch index 3be1be04f..3be1be04f 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/dash_readopt.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/dash_readopt.patch | |||
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/fstype-sane-vfat-and-jffs2-for-1.5.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/fstype-sane-vfat-and-jffs2-for-1.5.patch index 3fec98d2c..3fec98d2c 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/fstype-sane-vfat-and-jffs2-for-1.5.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/fstype-sane-vfat-and-jffs2-for-1.5.patch | |||
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klcc_prefix.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/klcc_prefix.patch index a4a0026e4..a4a0026e4 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klcc_prefix.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/klcc_prefix.patch | |||
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klibc-config-eabi.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/klibc-config-eabi.patch index 316c80a92..316c80a92 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klibc-config-eabi.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/klibc-config-eabi.patch | |||
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klibc-linux-libc-dev.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/klibc-linux-libc-dev.patch index 3c55e1482..3c55e1482 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klibc-linux-libc-dev.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/klibc-linux-libc-dev.patch | |||
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/modprobe.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/modprobe.patch index eb2fb39e6..eb2fb39e6 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/modprobe.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/modprobe.patch | |||
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/prefix.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/prefix.patch index 6f5ff0d60..6f5ff0d60 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/prefix.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/prefix.patch | |||
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/staging.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/staging.patch index 03955f25c..03955f25c 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/staging.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/staging.patch | |||
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/use-env-for-perl.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/use-env-for-perl.patch index eac128cc0..eac128cc0 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/use-env-for-perl.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/use-env-for-perl.patch | |||
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/wc.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/wc.patch index 28705fd7a..28705fd7a 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/wc.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26+2.0/wc.patch | |||
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/kernel_3.2__aligned_u64.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/kernel_3.2__aligned_u64.patch deleted file mode 100644 index c2369cd8c..000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/kernel_3.2__aligned_u64.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From 7f47891c1678874cccca66cd25e6a13486c86d78 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?utf8?q?Maciej=20=C5=BBenczykowski?= <zenczykowski@gmail.com> | ||
3 | Date: Sun, 6 Nov 2011 14:33:40 -0800 | ||
4 | Subject: [PATCH] [klibc] include: [sys/types.h] -> linux/types.h and | ||
5 | __aligned_u64 | ||
6 | |||
7 | When building klibc 1.5.25 against linux/master (ie. post 3.1) I'm seeing: | ||
8 | |||
9 | klibc/generated/include/linux/if_packet.h:176: error: expected | ||
10 | specifier-qualifier-list before '__aligned_u64' | ||
11 | |||
12 | which seems to come from upstream commits: | ||
13 | 0d4691ce112be025019999df5f2a5e00c03f03c2 remotes/linux/master~90^2~408 (origin) | ||
14 | 96c131842aab45b5d139d0bcb417796819f5ee92 remotes/linux/master~90^2~169 | ||
15 | (change from aligned_u64 to __aligned_u64) | ||
16 | |||
17 | and collides with klibc/usr/include/sys/types.h | ||
18 | |||
19 | /* Keeps linux/types.h from getting included elsewhere */ | ||
20 | #define _LINUX_TYPES_H | ||
21 | |||
22 | not defining __aligned_u64 like the kernel's include/linux/types.h does. | ||
23 | |||
24 | Signed-off-by: maximilian attems <max@stro.at> | ||
25 | --- | ||
26 | usr/include/sys/types.h | 4 ++++ | ||
27 | 1 files changed, 4 insertions(+), 0 deletions(-) | ||
28 | |||
29 | diff --git a/usr/include/sys/types.h b/usr/include/sys/types.h | ||
30 | index 6780ed1..3a4c738 100644 | ||
31 | --- a/usr/include/sys/types.h | ||
32 | +++ b/usr/include/sys/types.h | ||
33 | @@ -100,6 +100,10 @@ typedef uint16_t __sum16; | ||
34 | typedef uint32_t __sum32; | ||
35 | typedef uint64_t __sum64; | ||
36 | |||
37 | +#define __aligned_u64 __u64 __attribute__((aligned(8))) | ||
38 | +#define __aligned_be64 __be64 __attribute__((aligned(8))) | ||
39 | +#define __aligned_le64 __le64 __attribute__((aligned(8))) | ||
40 | + | ||
41 | /* | ||
42 | * Some headers seem to require this... | ||
43 | */ | ||
44 | -- | ||
45 | 1.7.6.5 | ||
46 | |||
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.26.bb b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.26+2.0.bb index 484134e44..484134e44 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.26.bb +++ b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.26+2.0.bb | |||
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.26.bb b/meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.26+2.0.bb index 37cab84c5..37cab84c5 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.26.bb +++ b/meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.26+2.0.bb | |||
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc index f89af9de6..370659807 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://usr/klibc/LICENSE;md5=d75181f10e998c21eb147f6d2e43ce8 | |||
10 | # debugsources.list: No such file or directory: | 10 | # debugsources.list: No such file or directory: |
11 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | 11 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" |
12 | 12 | ||
13 | INC_PR = "r1" | 13 | INC_PR = "r0" |
14 | 14 | ||
15 | KLIBC_ARCH = '${TARGET_ARCH}' | 15 | KLIBC_ARCH = '${TARGET_ARCH}' |
16 | KLIBC_ARCH_armeb = 'arm' | 16 | KLIBC_ARCH_armeb = 'arm' |
@@ -21,7 +21,7 @@ KLIBC_ARCH_i586 = 'i386' | |||
21 | KLIBC_ARCH_i686 = 'i386' | 21 | KLIBC_ARCH_i686 = 'i386' |
22 | KLIBC_ARCH_pentium = 'i386' | 22 | KLIBC_ARCH_pentium = 'i386' |
23 | 23 | ||
24 | SRCREV = "c7dedd5d11b075b5e6cecd6aa82b70b748179121" | 24 | SRCREV = "f8e0ad9812f5e3fe0e7006061b1d5f9f67a80325" |
25 | SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git;protocol=git" | 25 | SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git;protocol=git" |
26 | 26 | ||
27 | SRC_URI_append_linux-gnueabi = " file://klibc-config-eabi.patch" | 27 | SRC_URI_append_linux-gnueabi = " file://klibc-config-eabi.patch" |
@@ -34,17 +34,16 @@ SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \ | |||
34 | file://wc.patch \ | 34 | file://wc.patch \ |
35 | file://prefix.patch \ | 35 | file://prefix.patch \ |
36 | file://staging.patch \ | 36 | file://staging.patch \ |
37 | file://kernel_3.2__aligned_u64.patch \ | ||
38 | " | 37 | " |
39 | 38 | ||
40 | S = "${WORKDIR}/git" | 39 | S = "${WORKDIR}/git" |
41 | 40 | ||
42 | EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ | 41 | EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ |
43 | 'CROSS_COMPILE=${TARGET_PREFIX}' \ | 42 | 'CROSS_COMPILE=${TARGET_PREFIX}' \ |
44 | 'KLIBCKERNELSRC=${STAGING_DIR_TARGET}/${exec_prefix}' \ | 43 | 'KLIBCKERNELSRC=${STAGING_DIR_TARGET}${exec_prefix}' \ |
45 | " | 44 | " |
46 | 45 | ||
47 | do_configure () { | 46 | do_configure () { |
48 | 47 | ||
49 | ln -sf "${STAGING_DIR_TARGET}/${exec_prefix}" linux | 48 | ln -sf "${STAGING_DIR_TARGET}${exec_prefix}" linux |
50 | } | 49 | } |
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc_1.5.26.bb b/meta-initramfs/recipes-devtools/klibc/klibc_1.5.26+2.0.bb index 101ba555e..8eaab2c44 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc_1.5.26.bb +++ b/meta-initramfs/recipes-devtools/klibc/klibc_1.5.26+2.0.bb | |||
@@ -4,7 +4,7 @@ export INST = "${D}" | |||
4 | 4 | ||
5 | do_install() { | 5 | do_install() { |
6 | 6 | ||
7 | oe_runmake DESTDIR="${D}" install | 7 | oe_runmake install |
8 | 8 | ||
9 | # the crosscompiler is packaged by klcc-cross | 9 | # the crosscompiler is packaged by klcc-cross |
10 | # remove klcc | 10 | # remove klcc |
@@ -12,10 +12,6 @@ do_install() { | |||
12 | # remove now empty dir | 12 | # remove now empty dir |
13 | rmdir ${D}${base_bindir} | 13 | rmdir ${D}${base_bindir} |
14 | 14 | ||
15 | # remove Linux headers .install and ..install.cmd files | ||
16 | find ${D}${base_libdir}/klibc/include -name '.install' -delete | ||
17 | find ${D}${base_libdir}/klibc/include -name '..install.cmd' -delete | ||
18 | |||
19 | install -d ${D}${base_libdir} | 15 | install -d ${D}${base_libdir} |
20 | install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir} | 16 | install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir} |
21 | (cd ${D}${base_libdir}; ln -s klibc-*.so klibc.so) | 17 | (cd ${D}${base_libdir}; ln -s klibc-*.so klibc.so) |