diff options
author | Tudor Florea <tudor.florea@enea.com> | 2014-10-10 03:20:04 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2014-10-10 03:20:04 +0200 |
commit | 1b8dfe266937a37a4c642f96ceb2347bf4c00a17 (patch) | |
tree | 0c6aab146bb3c82efd9c7846a9a4e70dcb0ec84f /meta-initramfs/recipes-devtools/klibc/klibc-2.0.3 | |
download | meta-openembedded-daisy-140929.tar.gz |
initial commit for Enea Linux 4.0-140929daisy-140929
Migrated from the internal git server on the daisy-enea-point-release branch
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta-initramfs/recipes-devtools/klibc/klibc-2.0.3')
5 files changed, 220 insertions, 0 deletions
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/armv4-fix-v4bx.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/armv4-fix-v4bx.patch new file mode 100644 index 0000000000..6bb384bb0b --- /dev/null +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/armv4-fix-v4bx.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Status: not applicable upstream, in OE/Yocto we use $(FIX_V4BX) | ||
2 | which is "" in case of armv5 or thumbs. | ||
3 | |||
4 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | ||
5 | |||
6 | --- a/usr/klibc/arch/arm/MCONFIG 2013-01-09 01:12:02.000000000 +0100 | ||
7 | +++ b/usr/klibc/arch/arm/MCONFIG 2013-01-08 23:45:59.000000000 +0100 | ||
8 | @@ -29,6 +29,7 @@ | ||
9 | KLIBCSHAREDFLAGS = -Ttext 0x01800200 | ||
10 | ifeq ($(CONFIG_AEABI),y) | ||
11 | KLIBCREQFLAGS += -mabi=aapcs-linux -mno-thumb-interwork | ||
12 | +KLIBCLDFLAGS += $(FIX_ARMV4_EABI_BX) | ||
13 | else | ||
14 | KLIBCREQFLAGS += -mabi=apcs-gnu -mno-thumb-interwork | ||
15 | endif | ||
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/klibc-config-eabi.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/klibc-config-eabi.patch new file mode 100644 index 0000000000..316c80a926 --- /dev/null +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/klibc-config-eabi.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | Patch was imported from the OpenEmbedded git server | ||
2 | (git://git.openembedded.org/openembedded) | ||
3 | as of commit id b6764cf32ec93547531130dca364fb95e1c495f4 | ||
4 | Signed-off-by: Thomas Kunze <thommycheck@gmx.de> | ||
5 | |||
6 | diff -Nur klibc-1.5/defconfig klibc-1.5p/defconfig | ||
7 | --- klibc-1.5/defconfig 2007-03-04 02:52:10.000000000 +0100 | ||
8 | +++ klibc-1.5p/defconfig 2008-02-08 19:24:22.337127756 +0100 | ||
9 | @@ -5,4 +5,4 @@ | ||
10 | CONFIG_REGPARM=y | ||
11 | # ARM options | ||
12 | # CONFIG_KLIBC_THUMB is not set | ||
13 | -# CONFIG_AEABI is not set | ||
14 | +CONFIG_AEABI=y | ||
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/klibc-linux-libc-dev.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/klibc-linux-libc-dev.patch new file mode 100644 index 0000000000..204306475f --- /dev/null +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/klibc-linux-libc-dev.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | commit 43adf69062254fb4f8d4d11fb5fe36a60ae25d5a | ||
2 | Author: Ben Hutchings <ben@decadent.org.uk> | ||
3 | Date: Sun Mar 14 18:41:56 2010 +0000 | ||
4 | |||
5 | Taken from debian "Fix klibc Debian specific build trouble" | ||
6 | Adapted for klibc_2.0.2 | ||
7 | |||
8 | Index: klibc-2.0~rc2/scripts/Kbuild.install | ||
9 | =================================================================== | ||
10 | --- klibc-2.0~rc2.orig/scripts/Kbuild.install 2012-02-11 18:50:21.000000000 +0000 | ||
11 | +++ klibc-2.0~rc2/scripts/Kbuild.install 2012-02-11 19:04:52.000000000 +0000 | ||
12 | @@ -95,7 +95,9 @@ | ||
13 | $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include | ||
14 | $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib | ||
15 | $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin | ||
16 | - $(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install | ||
17 | + $(Q)for x in ../../../include/asm ../../../include/asm-generic ../../../include/linux ../../../include/mtd; do \ | ||
18 | + ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \ | ||
19 | + done | ||
20 | $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. | ||
21 | $(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include | ||
22 | $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 | ||
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/staging.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/staging.patch new file mode 100644 index 0000000000..400864bb2f --- /dev/null +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/staging.patch | |||
@@ -0,0 +1,144 @@ | |||
1 | Patch was imported from the OpenEmbedded git server | ||
2 | (git://git.openembedded.org/openembedded) | ||
3 | as of commit id eefb99a313bbcc8f34c8b32bf0c5aa2dd2580735 | ||
4 | Signed-off-by: Thomas Kunze <thommycheck@gmx.de> | ||
5 | |||
6 | Minor edits following upstream changes | ||
7 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | ||
8 | |||
9 | Index: klibc-1.5.24/scripts/Kbuild.install | ||
10 | =================================================================== | ||
11 | --- a/scripts/Kbuild.install 2011-07-27 15:50:53.000000000 +0200 | ||
12 | +++ b/scripts/Kbuild.install 2011-08-01 00:03:03.000000000 +0200 | ||
13 | @@ -88,13 +88,10 @@ | ||
14 | header: | ||
15 | $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)" | ||
16 | $(Q)mkdir -p $(INSTALLROOT)$(bindir) | ||
17 | - $(Q)mkdir -p $(INSTALLROOT)$(mandir)/man1 | ||
18 | - $(Q)mkdir -p $(INSTALLROOT)$(SHLIBDIR) | ||
19 | $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR) | ||
20 | $(Q)-rm -rf $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include | ||
21 | $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include | ||
22 | $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib | ||
23 | - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin | ||
24 | $(Q)for x in ../../../include/asm ../../../include/asm-generic ../../../include/linux ../../../include/mtd; do \ | ||
25 | ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \ | ||
26 | done | ||
27 | @@ -103,7 +100,6 @@ | ||
28 | done | ||
29 | $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. | ||
30 | $(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include | ||
31 | - $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 | ||
32 | $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir) | ||
33 | |||
34 | footer: header | ||
35 | |||
36 | Index: klibc-1.5.24/usr/dash/Kbuild | ||
37 | =================================================================== | ||
38 | --- a/usr/dash/Kbuild 2011-07-27 15:50:53.000000000 +0200 | ||
39 | +++ b/usr/dash/Kbuild 2011-08-01 00:07:56.000000000 +0200 | ||
40 | @@ -92,5 +92,3 @@ | ||
41 | $(obj)/syntax.h: $(obj)/syntax.c | ||
42 | $(Q): | ||
43 | |||
44 | -# Targets to install | ||
45 | -install-y := sh.shared | ||
46 | |||
47 | Index: klibc-1.5.24/usr/gzip/Kbuild | ||
48 | =================================================================== | ||
49 | --- a/usr/gzip/Kbuild 2011-07-27 15:50:53.000000000 +0200 | ||
50 | +++ b/usr/gzip/Kbuild 2011-08-01 00:06:39.000000000 +0200 | ||
51 | @@ -21,5 +21,3 @@ | ||
52 | # Cleaning | ||
53 | targets := gzip gzip.g gunzip zcat | ||
54 | |||
55 | -# Targets to install | ||
56 | -install-y := gzip gunzip zcat | ||
57 | |||
58 | Index: klibc-1.5.24/usr/kinit/fstype/Kbuild | ||
59 | =================================================================== | ||
60 | --- a/usr/kinit/fstype/Kbuild 2011-07-27 15:50:53.000000000 +0200 | ||
61 | +++ b/usr/kinit/fstype/Kbuild 2011-08-01 00:09:12.000000000 +0200 | ||
62 | @@ -21,5 +21,3 @@ | ||
63 | # Cleaning | ||
64 | clean-dirs := static shared | ||
65 | |||
66 | -# install binary | ||
67 | -install-y := $(shared-y) | ||
68 | |||
69 | Index: klibc-1.5.24/usr/kinit/ipconfig/Kbuild | ||
70 | =================================================================== | ||
71 | --- a/usr/kinit/ipconfig/Kbuild 2011-07-27 15:50:53.000000000 +0200 | ||
72 | +++ b/usr/kinit/ipconfig/Kbuild 2011-08-01 00:10:52.000000000 +0200 | ||
73 | @@ -27,5 +27,3 @@ | ||
74 | # Cleaning | ||
75 | clean-dirs := static shared | ||
76 | |||
77 | -# install binary | ||
78 | -install-y := $(shared-y) | ||
79 | |||
80 | Index: klibc-1.5.24/usr/kinit/Kbuild | ||
81 | =================================================================== | ||
82 | --- a/usr/kinit/Kbuild 2011-07-27 15:50:53.000000000 +0200 | ||
83 | +++ b/usr/kinit/Kbuild 2011-08-01 00:20:18.000000000 +0200 | ||
84 | @@ -33,5 +33,3 @@ | ||
85 | subdir- := fstype ipconfig nfsmount resume run-init | ||
86 | |||
87 | |||
88 | -# install binary | ||
89 | -install-y := kinit kinit.shared | ||
90 | |||
91 | Index: klibc-1.5.24/usr/kinit/nfsmount/Kbuild | ||
92 | =================================================================== | ||
93 | --- a/usr/kinit/nfsmount/Kbuild 2011-07-27 15:50:53.000000000 +0200 | ||
94 | +++ b/usr/kinit/nfsmount/Kbuild 2011-08-01 00:12:52.000000000 +0200 | ||
95 | @@ -23,5 +23,3 @@ | ||
96 | |||
97 | clean-dirs := static shared | ||
98 | |||
99 | -# Install binary | ||
100 | -install-y := $(shared-y) | ||
101 | |||
102 | Index: klibc-1.5.24/usr/kinit/resume/Kbuild | ||
103 | =================================================================== | ||
104 | --- a/usr/kinit/resume/Kbuild 2011-07-27 15:50:53.000000000 +0200 | ||
105 | +++ b/usr/kinit/resume/Kbuild 2011-08-01 00:13:51.000000000 +0200 | ||
106 | @@ -26,5 +26,3 @@ | ||
107 | # Cleaning | ||
108 | clean-dirs := static shared | ||
109 | |||
110 | -# install binary | ||
111 | -install-y := $(shared-y) | ||
112 | |||
113 | Index: klibc-1.5.24/usr/kinit/run-init/Kbuild | ||
114 | =================================================================== | ||
115 | --- a/usr/kinit/run-init/Kbuild 2011-07-27 15:50:53.000000000 +0200 | ||
116 | +++ b/usr/kinit/run-init/Kbuild 2011-08-01 00:14:41.000000000 +0200 | ||
117 | @@ -25,5 +25,3 @@ | ||
118 | # Cleaning | ||
119 | clean-dirs := static shared | ||
120 | |||
121 | -# install binary | ||
122 | -install-y := $(shared-y) | ||
123 | |||
124 | Index: klibc-1.5.24/usr/klibc/Kbuild | ||
125 | =================================================================== | ||
126 | --- a/usr/klibc/Kbuild 2011-07-27 15:50:53.000000000 +0200 | ||
127 | +++ b/usr/klibc/Kbuild 2011-08-01 00:18:11.000000000 +0200 | ||
128 | @@ -177,5 +177,3 @@ | ||
129 | $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib)) | ||
130 | $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \ | ||
131 | $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib | ||
132 | - $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \ | ||
133 | - $(INSTALLROOT)$(SHLIBDIR) | ||
134 | |||
135 | Index: klibc-1.5.24/usr/utils/Kbuild | ||
136 | =================================================================== | ||
137 | --- a/usr/utils/Kbuild 2011-07-27 15:50:53.000000000 +0200 | ||
138 | +++ b/usr/utils/Kbuild 2011-08-01 00:19:13.000000000 +0200 | ||
139 | @@ -72,5 +72,3 @@ | ||
140 | # Clean deletes the static and shared dir | ||
141 | clean-dirs := static shared | ||
142 | |||
143 | -# install only install the shared binaries | ||
144 | -install-y := $(shared-y) shared/reboot shared/poweroff | ||
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/use-env-for-perl.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/use-env-for-perl.patch new file mode 100644 index 0000000000..eac128cc09 --- /dev/null +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/use-env-for-perl.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Patch was imported from the OpenEmbedded git server | ||
2 | (git://git.openembedded.org/openembedded) | ||
3 | as of commit id 676cbb54d42c89a4832871064cfcb7ee2ad372ee | ||
4 | |||
5 | klcc-cross: Add patch to use /usr/bin/env perl | ||
6 | Certain configurations (such as autobuilders) may build in very | ||
7 | deep paths (that are longer than the #! mechanism allows) which | ||
8 | makes it unsafe to use the direct path for perl. In our case we know | ||
9 | that /usr/bin/env perl will always return ours (if it has been built). | ||
10 | |||
11 | Signed-off-by: Tom Rini <tom_rini@mentor.com> | ||
12 | |||
13 | Index: klibc-1.5.20/klcc/makeklcc.pl | ||
14 | =================================================================== | ||
15 | --- a/klcc/makeklcc.pl | ||
16 | +++ b/klcc/makeklcc.pl | ||
17 | @@ -26,7 +26,7 @@ sub pathsearch($) { | ||
18 | return undef; | ||
19 | } | ||
20 | |||
21 | -print "#!${perlpath}\n"; | ||
22 | +print "#!/usr/bin/env perl\n"; | ||
23 | |||
24 | open(KLIBCCONF, "< $klibcconf\0") | ||
25 | or die "$0: cannot open $klibcconf: $!\n"; | ||