From d4ba54f15ff1c9e25771e52b0116c267e251813b Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Tue, 17 Dec 2013 00:37:40 +0100 Subject: klibc: upgrade from 2.0.2 to release 2.0.3 Klibc now supports aarch64 / arm64 While there, remove PR/INC_PR from the recipes Signed-off-by: Andrea Adami --- .../recipes-devtools/klibc/klcc-cross_2.0.2.bb | 32 ----- .../recipes-devtools/klibc/klcc-cross_2.0.3.bb | 30 +++++ .../klibc/klibc-2.0.2/armv4-fix-v4bx.patch | 15 --- .../klibc/klibc-2.0.2/klibc-config-eabi.patch | 14 -- .../klibc/klibc-2.0.2/klibc-linux-libc-dev.patch | 22 ---- .../klibc/klibc-2.0.2/staging.patch | 144 --------------------- .../klibc/klibc-2.0.2/use-env-for-perl.patch | 25 ---- .../klibc/klibc-2.0.3/armv4-fix-v4bx.patch | 15 +++ .../klibc/klibc-2.0.3/klibc-config-eabi.patch | 14 ++ .../klibc/klibc-2.0.3/klibc-linux-libc-dev.patch | 22 ++++ .../klibc/klibc-2.0.3/staging.patch | 144 +++++++++++++++++++++ .../klibc/klibc-2.0.3/use-env-for-perl.patch | 25 ++++ .../klibc/klibc-static-utils_2.0.2.bb | 17 --- .../klibc/klibc-static-utils_2.0.3.bb | 15 +++ .../recipes-devtools/klibc/klibc-utils_2.0.2.bb | 17 --- .../recipes-devtools/klibc/klibc-utils_2.0.3.bb | 15 +++ meta-initramfs/recipes-devtools/klibc/klibc.inc | 4 +- .../recipes-devtools/klibc/klibc_2.0.2.bb | 25 ---- .../recipes-devtools/klibc/klibc_2.0.3.bb | 23 ++++ 19 files changed, 304 insertions(+), 314 deletions(-) delete mode 100644 meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.2.bb create mode 100644 meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.3.bb delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/armv4-fix-v4bx.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/klibc-config-eabi.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/klibc-linux-libc-dev.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/staging.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/use-env-for-perl.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/armv4-fix-v4bx.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/klibc-config-eabi.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/klibc-linux-libc-dev.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/staging.patch create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.3/use-env-for-perl.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.2.bb create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.3.bb delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.2.bb create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.3.bb delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc_2.0.2.bb create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc_2.0.3.bb (limited to 'meta-initramfs') diff --git a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.2.bb b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.2.bb deleted file mode 100644 index 07b76d783d..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.2.bb +++ /dev/null @@ -1,32 +0,0 @@ -PR = "${INC_PR}.0" - -require klibc.inc -SUMMARY = "The klcc crosscompiler for klibc" - -SRC_URI += "file://use-env-for-perl.patch" - -DEPENDS = "klibc" - -FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" - -inherit cross - -do_compile() { - oe_runmake 'INSTALLDIR=${STAGING_DIR_TARGET}${target_libdir}/klibc' klcc -} - -do_install() { - install -d ${D}${bindir} - install -m 0755 klcc/klcc ${D}${bindir}/${TARGET_PREFIX}klcc -} - -# disable task already run in klibc recipe -do_configure[noexec] = "1" - -# disable unneeded tasks -do_package[noexec] = "1" -do_packagedata[noexec] = "1" -do_package_write_ipk[noexec] = "1" -do_package_write_rpm[noexec] = "1" -do_package_write_deb[noexec] = "1" -do_package_write_tar[noexec] = "1" diff --git a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.3.bb b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.3.bb new file mode 100644 index 0000000000..40a65fd562 --- /dev/null +++ b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.3.bb @@ -0,0 +1,30 @@ +require klibc.inc +SUMMARY = "The klcc crosscompiler for klibc" + +SRC_URI += "file://use-env-for-perl.patch" + +DEPENDS = "klibc" + +FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" + +inherit cross + +do_compile() { + oe_runmake 'INSTALLDIR=${STAGING_DIR_TARGET}${target_libdir}/klibc' klcc +} + +do_install() { + install -d ${D}${bindir} + install -m 0755 klcc/klcc ${D}${bindir}/${TARGET_PREFIX}klcc +} + +# disable task already run in klibc recipe +do_configure[noexec] = "1" + +# disable unneeded tasks +do_package[noexec] = "1" +do_packagedata[noexec] = "1" +do_package_write_ipk[noexec] = "1" +do_package_write_rpm[noexec] = "1" +do_package_write_deb[noexec] = "1" +do_package_write_tar[noexec] = "1" diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/armv4-fix-v4bx.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/armv4-fix-v4bx.patch deleted file mode 100644 index 6bb384bb0b..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/armv4-fix-v4bx.patch +++ /dev/null @@ -1,15 +0,0 @@ -Status: not applicable upstream, in OE/Yocto we use $(FIX_V4BX) -which is "" in case of armv5 or thumbs. - -Signed-off-by: Andrea Adami - ---- a/usr/klibc/arch/arm/MCONFIG 2013-01-09 01:12:02.000000000 +0100 -+++ b/usr/klibc/arch/arm/MCONFIG 2013-01-08 23:45:59.000000000 +0100 -@@ -29,6 +29,7 @@ - KLIBCSHAREDFLAGS = -Ttext 0x01800200 - ifeq ($(CONFIG_AEABI),y) - KLIBCREQFLAGS += -mabi=aapcs-linux -mno-thumb-interwork -+KLIBCLDFLAGS += $(FIX_ARMV4_EABI_BX) - else - KLIBCREQFLAGS += -mabi=apcs-gnu -mno-thumb-interwork - endif diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/klibc-config-eabi.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/klibc-config-eabi.patch deleted file mode 100644 index 316c80a926..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/klibc-config-eabi.patch +++ /dev/null @@ -1,14 +0,0 @@ -Patch was imported from the OpenEmbedded git server -(git://git.openembedded.org/openembedded) -as of commit id b6764cf32ec93547531130dca364fb95e1c495f4 -Signed-off-by: Thomas Kunze - -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 diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/klibc-linux-libc-dev.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/klibc-linux-libc-dev.patch deleted file mode 100644 index 204306475f..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/klibc-linux-libc-dev.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 43adf69062254fb4f8d4d11fb5fe36a60ae25d5a -Author: Ben Hutchings -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 ../../../include/asm ../../../include/asm-generic ../../../include/linux ../../../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 diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/staging.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/staging.patch deleted file mode 100644 index 400864bb2f..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/staging.patch +++ /dev/null @@ -1,144 +0,0 @@ -Patch was imported from the OpenEmbedded git server -(git://git.openembedded.org/openembedded) -as of commit id eefb99a313bbcc8f34c8b32bf0c5aa2dd2580735 -Signed-off-by: Thomas Kunze - -Minor edits following upstream changes -Signed-off-by: Andrea Adami - -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 ../../../include/asm ../../../include/asm-generic ../../../include/linux ../../../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 diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/use-env-for-perl.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/use-env-for-perl.patch deleted file mode 100644 index eac128cc09..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.2/use-env-for-perl.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 - -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"; 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 @@ +Status: not applicable upstream, in OE/Yocto we use $(FIX_V4BX) +which is "" in case of armv5 or thumbs. + +Signed-off-by: Andrea Adami + +--- a/usr/klibc/arch/arm/MCONFIG 2013-01-09 01:12:02.000000000 +0100 ++++ b/usr/klibc/arch/arm/MCONFIG 2013-01-08 23:45:59.000000000 +0100 +@@ -29,6 +29,7 @@ + KLIBCSHAREDFLAGS = -Ttext 0x01800200 + ifeq ($(CONFIG_AEABI),y) + KLIBCREQFLAGS += -mabi=aapcs-linux -mno-thumb-interwork ++KLIBCLDFLAGS += $(FIX_ARMV4_EABI_BX) + else + KLIBCREQFLAGS += -mabi=apcs-gnu -mno-thumb-interwork + 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 @@ +Patch was imported from the OpenEmbedded git server +(git://git.openembedded.org/openembedded) +as of commit id b6764cf32ec93547531130dca364fb95e1c495f4 +Signed-off-by: Thomas Kunze + +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 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 @@ +commit 43adf69062254fb4f8d4d11fb5fe36a60ae25d5a +Author: Ben Hutchings +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 ../../../include/asm ../../../include/asm-generic ../../../include/linux ../../../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 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 @@ +Patch was imported from the OpenEmbedded git server +(git://git.openembedded.org/openembedded) +as of commit id eefb99a313bbcc8f34c8b32bf0c5aa2dd2580735 +Signed-off-by: Thomas Kunze + +Minor edits following upstream changes +Signed-off-by: Andrea Adami + +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 ../../../include/asm ../../../include/asm-generic ../../../include/linux ../../../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 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 @@ +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 + +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"; diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.2.bb b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.2.bb deleted file mode 100644 index a3f9ec39fc..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -PR = "${INC_PR}.0" - -KLIBC_UTILS_VARIANT = "static" -KLIBC_UTILS_PKGNAME = "klibc-static-utils" - -FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" - -do_install() { - : -} - -PACKAGES_${PN} = "${PN}" -FILES_${PN} = "" - -require klibc-utils.inc -require klibc.inc -SUMMARY = "klibc utils for initramfs statically compiled" diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.3.bb b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.3.bb new file mode 100644 index 0000000000..36d4f12e67 --- /dev/null +++ b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.3.bb @@ -0,0 +1,15 @@ +KLIBC_UTILS_VARIANT = "static" +KLIBC_UTILS_PKGNAME = "klibc-static-utils" + +FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" + +do_install() { + : +} + +PACKAGES_${PN} = "${PN}" +FILES_${PN} = "" + +require klibc-utils.inc +require klibc.inc +SUMMARY = "klibc utils for initramfs statically compiled" diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.2.bb b/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.2.bb deleted file mode 100644 index c77e041d5e..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -PR = "${INC_PR}.0" - -KLIBC_UTILS_VARIANT = "shared" -KLIBC_UTILS_PKGNAME = "klibc-utils" - -FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" - -do_install() { - : -} - -PACKAGES_${PN} = "${PN}" -FILES_${PN} = "" - -require klibc-utils.inc -require klibc.inc -SUMMARY = "klibc utils for initramfs" diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.3.bb b/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.3.bb new file mode 100644 index 0000000000..d3cebadfe2 --- /dev/null +++ b/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.3.bb @@ -0,0 +1,15 @@ +KLIBC_UTILS_VARIANT = "shared" +KLIBC_UTILS_PKGNAME = "klibc-utils" + +FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" + +do_install() { + : +} + +PACKAGES_${PN} = "${PN}" +FILES_${PN} = "" + +require klibc-utils.inc +require klibc.inc +SUMMARY = "klibc utils for initramfs" diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc index 24ece9c4b4..bf37c0e848 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = "file://usr/klibc/LICENSE;md5=d75181f10e998c21eb147f6d2e43ce8 # debugsources.list: No such file or directory: INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -INC_PR = "r1" - KLIBC_ARCH = '${TARGET_ARCH}' KLIBC_ARCH_aarch64 = 'arm64' KLIBC_ARCH_armeb = 'arm' @@ -27,7 +25,7 @@ KLIBC_ARCH_powerpc64 = 'ppc64' export FIX_ARMV4_EABI_BX = "${FIX_V4BX}" -SRCREV = "f05ff116bb9edbbb81d82fa47b78e630ce878470" +SRCREV = "f0440baf7f2dc1d9a25863c184d0a8fb73c4ee6c" SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git" SRC_URI_append_linux-gnueabi = " file://klibc-config-eabi.patch \ diff --git a/meta-initramfs/recipes-devtools/klibc/klibc_2.0.2.bb b/meta-initramfs/recipes-devtools/klibc/klibc_2.0.2.bb deleted file mode 100644 index 4244cf27cb..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc_2.0.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -PR = "${INC_PR}.0" - -do_install() { - oe_runmake install - - # the crosscompiler is packaged by klcc-cross - # remove klcc - rm ${D}${bindir}/klcc - # remove now empty dir - rmdir ${D}${bindir} - - install -d ${D}${libdir} - install -m 755 usr/klibc/klibc-*.so ${D}${libdir} - (cd ${D}${libdir}; ln -s klibc-*.so klibc.so) -} - -PACKAGES = "libklibc libklibc-staticdev libklibc-dev" -FILES_libklibc = "${libdir}/klibc-*.so" -FILES_libklibc-staticdev = "${libdir}/klibc/lib/libc.a" -FILES_libklibc-dev = "${libdir}/klibc.so \ - ${libdir}/klibc/lib/* \ - ${libdir}/klibc/include/* \ -" -require klibc.inc -SUMMARY = "klibc, a small C library for use with initramfs" diff --git a/meta-initramfs/recipes-devtools/klibc/klibc_2.0.3.bb b/meta-initramfs/recipes-devtools/klibc/klibc_2.0.3.bb new file mode 100644 index 0000000000..e97d2c751f --- /dev/null +++ b/meta-initramfs/recipes-devtools/klibc/klibc_2.0.3.bb @@ -0,0 +1,23 @@ +do_install() { + oe_runmake install + + # the crosscompiler is packaged by klcc-cross + # remove klcc + rm ${D}${bindir}/klcc + # remove now empty dir + rmdir ${D}${bindir} + + install -d ${D}${libdir} + install -m 755 usr/klibc/klibc-*.so ${D}${libdir} + (cd ${D}${libdir}; ln -s klibc-*.so klibc.so) +} + +PACKAGES = "libklibc libklibc-staticdev libklibc-dev" +FILES_libklibc = "${libdir}/klibc-*.so" +FILES_libklibc-staticdev = "${libdir}/klibc/lib/libc.a" +FILES_libklibc-dev = "${libdir}/klibc.so \ + ${libdir}/klibc/lib/* \ + ${libdir}/klibc/include/* \ +" +require klibc.inc +SUMMARY = "klibc, a small C library for use with initramfs" -- cgit 1.2.3-korg