summaryrefslogtreecommitdiffstats
path: root/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26
diff options
context:
space:
mode:
Diffstat (limited to 'meta-initramfs/recipes-devtools/klibc/klibc-1.5.26')
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klibc-linux-libc-dev.patch23
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/prefix.patch14
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/staging.patch23
3 files changed, 44 insertions, 16 deletions
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/klibc-linux-libc-dev.patch
new file mode 100644
index 000000000..3c55e1482
--- /dev/null
+++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/klibc-linux-libc-dev.patch
@@ -0,0 +1,23 @@
1commit 43adf69062254fb4f8d4d11fb5fe36a60ae25d5a
2Author: Ben Hutchings <ben@decadent.org.uk>
3Date: Sun Mar 14 18:41:56 2010 +0000
4
5 Taken from debian "Fix klibc Debian specific build trouble"
6
7Index: klibc-2.0~rc2/scripts/Kbuild.install
8===================================================================
9--- klibc-2.0~rc2.orig/scripts/Kbuild.install 2012-02-11 18:50:21.000000000 +0000
10+++ klibc-2.0~rc2/scripts/Kbuild.install 2012-02-11 19:04:52.000000000 +0000
11@@ -95,8 +95,11 @@
12 $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
13 $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
14 $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
15- $(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
16+ $(Q)for x in $(KLIBCKERNELSRC)/include/asm $(KLIBCKERNELSRC)/include/asm* $(KLIBCKERNELSRC)/include/linux $(KLIBCKERNELSRC)/include/mtd; do \
17+ ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \
18+ done
19 $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
20+ $(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
21 $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
22 $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
23
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/prefix.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/prefix.patch
new file mode 100644
index 000000000..6f5ff0d60
--- /dev/null
+++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/prefix.patch
@@ -0,0 +1,14 @@
1Index: klibc-1.5.24/Makefile
2===================================================================
3--- a/Makefile 2011-07-27 15:50:53.000000000 +0200
4+++ b/Makefile 2011-08-01 00:47:56.000000000 +0200
5@@ -39,7 +39,7 @@
6 export PERL := perl
7
8 # Location for installation
9-export prefix = /usr
10+export prefix = $(INST)
11 export bindir = $(prefix)/bin
12 export libdir = $(prefix)/lib
13 export mandir = $(prefix)/man
14
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/staging.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/staging.patch
index cedd5e639..03955f25c 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/staging.patch
+++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/staging.patch
@@ -6,25 +6,11 @@ Signed-off-by: Thomas Kunze <thommycheck@gmx.de>
6Minor edits following upstream changes 6Minor edits following upstream changes
7Signed-off-by: Andrea Adami <andrea.adami@gmail.com> 7Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
8 8
9Index: klibc-1.5.24/Makefile
10===================================================================
11--- a/Makefile 2011-07-27 15:50:53.000000000 +0200
12+++ b/Makefile 2011-08-01 00:47:56.000000000 +0200
13@@ -39,7 +39,7 @@
14 export PERL := perl
15
16 # Location for installation
17-export prefix = /usr
18+export prefix = $(INST)
19 export bindir = $(prefix)/bin
20 export libdir = $(prefix)/lib
21 export mandir = $(prefix)/man
22
23Index: klibc-1.5.24/scripts/Kbuild.install 9Index: klibc-1.5.24/scripts/Kbuild.install
24=================================================================== 10===================================================================
25--- a/scripts/Kbuild.install 2011-07-27 15:50:53.000000000 +0200 11--- a/scripts/Kbuild.install 2011-07-27 15:50:53.000000000 +0200
26+++ b/scripts/Kbuild.install 2011-08-01 00:03:03.000000000 +0200 12+++ b/scripts/Kbuild.install 2011-08-01 00:03:03.000000000 +0200
27@@ -88,16 +88,12 @@ 13@@ -88,13 +88,10 @@
28 header: 14 header:
29 $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)" 15 $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)"
30 $(Q)mkdir -p $(INSTALLROOT)$(bindir) 16 $(Q)mkdir -p $(INSTALLROOT)$(bindir)
@@ -35,8 +21,13 @@ Index: klibc-1.5.24/scripts/Kbuild.install
35 $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include 21 $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
36 $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib 22 $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
37- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin 23- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
38 $(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install 24 $(Q)for x in $(KLIBCKERNELSRC)/include/asm $(KLIBCKERNELSRC)/include/asm* $(KLIBCKERNELSRC)/include/linux $(KLIBCKERNELSRC)/include/mtd; do \
25 ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \
26 done
27@@ -103,7 +100,6 @@
28 done
39 $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. 29 $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
30 $(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
40- $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 31- $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
41 $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir) 32 $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
42 33