klibc_2.0.4 fixes
cover klibc_2.0.4 fixes
Kernel 4.4 exposed a build failure for qemux86.
The necessary fixes are present in the official klibc git tree: while waiting for klibc_2.0.5 we move to the more recent tag.
do_package_qa is skipped for libklibc-dev: package contents are like in debian.
Andrea Adami (3):
klibc_2.0.4: update to 4d1997d - Fix build for qemux86 klibc_2.0.4: Silence QA Error about non-symlink so [dev-elf] klibc_2.0.4: Silence QA Warning about klibc-xxx-so already stripped
meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch | 2 +- meta-initramfs/recipes-devtools/klibc/klibc.inc | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)
Signature · 1 line
1.9.1
PATCH 1/3 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'
--- 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(-)
meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch +1 -1
@@ -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)
meta-initramfs/recipes-devtools/klibc/klibc.inc +1 -1
@@ -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 \
Signature · 1 line
1.9.1
PATCH 2/3 klibc_2.0.4: Silence QA Error about non-symlink so [dev-elf]
In reply to Andrea AdamiFollowing debian packaging-style we have a copy of klibc-xxx.so in libklibc-dev. (Comments can be found in klibc.spec.in)
Fixes:
ERROR: QA Issue: -dev package contains non-symlink .so:
ibklibc-dev path 'work/i586-oe-linux/klibc/2.0.4-r0/packages-split/ libklibc-dev/usr/lib/klibc/lib/klibc-HWWIvOaMdZy4N4-6rLLHAB2TjFQ.so' -dev package contains non-symlink .so:
libklibc-dev path 'work/i586-oe-linux/klibc/2.0.4-r0/packages-split/ libklibc-dev/usr/lib/klibc/lib/libc.so' [dev-elf]
--- meta-initramfs/recipes-devtools/klibc/klibc.inc | 1 + 1 file changed, 1 insertion(+)
meta-initramfs/recipes-devtools/klibc/klibc.inc +1 -0
@@ -38,6 +38,7 @@ do_configure () { INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INSANE_SKIP_libklibc-dev = "dev-elf" KLIBC_ARCH = "${TARGET_ARCH}" KLIBC_ARCH_aarch64 = "arm64" KLIBC_ARCH_armeb = "arm"
Signature · 1 line
1.9.1
PATCH 3/3 klibc_2.0.4: Silence Warning about klibc-xxx-so already stripped
In reply to Andrea AdamiFixes:
WARNING: File 'usr/lib/klibc-HWWIvOaMdZy4N4-6rLLHAB2TjFQ.so' from klibc was already stripped, this will prevent future debugging!
WARNING: File 'usr/lib/klibc/lib/klibc-HWWIvOaMdZy4N4-6rLLHAB2TjFQ.so' from klibc was already stripped, this will prevent future debugging!
--- meta-initramfs/recipes-devtools/klibc/klibc.inc | 1 + 1 file changed, 1 insertion(+)
meta-initramfs/recipes-devtools/klibc/klibc.inc +1 -0
@@ -38,6 +38,7 @@ do_configure () { INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INSANE_SKIP_${PN} = "already-stripped" INSANE_SKIP_libklibc-dev = "dev-elf" KLIBC_ARCH = "${TARGET_ARCH}" KLIBC_ARCH_aarch64 = "arm64"
Signature · 1 line
1.9.1