mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-15 16:07:26 +00:00
Code Issues Projects Releases Wiki Activity

klibc: upgrade from 2.0.1 to 2.0.2

Browse Source 
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Andrea Adami
2012-10-24 23:08:55 +00:00
committed by Koen Kooi
parent de40d9357d
commit a398b07f29
11 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/klcc_prefix.patch
+24
View File
@@ -0,0 +1,24 @@
Patch was imported from the OpenEmbedded git server
(git://git.openembedded.org/openembedded)
as of commit id a29bf15b9c9c0d15f96c254b2ed830e104ae3436
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Index: klibc-1.5.19/klcc/Kbuild
===================================================================
--- --- klibc-1.5.19.orig/klcc/Kbuild 2010-07-07 14:07:48.000000000 +0200
+++ --- klibc-1.5.19./klcc/Kbuild 2010-08-18 23:39:23.000000000 +0200
@@ -22,10 +22,10 @@
$(Q)echo 'EMAIN=$(KLIBCEMAIN)' >> $@
$(Q)echo 'BITSIZE=$(KLIBCBITSIZE)' >> $@
$(Q)echo 'VERSION=$(shell cat $(srctree)/usr/klibc/version)' >> $@
- $(Q)echo 'prefix=$(INSTALLDIR)' >> $@
- $(Q)echo 'bindir=$(INSTALLDIR)/$(KCROSS)bin' >> $@
- $(Q)echo 'libdir=$(INSTALLDIR)/$(KCROSS)lib' >> $@
- $(Q)echo 'includedir=$(INSTALLDIR)/$(KCROSS)include' >> $@
+ $(Q)echo 'prefix=$(KLCC_INST)' >> $@
+ $(Q)echo 'bindir=$(KLCC_INST)/$(KCROSS)bin' >> $@
+ $(Q)echo 'libdir=$(KLCC_INST)/$(KCROSS)lib' >> $@
+ $(Q)echo 'includedir=$(KLCC_INST)/$(KCROSS)include' >> $@
# Generate klcc
meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/klibc-config-eabi.patch
+14
View File
@@ -0,0 +1,14 @@
Patch was imported from the OpenEmbedded git server
(git://git.openembedded.org/openembedded)
as of commit id b6764cf32ec93547531130dca364fb95e1c495f4
Signed-off-by: Thomas Kunze <thommycheck@gmx.de>
diff -Nur klibc-1.5/defconfig klibc-1.5p/defconfig
--- klibc-1.5/defconfig 2007-03-04 02:52:10.000000000 +0100
+++ klibc-1.5p/defconfig 2008-02-08 19:24:22.337127756 +0100
@@ -5,4 +5,4 @@
CONFIG_REGPARM=y
# ARM options
# CONFIG_KLIBC_THUMB is not set
-# CONFIG_AEABI is not set
+CONFIG_AEABI=y
meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/klibc-linux-libc-dev.patch
+22
View File
@@ -0,0 +1,22 @@
commit 43adf69062254fb4f8d4d11fb5fe36a60ae25d5a
Author: Ben Hutchings <ben@decadent.org.uk>
Date: Sun Mar 14 18:41:56 2010 +0000
Taken from debian "Fix klibc Debian specific build trouble"
Adapted for klibc_2.0.2
Index: klibc-2.0~rc2/scripts/Kbuild.install
===================================================================
--- klibc-2.0~rc2.orig/scripts/Kbuild.install 2012-02-11 18:50:21.000000000 +0000
+++ klibc-2.0~rc2/scripts/Kbuild.install 2012-02-11 19:04:52.000000000 +0000
@@ -95,7 +95,9 @@
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
- $(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
+ $(Q)for x in $(KLIBCKERNELSRC)/include/asm $(KLIBCKERNELSRC)/include/asm* $(KLIBCKERNELSRC)/include/linux $(KLIBCKERNELSRC)/include/mtd; do \
+ ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \
+ done
$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
$(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
$(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/prefix.patch
+14
View File
@@ -0,0 +1,14 @@
Index: klibc-1.5.24/Makefile
===================================================================
--- a/Makefile 2011-07-27 15:50:53.000000000 +0200
+++ b/Makefile 2011-08-01 00:47:56.000000000 +0200
@@ -39,7 +39,7 @@
export PERL := perl
# Location for installation
-export prefix = /usr
+export prefix = $(INST)
export bindir = $(prefix)/bin
export libdir = $(prefix)/lib
export mandir = $(prefix)/man
meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/staging.patch
+144
View File
@@ -0,0 +1,144 @@
Patch was imported from the OpenEmbedded git server
(git://git.openembedded.org/openembedded)
as of commit id eefb99a313bbcc8f34c8b32bf0c5aa2dd2580735
Signed-off-by: Thomas Kunze <thommycheck@gmx.de>
Minor edits following upstream changes
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Index: klibc-1.5.24/scripts/Kbuild.install
===================================================================
--- a/scripts/Kbuild.install 2011-07-27 15:50:53.000000000 +0200
+++ b/scripts/Kbuild.install 2011-08-01 00:03:03.000000000 +0200
@@ -88,13 +88,10 @@
header:
$(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)"
$(Q)mkdir -p $(INSTALLROOT)$(bindir)
- $(Q)mkdir -p $(INSTALLROOT)$(mandir)/man1
- $(Q)mkdir -p $(INSTALLROOT)$(SHLIBDIR)
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)
$(Q)-rm -rf $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
$(Q)for x in $(KLIBCKERNELSRC)/include/asm $(KLIBCKERNELSRC)/include/asm* $(KLIBCKERNELSRC)/include/linux $(KLIBCKERNELSRC)/include/mtd; do \
ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \
done
@@ -103,7 +100,6 @@
done
$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
$(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
- $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
$(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
footer: header
Index: klibc-1.5.24/usr/dash/Kbuild
===================================================================
--- a/usr/dash/Kbuild 2011-07-27 15:50:53.000000000 +0200
+++ b/usr/dash/Kbuild 2011-08-01 00:07:56.000000000 +0200
@@ -92,5 +92,3 @@
$(obj)/syntax.h: $(obj)/syntax.c
$(Q):
-# Targets to install
-install-y := sh.shared
Index: klibc-1.5.24/usr/gzip/Kbuild
===================================================================
--- a/usr/gzip/Kbuild 2011-07-27 15:50:53.000000000 +0200
+++ b/usr/gzip/Kbuild 2011-08-01 00:06:39.000000000 +0200
@@ -21,5 +21,3 @@
# Cleaning
targets := gzip gzip.g gunzip zcat
-# Targets to install
-install-y := gzip gunzip zcat
Index: klibc-1.5.24/usr/kinit/fstype/Kbuild
===================================================================
--- a/usr/kinit/fstype/Kbuild 2011-07-27 15:50:53.000000000 +0200
+++ b/usr/kinit/fstype/Kbuild 2011-08-01 00:09:12.000000000 +0200
@@ -21,5 +21,3 @@
# Cleaning
clean-dirs := static shared
-# install binary
-install-y := $(shared-y)
Index: klibc-1.5.24/usr/kinit/ipconfig/Kbuild
===================================================================
--- a/usr/kinit/ipconfig/Kbuild 2011-07-27 15:50:53.000000000 +0200
+++ b/usr/kinit/ipconfig/Kbuild 2011-08-01 00:10:52.000000000 +0200
@@ -27,5 +27,3 @@
# Cleaning
clean-dirs := static shared
-# install binary
-install-y := $(shared-y)
Index: klibc-1.5.24/usr/kinit/Kbuild
===================================================================
--- a/usr/kinit/Kbuild 2011-07-27 15:50:53.000000000 +0200
+++ b/usr/kinit/Kbuild 2011-08-01 00:20:18.000000000 +0200
@@ -33,5 +33,3 @@
subdir- := fstype ipconfig nfsmount resume run-init
-# install binary
-install-y := kinit kinit.shared
Index: klibc-1.5.24/usr/kinit/nfsmount/Kbuild
===================================================================
--- a/usr/kinit/nfsmount/Kbuild 2011-07-27 15:50:53.000000000 +0200
+++ b/usr/kinit/nfsmount/Kbuild 2011-08-01 00:12:52.000000000 +0200
@@ -23,5 +23,3 @@
clean-dirs := static shared
-# Install binary
-install-y := $(shared-y)
Index: klibc-1.5.24/usr/kinit/resume/Kbuild
===================================================================
--- a/usr/kinit/resume/Kbuild 2011-07-27 15:50:53.000000000 +0200
+++ b/usr/kinit/resume/Kbuild 2011-08-01 00:13:51.000000000 +0200
@@ -26,5 +26,3 @@
# Cleaning
clean-dirs := static shared
-# install binary
-install-y := $(shared-y)
Index: klibc-1.5.24/usr/kinit/run-init/Kbuild
===================================================================
--- a/usr/kinit/run-init/Kbuild 2011-07-27 15:50:53.000000000 +0200
+++ b/usr/kinit/run-init/Kbuild 2011-08-01 00:14:41.000000000 +0200
@@ -25,5 +25,3 @@
# Cleaning
clean-dirs := static shared
-# install binary
-install-y := $(shared-y)
Index: klibc-1.5.24/usr/klibc/Kbuild
===================================================================
--- a/usr/klibc/Kbuild 2011-07-27 15:50:53.000000000 +0200
+++ b/usr/klibc/Kbuild 2011-08-01 00:18:11.000000000 +0200
@@ -177,5 +177,3 @@
$(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib))
$(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
$(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib
- $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
- $(INSTALLROOT)$(SHLIBDIR)
Index: klibc-1.5.24/usr/utils/Kbuild
===================================================================
--- a/usr/utils/Kbuild 2011-07-27 15:50:53.000000000 +0200
+++ b/usr/utils/Kbuild 2011-08-01 00:19:13.000000000 +0200
@@ -72,5 +72,3 @@
# Clean deletes the static and shared dir
clean-dirs := static shared
-# install only install the shared binaries
-install-y := $(shared-y) shared/reboot shared/poweroff
meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/use-env-for-perl.patch
+25
View File
@@ -0,0 +1,25 @@
Patch was imported from the OpenEmbedded git server
(git://git.openembedded.org/openembedded)
as of commit id 676cbb54d42c89a4832871064cfcb7ee2ad372ee
klcc-cross: Add patch to use /usr/bin/env perl
Certain configurations (such as autobuilders) may build in very
deep paths (that are longer than the #! mechanism allows) which
makes it unsafe to use the direct path for perl. In our case we know
that /usr/bin/env perl will always return ours (if it has been built).
Signed-off-by: Tom Rini <tom_rini@mentor.com>
Index: klibc-1.5.20/klcc/makeklcc.pl
===================================================================
--- a/klcc/makeklcc.pl
+++ b/klcc/makeklcc.pl
@@ -26,7 +26,7 @@ sub pathsearch($) {
return undef;
}
-print "#!${perlpath}\n";
+print "#!/usr/bin/env perl\n";
open(KLIBCCONF, "< $klibcconf\0")
or die "$0: cannot open $klibcconf: $!\n";