From 187ed6481179884415b800bfb45632215fa23c53 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Fri, 12 Feb 2016 00:01:08 +0100 Subject: klibc_2.0.4: update to 4d1997d - Fix build for qemux86 Minimally rebase staging.patch and follow upstream commits. Fixes: | usr/klibc/socketcalls/socket.o: In function `socket': | .../usr/klibc/socketcalls/socket.S:8: multiple definition of `socket' Signed-off-by: Andrea Adami Signed-off-by: Martin Jansa --- meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch | 2 +- meta-initramfs/recipes-devtools/klibc/klibc.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-initramfs') diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch index 400864bb2..c01c712a1 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch @@ -27,7 +27,7 @@ Index: klibc-1.5.24/scripts/Kbuild.install @@ -103,7 +100,6 @@ done $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. - $(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include + $(Q)chmod -R a+rX,go-w $(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) diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc index a707ed58f..903424b1a 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "BSD-3-Clause & GPL-2.0 & MIT & Zlib" LIC_FILES_CHKSUM = "file://usr/klibc/LICENSE;md5=d75181f10e998c21eb147f6d2e43ce8b" DEPENDS = "linux-libc-headers perl-native" -SRCREV = "7763dd33e5b8eed4b9e3c583c02c10176fd550d3" +SRCREV = "4d19974d7020488f63651244e1f9f51727c3f66c" SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git" SRC_URI_append_linux-gnueabi = " file://klibc-config-eabi.patch \ -- cgit v1.2.3-54-g00ecf