Skip to contentSkip to conversation

lua: Drop uclibc patch

PATCH New Khem Raj 1 participant 3 messages Aug 3, 2021

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/3 lua: Drop uclibc patch

This was found during override overhaul we dont support uclibc anymore

---
 .../recipes-devtools/lua/lua/uclibc-pthread.patch   | 13 -------------
 meta-oe/recipes-devtools/lua/lua_5.3.6.bb           |  3 ---
 2 files changed, 16 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/lua/lua/uclibc-pthread.patch
meta-oe/recipes-devtools/lua/lua/uclibc-pthread.patch deleted +0 -13
deleted file mode 100644
index f4cdc5d8c5..0000000000
@@ -1,13 +0,0 @@
-Index: lua-5.1.4/src/Makefile
-===================================================================
---- a/src/Makefile.orig	2013-10-22 22:17:19.929103523 -0400
-+++ a/src/Makefile	2013-10-22 22:18:27.992104545 -0400
-@@ -9,7 +9,7 @@
- CC= gcc
- CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
- LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
--LIBS= -lm $(SYSLIBS) $(MYLIBS)
-+LIBS= -lm -lpthread $(SYSLIBS) $(MYLIBS)
-
- AR= ar rcu
- RANLIB= ranlib
meta-oe/recipes-devtools/lua/lua_5.3.6.bb +0 -3
index a18f9f0833..f830e09259 100644
@@ -30,9 +30,6 @@ inherit pkgconfig binconfig ptest
 PACKAGECONFIG ??= "readline"
 PACKAGECONFIG[readline] = ",,readline"
 
-UCLIBC_PATCHES += "file://uclibc-pthread.patch"
-SRC_URI:append_libc-uclibc = " ${UCLIBC_PATCHES}"
-
 TARGET_CC_ARCH += " -fPIC ${LDFLAGS}"
 EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -fPIC' MYLDFLAGS='${LDFLAGS}'"
 

--
2.32.0

author
#1 lore raw

PATCH 2/3 packagegroup-meta-oe: Correct override name and fix syntax

---
 meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +1 -1
index ad95b9c458..5cd605ff49 100644
@@ -632,7 +632,7 @@ RDEPENDS:packagegroup-meta-oe-kernel ="\
 "
 RDEPENDS:packagegroup-meta-oe-kernel:append:x86 = " intel-speed-select ipmiutil pm-graph turbostat"
 RDEPENDS:packagegroup-meta-oe-kernel:append:x86-64 = " intel-speed-select ipmiutil kpatch pm-graph turbostat bpftool"
-RDEPENDS:packagegroup-meta-oe-kernel:append_poerpc64 = " libpfm4"
+RDEPENDS:packagegroup-meta-oe-kernel:append:powerpc64 = " libpfm4"
 
 # Kernel-selftest does not build with 5.8 and its exluded from build too so until its fixed remove it
 RDEPENDS:packagegroup-meta-oe-kernel:remove = "kernel-selftest"

--
2.32.0

author
#2 lore raw

PATCH 3/3 recipes: Fix override syntax

In reply to Khem Raj
Cc Martin Jansa <[email protected]>
---
 meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb     | 2 +-
 .../recipes-extended/corosync/corosync_3.0.3.bb           | 2 +-
 .../meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb  | 8 ++++----
 meta-oe/recipes-devtools/lapack/lapack_3.9.0.bb           | 4 ++--
 meta-oe/recipes-extended/ostree/ostree_2021.3.bb          | 2 +-
 meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb  | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb +1 -1
index 0f77f65df3..d45c62a082 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 PV = "0.6+git${SRCPV}"
 S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/kexecboot/kexecboot.git"
-SRC_URI:append_libc-klibc = "\
+SRC_URI:append:libc-klibc = "\
     file://0001-kexecboot-Use-new-reboot-API-with-klibc.patch \
     file://0001-make-Add-compiler-includes-in-cflags.patch \
 "
meta-networking/recipes-extended/corosync/corosync_3.0.3.bb +1 -1
index 0af954c310..909296197c 100644
@@ -37,7 +37,7 @@ PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_un
 EXTRA_OECONF = "ac_cv_path_BASHPATH=${base_bindir}/bash ap_cv_cc_pie=no"
 EXTRA_OEMAKE = "tmpfilesdir_DATA="
 
-#do_configure_prepend() {
+#do_configure:prepend() {
 #    ( cd ${S}
 #    ${S}/autogen.sh )
 #}
meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb +4 -4
index d8cf9b9f54..1ca7b6084c 100644
@@ -1,8 +1,8 @@
 DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls."
-DESCRIPTION:append_lirc = " This package contains the lirc daemon, libraries and tools."
-DESCRIPTION:append_lirc-exec = " This package contains a daemon that runs programs on IR signals."
-DESCRIPTION:append_lirc-remotes = " This package contains some config files for remotes."
-DESCRIPTION:append_lirc-nslu2example = " This package contains a working config for RC5 remotes and a modified NSLU2."
+DESCRIPTION:append:lirc = " This package contains the lirc daemon, libraries and tools."
+DESCRIPTION:append:lirc-exec = " This package contains a daemon that runs programs on IR signals."
+DESCRIPTION:append:lirc-remotes = " This package contains some config files for remotes."
+DESCRIPTION:append:lirc-nslu2example = " This package contains a working config for RC5 remotes and a modified NSLU2."
 HOMEPAGE = "http://www.lirc.org"
 SECTION = "console/network"
 LICENSE = "GPLv2"
meta-oe/recipes-devtools/lapack/lapack_3.9.0.bb +2 -2
index 62d4df5e09..1664d637b7 100644
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=930f8aa500a47c7dab0f8efb5a1c9a40"
 # Note this is not officially supported and is just illustrated here to
 # show an example of how it can be done
 # You'll also need your fortran recipe to depend on libgfortran
-#FORTRAN_forcevariable = ",fortran"
-#RUNTIMETARGET_append_pn-gcc-runtime = " libquadmath"
+#FORTRAN:forcevariable = ",fortran"
+#RUNTIMETARGET:append:pn-gcc-runtime = " libquadmath"
 
 DEPENDS = "libgfortran"
 
meta-oe/recipes-extended/ostree/ostree_2021.3.bb +1 -1
index a0576b51e2..b0c9849fad 100644
@@ -154,7 +154,7 @@ RDEPENDS:${PN}:class-target = " \
 # Note that to get ptest to pass you also need:
 #
 #   xattr in DISTRO_FEATURES
-#   static ostree-prepare-root (PACKAGECONFIG_append_pn-ostree = " static")
+#   static ostree-prepare-root (PACKAGECONFIG:append:pn-ostree = " static")
 #   meta-python in your layers
 #   overlayfs in your kernel (KERNEL_EXTRA_FEATURES += "features/overlayfs/overlayfs.scc")
 #   busybox built statically
meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb +1 -1
index 26d51bdafd..bcc85157cb 100644
@@ -26,7 +26,7 @@ EXTRA_OECONF:append:class-native = " with_x=no"
 LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}"
 BUILD_LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}"
 
-#do_configure_prepend() {
+#do_configure:prepend() {
 # uthash sources are expected in uthash/src
 #    mkdir -p ${S}/uthash/src
 #    cp ${STAGING_INCDIR}/ut*.h ${S}/uthash/src

--
2.32.0