diff options
author | Andrea Adami <andrea.adami@gmail.com> | 2016-02-12 00:01:08 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-25 17:45:44 +0100 |
commit | 187ed6481179884415b800bfb45632215fa23c53 (patch) | |
tree | 9aa1c91a3ee160c1dfc25b17605e754e863b40d1 | |
parent | e7d07e7942b9f664c1500c4225092df3bc3e8fe9 (diff) | |
download | meta-openembedded-187ed6481179884415b800bfb45632215fa23c53.tar.gz |
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 <andrea.adami@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch | 2 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc.inc | 2 |
2 files changed, 2 insertions, 2 deletions
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 | |||
27 | @@ -103,7 +100,6 @@ | 27 | @@ -103,7 +100,6 @@ |
28 | done | 28 | done |
29 | $(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 | 30 | $(Q)chmod -R a+rX,go-w $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include |
31 | - $(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 |
32 | $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir) | 32 | $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir) |
33 | 33 | ||
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" | |||
5 | LICENSE = "BSD-3-Clause & GPL-2.0 & MIT & Zlib" | 5 | LICENSE = "BSD-3-Clause & GPL-2.0 & MIT & Zlib" |
6 | LIC_FILES_CHKSUM = "file://usr/klibc/LICENSE;md5=d75181f10e998c21eb147f6d2e43ce8b" | 6 | LIC_FILES_CHKSUM = "file://usr/klibc/LICENSE;md5=d75181f10e998c21eb147f6d2e43ce8b" |
7 | DEPENDS = "linux-libc-headers perl-native" | 7 | DEPENDS = "linux-libc-headers perl-native" |
8 | SRCREV = "7763dd33e5b8eed4b9e3c583c02c10176fd550d3" | 8 | SRCREV = "4d19974d7020488f63651244e1f9f51727c3f66c" |
9 | 9 | ||
10 | SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git" | 10 | SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git" |
11 | SRC_URI_append_linux-gnueabi = " file://klibc-config-eabi.patch \ | 11 | SRC_URI_append_linux-gnueabi = " file://klibc-config-eabi.patch \ |