From 04ed4f1383314f0bd96ca3b4c04c64d998a0c0fb Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 7 Oct 2023 17:38:00 -0700 Subject: klibc: Upgrade to 2.0.13 release Drop backported patch and refresh others as needed Signed-off-by: Khem Raj --- ...uild-failure-for-some-architectures-with-.patch | 34 ---------------------- ...001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch | 6 ++-- .../klibc/files/armv4-fix-v4bx.patch | 4 +-- .../recipes-devtools/klibc/klcc-cross_2.0.10.bb | 32 -------------------- .../recipes-devtools/klibc/klcc-cross_2.0.13.bb | 32 ++++++++++++++++++++ .../klibc/klibc-static-utils_2.0.10.bb | 12 -------- .../klibc/klibc-static-utils_2.0.13.bb | 12 ++++++++ .../recipes-devtools/klibc/klibc-utils_2.0.10.bb | 14 --------- .../recipes-devtools/klibc/klibc-utils_2.0.13.bb | 14 +++++++++ meta-initramfs/recipes-devtools/klibc/klibc.inc | 3 +- .../recipes-devtools/klibc/klibc_2.0.10.bb | 26 ----------------- .../recipes-devtools/klibc/klibc_2.0.13.bb | 26 +++++++++++++++++ 12 files changed, 90 insertions(+), 125 deletions(-) delete mode 100644 meta-initramfs/recipes-devtools/klibc/files/0001-fcntl-Fix-build-failure-for-some-architectures-with-.patch delete mode 100644 meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.10.bb create mode 100644 meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.13.bb delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.10.bb create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.13.bb delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.10.bb create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.13.bb delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc_2.0.10.bb create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc_2.0.13.bb (limited to 'meta-initramfs/recipes-devtools') diff --git a/meta-initramfs/recipes-devtools/klibc/files/0001-fcntl-Fix-build-failure-for-some-architectures-with-.patch b/meta-initramfs/recipes-devtools/klibc/files/0001-fcntl-Fix-build-failure-for-some-architectures-with-.patch deleted file mode 100644 index 4fc4b45fb1..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/files/0001-fcntl-Fix-build-failure-for-some-architectures-with-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a33c262f828f803fffdad8e1f44d524dc9c75856 Mon Sep 17 00:00:00 2001 -From: Ben Hutchings -Date: Wed, 3 Aug 2022 01:10:01 +0200 -Subject: [PATCH] fcntl: Fix build failure for some architectures with Linux - 5.19 - -Starting from Linux 5.19, the kernel UAPI headers now only define -__ARCH_FLOCK64_PAD if the architecture actually needs padding in -struct flock64. Wrap its use with #ifdef, - -Upstream-Status: Backport [https://git.kernel.org/pub/scm/libs/klibc/klibc.git/commit/?id=bb2fde5ddbc18a2e7795ca4d24759230c2aae9d0] -Signed-off-by: Ben Hutchings -Signed-off-by: Khem Raj ---- - usr/include/fcntl.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/usr/include/fcntl.h b/usr/include/fcntl.h -index ed703a6..cb2e4e5 100644 ---- a/usr/include/fcntl.h -+++ b/usr/include/fcntl.h -@@ -33,7 +33,9 @@ struct flock { - __kernel_loff_t l_start; - __kernel_loff_t l_len; - __kernel_pid_t l_pid; -+#ifdef __ARCH_FLOCK64_PAD - __ARCH_FLOCK64_PAD -+#endif - }; - - #ifdef F_GETLK64 --- -2.37.2 - diff --git a/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch b/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch index 15b5144e44..e4ae3728a4 100644 --- a/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch +++ b/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch @@ -14,8 +14,8 @@ Signed-off-by: Khem Raj --- a/usr/klibc/Kbuild +++ b/usr/klibc/Kbuild -@@ -183,7 +183,8 @@ $(SOHASH): $(SOLIB) $(SOLIB).hash - targets += interp.o +@@ -190,7 +190,8 @@ $(SOHASH): $(SOLIB) $(SOLIB).hash + targets += shared-stub.o quiet_cmd_interp = BUILD $@ - cmd_interp = $(KLIBCCC) $(klibccflags) -D__ASSEMBLY__ \ @@ -23,4 +23,4 @@ Signed-off-by: Khem Raj + -D__ASSEMBLY__ \ -DLIBDIR=\"$(SHLIBDIR)\" \ -DSOHASH=\"$(SOLIBHASH)\" \ - $(KLIBCSTACKFLAGS) \ + -c -o $@ $< diff --git a/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch b/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch index 585fb2d439..7b29eaf200 100644 --- a/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch +++ b/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch @@ -16,8 +16,8 @@ Upstream-Status: Pending --- a/usr/klibc/arch/arm/MCONFIG +++ b/usr/klibc/arch/arm/MCONFIG -@@ -27,6 +27,7 @@ else - KLIBCSHAREDFLAGS = $(LD_IMAGE_BASE_OPT) 0x01800000 +@@ -23,6 +23,7 @@ else + # Extra linkflags when building the shared version of the library ifeq ($(CONFIG_AEABI),y) KLIBCREQFLAGS += -mabi=aapcs-linux -mno-thumb-interwork +KLIBCLDFLAGS += $(FIX_ARMV4_EABI_BX) diff --git a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.10.bb b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.10.bb deleted file mode 100644 index 4011aa231e..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.10.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "The klcc crosscompiler for klibc" - -require klibc.inc -DEPENDS = "klibc" - -# no packaging for this crossscript -PACKAGES = "" -inherit nopackages - -SRC_URI += "file://use-env-for-perl.patch" - -# disable task already run in klibc recipe -do_configure[noexec] = "1" - -do_compile() { - oe_runmake 'INSTALLDIR=${STAGING_DIR_TARGET}${libdir}/klibc' klcc -} - -do_install() { - install -d ${D}${bindir_crossscripts}/ - install -m 0755 klcc/klcc ${D}${bindir_crossscripts}/${TARGET_PREFIX}klcc - # Turn the horribly encoded paths into something which sstate can transform using its ususal - # magic by removing all the crazy escaping. - sed -i -e "2i \$TARGETSYSROOT = '${STAGING_DIR_TARGET}';" \ - -e "2i \$NATIVESYSROOT = '${STAGING_DIR_NATIVE}';" \ - -e 's#${@d.getVar("STAGING_DIR_NATIVE").replace("/", "\\\\/").replace("-", "\\\\-").replace(".", "\\\\.")}#${NATIVESYSROOT}#g;' \ - -e 's#${@d.getVar("STAGING_DIR_TARGET").replace("/", "\\\\/").replace("-", "\\\\-").replace(".", "\\\\.")}#${TARGETSYSROOT}#g' \ - ${D}${bindir_crossscripts}/${TARGET_PREFIX}klcc -} - -SYSROOT_DIRS += "${bindir_crossscripts}" -SSTATE_SCAN_FILES += "*-klcc" diff --git a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.13.bb b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.13.bb new file mode 100644 index 0000000000..4011aa231e --- /dev/null +++ b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.13.bb @@ -0,0 +1,32 @@ +SUMMARY = "The klcc crosscompiler for klibc" + +require klibc.inc +DEPENDS = "klibc" + +# no packaging for this crossscript +PACKAGES = "" +inherit nopackages + +SRC_URI += "file://use-env-for-perl.patch" + +# disable task already run in klibc recipe +do_configure[noexec] = "1" + +do_compile() { + oe_runmake 'INSTALLDIR=${STAGING_DIR_TARGET}${libdir}/klibc' klcc +} + +do_install() { + install -d ${D}${bindir_crossscripts}/ + install -m 0755 klcc/klcc ${D}${bindir_crossscripts}/${TARGET_PREFIX}klcc + # Turn the horribly encoded paths into something which sstate can transform using its ususal + # magic by removing all the crazy escaping. + sed -i -e "2i \$TARGETSYSROOT = '${STAGING_DIR_TARGET}';" \ + -e "2i \$NATIVESYSROOT = '${STAGING_DIR_NATIVE}';" \ + -e 's#${@d.getVar("STAGING_DIR_NATIVE").replace("/", "\\\\/").replace("-", "\\\\-").replace(".", "\\\\.")}#${NATIVESYSROOT}#g;' \ + -e 's#${@d.getVar("STAGING_DIR_TARGET").replace("/", "\\\\/").replace("-", "\\\\-").replace(".", "\\\\.")}#${TARGETSYSROOT}#g' \ + ${D}${bindir_crossscripts}/${TARGET_PREFIX}klcc +} + +SYSROOT_DIRS += "${bindir_crossscripts}" +SSTATE_SCAN_FILES += "*-klcc" diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.10.bb b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.10.bb deleted file mode 100644 index 0de580781b..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.10.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "klibc utils for initramfs statically compiled" - -FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" - -PACKAGES = "${PN}" -FILES:${PN} = "" - -KLIBC_UTILS_VARIANT = "static" -KLIBC_UTILS_PKGNAME = "klibc-static-utils" - -require klibc-utils.inc -require klibc.inc diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.13.bb b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.13.bb new file mode 100644 index 0000000000..0de580781b --- /dev/null +++ b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.13.bb @@ -0,0 +1,12 @@ +SUMMARY = "klibc utils for initramfs statically compiled" + +FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" + +PACKAGES = "${PN}" +FILES:${PN} = "" + +KLIBC_UTILS_VARIANT = "static" +KLIBC_UTILS_PKGNAME = "klibc-static-utils" + +require klibc-utils.inc +require klibc.inc diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.10.bb b/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.10.bb deleted file mode 100644 index 2f26093cbe..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.10.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "klibc utils for initramfs" - -FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" - -PACKAGES = "${PN}" -FILES:${PN} = "" - -KLIBC_UTILS_VARIANT = "shared" -KLIBC_UTILS_PKGNAME = "klibc-utils" - -require klibc-utils.inc -require klibc.inc - -DEPENDS = "klibc" diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.13.bb b/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.13.bb new file mode 100644 index 0000000000..2f26093cbe --- /dev/null +++ b/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.13.bb @@ -0,0 +1,14 @@ +SUMMARY = "klibc utils for initramfs" + +FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" + +PACKAGES = "${PN}" +FILES:${PN} = "" + +KLIBC_UTILS_VARIANT = "shared" +KLIBC_UTILS_PKGNAME = "klibc-utils" + +require klibc-utils.inc +require klibc.inc + +DEPENDS = "klibc" diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc index 5acf679983..113459b523 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -20,7 +20,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/klibc/2.0/klibc-${PV}.tar.xz \ file://0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch \ file://cross-clang.patch \ file://0001-workaround-for-overlapping-sections-in-binary.patch \ - file://0001-fcntl-Fix-build-failure-for-some-architectures-with-.patch \ " ARMPATCHES ?= "" @@ -28,7 +27,7 @@ ARMPATCHES ?= "" ARMPATCHES:arm = " \ file://armv4-fix-v4bx.patch \ " -SRC_URI[sha256sum] = "662753da8889e744dfc0db6eb4021c3377ee7ef8ed66d7d57765f8c9e25939cd" +SRC_URI[sha256sum] = "d673a294f742d59368222ff5c38462d81098c55063799de6fb8a7ba3d4af0436" S = "${WORKDIR}/klibc-${PV}" diff --git a/meta-initramfs/recipes-devtools/klibc/klibc_2.0.10.bb b/meta-initramfs/recipes-devtools/klibc/klibc_2.0.10.bb deleted file mode 100644 index 8dda9a8cdc..0000000000 --- a/meta-initramfs/recipes-devtools/klibc/klibc_2.0.10.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "klibc, a small C library for use with initramfs" - -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) - rm -rf ${D}${exec_prefix}/man - rm -rf ${D}${libdir}/klibc/bin -} - -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 diff --git a/meta-initramfs/recipes-devtools/klibc/klibc_2.0.13.bb b/meta-initramfs/recipes-devtools/klibc/klibc_2.0.13.bb new file mode 100644 index 0000000000..8dda9a8cdc --- /dev/null +++ b/meta-initramfs/recipes-devtools/klibc/klibc_2.0.13.bb @@ -0,0 +1,26 @@ +SUMMARY = "klibc, a small C library for use with initramfs" + +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) + rm -rf ${D}${exec_prefix}/man + rm -rf ${D}${libdir}/klibc/bin +} + +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 -- cgit v1.2.3-54-g00ecf