From: Changqing Li <changqing.li@...>

liblockfile do_install task will fail when ldconfig is not installed
on the host. Delete the useless line to fix the issue.

Signed-off-by: Changqing Li <changqing.li@...>
---
...akefile.in-Don-t-try-to-run-ldconfig.patch | 43 +++++++++++++++++++
.../liblockfile/liblockfile_1.14.bb | 1 +
2 files changed, 44 insertions(+)
create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-Don-t-try-to-run-ldconfig.patch

diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-Don-t-try-to-run-ldconfig.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-Don-t-try-to-run-ldconfig.patch
new file mode 100644
index 000000000..4fc95879f
--- /dev/null
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-Don-t-try-to-run-ldconfig.patch
@@ -0,0 +1,43 @@
+From 6053a060ea6425e8a1ae628a0357e175e36a2886 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@...>
+Date: Tue, 21 Feb 2023 09:56:01 +0800
+Subject: [PATCH] Makefile.in: Don't try to run ldconfig
+
+when ldconfig is not installed on the build host, do_install
+will failed with error:
+ln -sf nfslock.so.0.1 /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/lib64/nfslock.so.0
+install -m 644 lockfile.h maillock.h /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/include
+if test "/mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image" = ""; then ; fi
+if [ "mail" != "" ]; then\
+ install -g mail -m 2755 dotlockfile /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/bin;\
+ else \
+ install -g root -m 755 dotlockfile /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/bin; \
+ fi
+/bin/sh: -c: line 1: syntax error near unexpected token `;'
+/bin/sh: -c: line 1: `if test "/mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image" = ""; then ; fi'
+
+Deleted line is not needed for OE, as it is cross-compile. And
+it can also fix above error
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Changqing Li <changqing.li@...>
+---
+ Makefile.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 6e53179..e33f7d4 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -58,7 +58,6 @@ install_shared: shared install_static install_common
+ $(libdir)/liblockfile.so.$(SOVER)
+ ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR)
+ ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so
+- if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
+
+ install_common:
+ install -d -m 755 -g root -p $(includedir)
+--
+2.25.1
+
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb b/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb
index bac3a2c0b..51db47cd5 100644
--- a/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb
@@ -10,6 +10,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.14.orig.tar.gz \
file://0001-Makefile.in-add-DESTDIR.patch \
file://0001-Makefile.in-install-nfslock-libs.patch \
file://liblockfile-fix-install-so-to-man-dir.patch \
+ file://0001-Makefile.in-Don-t-try-to-run-ldconfig.patch \
"

SRC_URI[md5sum] = "420c056ba0cc4d1477e402f70ba2f5eb"
--
2.25.1

merged thanks Armin

Apologies. I didn't test this patch with a full build on master as I had been working on hardknott.

I notice now when I build that I should have removed the line

SKIP_RECIPE[cfengine] ?= "Needs porting to openssl 3.x"

So am running a build now and will submit a revised patch when things look good on master.

* https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${PV}.tar.gz
is just redirect to unsafe github archives which are regenerated from time to
time.

* We do have src-uri-bad QA check which prevents to use github archives in SRC_URI
since 2019:
https://github.com/openembedded/openembedded-core/commit/21f84fcdd659544437fe393285c407e1e9432043
but this cannot catch such redirects, see:

$ wget https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-878.30.4.tar.gz
--2023-01-31 10:06:02-- https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-878.30.4.tar.gz
Resolving opensource.apple.com (opensource.apple.com)... 17.253.73.203, 17.253.73.206, 2a01:b740:a26:f000::5, ...
Connecting to opensource.apple.com (opensource.apple.com)|17.253.73.203|:443... connected.
HTTP request sent, awaiting response... 302 Redirect
Location: https://github.com/apple-oss-distributions/mDNSResponder/archive/refs/tags/mDNSResponder-878.30.4.tar.gz [following]
--2023-01-31 10:06:02-- https://github.com/apple-oss-distributions/mDNSResponder/archive/refs/tags/mDNSResponder-878.30.4.tar.gz
Resolving github.com (github.com)... 140.82.121.3
Connecting to github.com (github.com)|140.82.121.3|:443... connected.
HTTP request sent, awaiting response... 302 Found
Location: https://codeload.github.com/apple-oss-distributions/mDNSResponder/tar.gz/refs/tags/mDNSResponder-878.30.4 [following]
--2023-01-31 10:06:02-- https://codeload.github.com/apple-oss-distributions/mDNSResponder/tar.gz/refs/tags/mDNSResponder-878.30.4
Resolving codeload.github.com (codeload.github.com)... 140.82.121.10
Connecting to codeload.github.com (codeload.github.com)|140.82.121.10|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: unspecified [application/x-gzip]
Saving to: ?mDNSResponder-878.30.4.tar.gz?

* The tarball was regenerated recently as discussed in:
https://github.com/orgs/community/discussions/45830

* Use top-level directory in S to fix DEBUG_PREFIX_MAP usage
like the version in master does, the only exception here is that
there still was top-level Makefile (which fails to set VER with:
Makefile:26: *** missing separator. Stop.
so use the simple one like newer version in master)
* it's already included in master as part of version upgrade in:
https://github.com/openembedded/meta-openembedded/commit/ec96eb577bd518b89e2e7834bd569ba269df458f

Signed-off-by: Martin Jansa <Martin.Jansa@...>
---
...utine-for-cleaning-recent-interfaces.patch | 0
.../0001-dns-sd-Include-missing-headers.patch | 0
.../0001-mdns-include-stddef.h-for-NULL.patch | 0
...outine-for-tearing-down-an-interface.patch | 0
...-cross-compilation-fixes-for-bitbake.patch | 0
.../0003-Track-interface-socket-family.patch | 0
...0004-Use-list-for-changed-interfaces.patch | 0
.../0006-Remove-unneeded-function.patch | 0
.../0006-make-Add-top-level-Makefile.patch | 175 ++++++++++++++++++
...-deleted-interfaces-as-being-changed.patch | 0
.../0009-Fix-possible-NULL-dereference.patch | 0
...0010-Handle-errors-from-socket-calls.patch | 0
...ic-allocation-to-file-scope-variable.patch | 0
.../mdns/{files => mdns}/mdns.service | 0
.../recipes-protocols/mdns/mdns_1310.140.1.bb | 44 +++--
15 files changed, 203 insertions(+), 16 deletions(-)
rename meta-networking/recipes-protocols/mdns/{files => mdns}/0001-Create-subroutine-for-cleaning-recent-interfaces.patch (100%)
rename meta-networking/recipes-protocols/mdns/{files => mdns}/0001-dns-sd-Include-missing-headers.patch (100%)
rename meta-networking/recipes-protocols/mdns/{files => mdns}/0001-mdns-include-stddef.h-for-NULL.patch (100%)
rename meta-networking/recipes-protocols/mdns/{files => mdns}/0002-Create-subroutine-for-tearing-down-an-interface.patch (100%)
rename meta-networking/recipes-protocols/mdns/{files => mdns}/0002-mdns-cross-compilation-fixes-for-bitbake.patch (100%)
rename meta-networking/recipes-protocols/mdns/{files => mdns}/0003-Track-interface-socket-family.patch (100%)
rename meta-networking/recipes-protocols/mdns/{files => mdns}/0004-Use-list-for-changed-interfaces.patch (100%)
rename meta-networking/recipes-protocols/mdns/{files => mdns}/0006-Remove-unneeded-function.patch (100%)
create mode 100644 meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch
rename meta-networking/recipes-protocols/mdns/{files => mdns}/0008-Mark-deleted-interfaces-as-being-changed.patch (100%)
rename meta-networking/recipes-protocols/mdns/{files => mdns}/0009-Fix-possible-NULL-dereference.patch (100%)
rename meta-networking/recipes-protocols/mdns/{files => mdns}/0010-Handle-errors-from-socket-calls.patch (100%)
rename meta-networking/recipes-protocols/mdns/{files => mdns}/0011-Change-a-dynamic-allocation-to-file-scope-variable.patch (100%)
rename meta-networking/recipes-protocols/mdns/{files => mdns}/mdns.service (100%)

diff --git a/meta-networking/recipes-protocols/mdns/files/0001-Create-subroutine-for-cleaning-recent-interfaces.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch
similarity index 100%
rename from meta-networking/recipes-protocols/mdns/files/0001-Create-subroutine-for-cleaning-recent-interfaces.patch
rename to meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch
diff --git a/meta-networking/recipes-protocols/mdns/files/0001-dns-sd-Include-missing-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch
similarity index 100%
rename from meta-networking/recipes-protocols/mdns/files/0001-dns-sd-Include-missing-headers.patch
rename to meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch
diff --git a/meta-networking/recipes-protocols/mdns/files/0001-mdns-include-stddef.h-for-NULL.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-mdns-include-stddef.h-for-NULL.patch
similarity index 100%
rename from meta-networking/recipes-protocols/mdns/files/0001-mdns-include-stddef.h-for-NULL.patch
rename to meta-networking/recipes-protocols/mdns/mdns/0001-mdns-include-stddef.h-for-NULL.patch
diff --git a/meta-networking/recipes-protocols/mdns/files/0002-Create-subroutine-for-tearing-down-an-interface.patch b/meta-networking/recipes-protocols/mdns/mdns/0002-Create-subroutine-for-tearing-down-an-interface.patch
similarity index 100%
rename from meta-networking/recipes-protocols/mdns/files/0002-Create-subroutine-for-tearing-down-an-interface.patch
rename to meta-networking/recipes-protocols/mdns/mdns/0002-Create-subroutine-for-tearing-down-an-interface.patch
diff --git a/meta-networking/recipes-protocols/mdns/files/0002-mdns-cross-compilation-fixes-for-bitbake.patch b/meta-networking/recipes-protocols/mdns/mdns/0002-mdns-cross-compilation-fixes-for-bitbake.patch
similarity index 100%
rename from meta-networking/recipes-protocols/mdns/files/0002-mdns-cross-compilation-fixes-for-bitbake.patch
rename to meta-networking/recipes-protocols/mdns/mdns/0002-mdns-cross-compilation-fixes-for-bitbake.patch
diff --git a/meta-networking/recipes-protocols/mdns/files/0003-Track-interface-socket-family.patch b/meta-networking/recipes-protocols/mdns/mdns/0003-Track-interface-socket-family.patch
similarity index 100%
rename from meta-networking/recipes-protocols/mdns/files/0003-Track-interface-socket-family.patch
rename to meta-networking/recipes-protocols/mdns/mdns/0003-Track-interface-socket-family.patch
diff --git a/meta-networking/recipes-protocols/mdns/files/0004-Use-list-for-changed-interfaces.patch b/meta-networking/recipes-protocols/mdns/mdns/0004-Use-list-for-changed-interfaces.patch
similarity index 100%
rename from meta-networking/recipes-protocols/mdns/files/0004-Use-list-for-changed-interfaces.patch
rename to meta-networking/recipes-protocols/mdns/mdns/0004-Use-list-for-changed-interfaces.patch
diff --git a/meta-networking/recipes-protocols/mdns/files/0006-Remove-unneeded-function.patch b/meta-networking/recipes-protocols/mdns/mdns/0006-Remove-unneeded-function.patch
similarity index 100%
rename from meta-networking/recipes-protocols/mdns/files/0006-Remove-unneeded-function.patch
rename to meta-networking/recipes-protocols/mdns/mdns/0006-Remove-unneeded-function.patch
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch b/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch
new file mode 100644
index 0000000000..b7d9ad5bba
--- /dev/null
+++ b/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch
@@ -0,0 +1,175 @@
+From 177abf68e5ac5f82c6261af63528f8b6160bca0f Mon Sep 17 00:00:00 2001
+From: Alex Kiernan <alex.kiernan@...>
+Date: Tue, 6 Dec 2022 13:28:31 +0000
+Subject: [PATCH] make: Add top-level Makefile
+
+Simple top level Makefile that just delegates to mDNSPosix.
+
+Upstream-Status: Inappropriate [oe-specific]
+Signed-off-by: Alex Kiernan <alex.kiernan@...>
+---
+ Makefile | 154 +------------------------------------------------------
+ 1 file changed, 2 insertions(+), 152 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 8b6fa77..feb6ac6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,152 +1,2 @@
+-#
+-# Copyright (c) 2003-2018 Apple Inc. All rights reserved.
+-#
+-# Top level makefile for Build & Integration (B&I).
+-#
+-# This file is used to facilitate checking the mDNSResponder project directly from git and submitting to B&I at Apple.
+-#
+-# The various platform directories contain makefiles or projects specific to that platform.
+-#
+-# B&I builds must respect the following target:
+-# install:
+-# installsrc:
+-# installhdrs:
+-# installapi:
+-# clean:
+-#
+-
+-include $(MAKEFILEPATH)/pb_makefiles/platform.make
+-
+-MVERS = "mDNSResponder-1310.140.1"
+-
+-VER =
+-ifneq ($(strip $(GCC_VERSION)),)
+- VER = -- GCC_VERSION=$(GCC_VERSION)
+-endif
+-echo "VER = $(VER)"
+-
+-projectdir := $(SRCROOT)/mDNSMacOSX
+-buildsettings := OBJROOT=$(OBJROOT) SYMROOT=$(SYMROOT) DSTROOT=$(DSTROOT) MVERS=$(MVERS) SDKROOT=$(SDKROOT)
+-
+-.PHONY: install installSome installEmpty installExtras SystemLibraries installhdrs installapi installsrc java clean
+-
+-# Sanitizer support
+-# Disable Sanitizer instrumentation in LibSystem contributors. See rdar://problem/29952210.
+-UNSUPPORTED_SANITIZER_PROJECTS := mDNSResponderSystemLibraries mDNSResponderSystemLibraries_Sim
+-PROJECT_SUPPORTS_SANITIZERS := 1
+-ifneq ($(words $(filter $(UNSUPPORTED_SANITIZER_PROJECTS), $(RC_ProjectName))), 0)
+- PROJECT_SUPPORTS_SANITIZERS := 0
+-endif
+-ifeq ($(RC_ENABLE_ADDRESS_SANITIZATION),1)
+- ifeq ($(PROJECT_SUPPORTS_SANITIZERS),1)
+- $(info Enabling Address Sanitizer)
+- buildsettings += -enableAddressSanitizer YES
+- else
+- $(warning WARNING: Address Sanitizer not supported for project $(RC_ProjectName))
+- endif
+-endif
+-ifeq ($(RC_ENABLE_THREAD_SANITIZATION),1)
+- ifeq ($(PROJECT_SUPPORTS_SANITIZERS),1)
+- $(info Enabling Thread Sanitizer)
+- buildsettings += -enableThreadSanitizer YES
+- else
+- $(warning WARNING: Thread Sanitizer not supported for project $(RC_ProjectName))
+- endif
+-endif
+-ifeq ($(RC_ENABLE_UNDEFINED_BEHAVIOR_SANITIZATION),1)
+- ifeq ($(PROJECT_SUPPORTS_SANITIZERS),1)
+- $(info Enabling Undefined Behavior Sanitizer)
+- buildsettings += -enableUndefinedBehaviorSanitizer YES
+- else
+- $(warning WARNING: Undefined Behavior Sanitizer not supported for project $(RC_ProjectName))
+- endif
+-endif
+-
+-# B&I install build targets
+-#
+-# For the mDNSResponder build alias, the make target used by B&I depends on the platform:
+-#
+-# Platform Make Target
+-# -------- -----------
+-# osx install
+-# ios installSome
+-# atv installSome
+-# watch installSome
+-#
+-# For the mDNSResponderSystemLibraries and mDNSResponderSystemLibraries_sim build aliases, B&I uses the SystemLibraries
+-# target for all platforms.
+-
+-install:
+-ifeq ($(RC_ProjectName), mDNSResponderServices)
+-ifeq ($(RC_PROJECT_COMPILATION_PLATFORM), osx)
+- cd '$(projectdir)'; xcodebuild install $(buildsettings) -target 'Build Services-macOS' $(VER)
+-else
+- cd '$(projectdir)'; xcodebuild install $(buildsettings) -target 'Build Services' $(VER)
+-endif
+-else ifeq ($(RC_ProjectName), mDNSResponderServices_Sim)
+- mkdir -p $(DSTROOT)/AppleInternal
+-else
+- cd '$(projectdir)'; xcodebuild install $(buildsettings) $(VER)
+-endif
+-
+-installSome:
+- cd '$(projectdir)'; xcodebuild install $(buildsettings) $(VER)
+-
+-installEmpty:
+- mkdir -p $(DSTROOT)/AppleInternal
+-
+-installExtras:
+-ifeq ($(RC_PROJECT_COMPILATION_PLATFORM), osx)
+- cd '$(projectdir)'; xcodebuild install $(buildsettings) -target 'Build Extras-macOS' $(VER)
+-else ifeq ($(RC_PROJECT_COMPILATION_PLATFORM), ios)
+- cd '$(projectdir)'; xcodebuild install $(buildsettings) -target 'Build Extras-iOS' $(VER)
+-else ifeq ($(RC_PROJECT_COMPILATION_PLATFORM), atv)
+- cd '$(projectdir)'; xcodebuild install $(buildsettings) -target 'Build Extras-tvOS' $(VER)
+-else
+- cd '$(projectdir)'; xcodebuild install $(buildsettings) -target 'Build Extras' $(VER)
+-endif
+-
+-SystemLibraries:
+- cd '$(projectdir)'; xcodebuild install $(buildsettings) -target SystemLibraries $(VER)
+-
+-# B&I installhdrs build targets
+-
+-installhdrs::
+-ifeq ($(RC_ProjectName), mDNSResponderServices)
+-ifeq ($(RC_PROJECT_COMPILATION_PLATFORM), osx)
+- cd '$(projectdir)'; xcodebuild installhdrs $(buildsettings) -target 'Build Services-macOS' $(VER)
+-else
+- cd '$(projectdir)'; xcodebuild installhdrs $(buildsettings) -target 'Build Services' $(VER)
+-endif
+-else ifeq ($(RC_ProjectName), mDNSResponderServices_Sim)
+- mkdir -p $(DSTROOT)/AppleInternal
+-else ifneq ($(findstring SystemLibraries,$(RC_ProjectName)),)
+- cd '$(projectdir)'; xcodebuild installhdrs $(buildsettings) -target SystemLibraries $(VER)
+-endif
+-
+-# B&I installapi build targets
+-
+-installapi:
+-ifeq ($(RC_ProjectName), mDNSResponderServices)
+-ifeq ($(RC_PROJECT_COMPILATION_PLATFORM), osx)
+- cd '$(projectdir)'; xcodebuild installapi $(buildsettings) -target 'Build Services-macOS' $(VER)
+-else
+- cd '$(projectdir)'; xcodebuild installapi $(buildsettings) -target 'Build Services' $(VER)
+-endif
+-else ifeq ($(RC_ProjectName), mDNSResponderServices_Sim)
+- mkdir -p $(DSTROOT)/AppleInternal
+-else ifneq ($(findstring SystemLibraries,$(RC_ProjectName)),)
+- cd '$(projectdir)'; xcodebuild installapi $(buildsettings) -target SystemLibrariesDynamic $(VER)
+-endif
+-
+-# Misc. targets
+-
+-installsrc:
+- ditto . '$(SRCROOT)'
+- rm -rf '$(SRCROOT)/mDNSWindows' '$(SRCROOT)/Clients/FirefoxExtension'
+-
+-java:
+- cd '$(projectdir)'; xcodebuild install $(buildsettings) -target libjdns_sd.jnilib $(VER)
+-
+-clean::
+- echo clean
++all clean:
++ cd mDNSPosix && $(MAKE) $@
+--
+2.38.1
+
diff --git a/meta-networking/recipes-protocols/mdns/files/0008-Mark-deleted-interfaces-as-being-changed.patch b/meta-networking/recipes-protocols/mdns/mdns/0008-Mark-deleted-interfaces-as-being-changed.patch
similarity index 100%
rename from meta-networking/recipes-protocols/mdns/files/0008-Mark-deleted-interfaces-as-being-changed.patch
rename to meta-networking/recipes-protocols/mdns/mdns/0008-Mark-deleted-interfaces-as-being-changed.patch
diff --git a/meta-networking/recipes-protocols/mdns/files/0009-Fix-possible-NULL-dereference.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-Fix-possible-NULL-dereference.patch
similarity index 100%
rename from meta-networking/recipes-protocols/mdns/files/0009-Fix-possible-NULL-dereference.patch
rename to meta-networking/recipes-protocols/mdns/mdns/0009-Fix-possible-NULL-dereference.patch
diff --git a/meta-networking/recipes-protocols/mdns/files/0010-Handle-errors-from-socket-calls.patch b/meta-networking/recipes-protocols/mdns/mdns/0010-Handle-errors-from-socket-calls.patch
similarity index 100%
rename from meta-networking/recipes-protocols/mdns/files/0010-Handle-errors-from-socket-calls.patch
rename to meta-networking/recipes-protocols/mdns/mdns/0010-Handle-errors-from-socket-calls.patch
diff --git a/meta-networking/recipes-protocols/mdns/files/0011-Change-a-dynamic-allocation-to-file-scope-variable.patch b/meta-networking/recipes-protocols/mdns/mdns/0011-Change-a-dynamic-allocation-to-file-scope-variable.patch
similarity index 100%
rename from meta-networking/recipes-protocols/mdns/files/0011-Change-a-dynamic-allocation-to-file-scope-variable.patch
rename to meta-networking/recipes-protocols/mdns/mdns/0011-Change-a-dynamic-allocation-to-file-scope-variable.patch
diff --git a/meta-networking/recipes-protocols/mdns/files/mdns.service b/meta-networking/recipes-protocols/mdns/mdns/mdns.service
similarity index 100%
rename from meta-networking/recipes-protocols/mdns/files/mdns.service
rename to meta-networking/recipes-protocols/mdns/mdns/mdns.service
diff --git a/meta-networking/recipes-protocols/mdns/mdns_1310.140.1.bb b/meta-networking/recipes-protocols/mdns/mdns_1310.140.1.bb
index 205dc929be..65f4847d8f 100644
--- a/meta-networking/recipes-protocols/mdns/mdns_1310.140.1.bb
+++ b/meta-networking/recipes-protocols/mdns/mdns_1310.140.1.bb
@@ -2,28 +2,31 @@ SUMMARY = "Publishes & browses available services on a link according to the Zer
DESCRIPTION = "Bonjour, also known as zero-configuration networking, enables automatic discovery of computers, devices, and services on IP networks."
HOMEPAGE = "http://developer.apple.com/networking/bonjour/"
LICENSE = "Apache-2.0 & BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=31c50371921e0fb731003bbc665f29bf"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=31c50371921e0fb731003bbc665f29bf"

DEPENDS:append:libc-musl = " musl-nscd"

RPROVIDES:${PN} += "libdns_sd.so"

-SRC_URI = "https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${PV}.tar.gz \
+# matches annotated tag mDNSResponder-1310.140.1
+SRCREV = "1d1de95b98fba2077d34c9d78b839a96aa0e1c77"
+BRANCH = "rel/mDNSResponder-1310"
+SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https;branch=${BRANCH} \
file://mdns.service \
- file://0001-mdns-include-stddef.h-for-NULL.patch;patchdir=.. \
- file://0002-mdns-cross-compilation-fixes-for-bitbake.patch;patchdir=.. \
- file://0001-Create-subroutine-for-cleaning-recent-interfaces.patch;patchdir=.. \
- file://0002-Create-subroutine-for-tearing-down-an-interface.patch;patchdir=.. \
- file://0003-Track-interface-socket-family.patch;patchdir=.. \
- file://0004-Use-list-for-changed-interfaces.patch;patchdir=.. \
- file://0006-Remove-unneeded-function.patch;patchdir=.. \
- file://0008-Mark-deleted-interfaces-as-being-changed.patch;patchdir=.. \
- file://0009-Fix-possible-NULL-dereference.patch;patchdir=.. \
- file://0010-Handle-errors-from-socket-calls.patch;patchdir=.. \
- file://0011-Change-a-dynamic-allocation-to-file-scope-variable.patch;patchdir=.. \
- file://0001-dns-sd-Include-missing-headers.patch;patchdir=.. \
+ file://0001-mdns-include-stddef.h-for-NULL.patch \
+ file://0002-mdns-cross-compilation-fixes-for-bitbake.patch \
+ file://0001-Create-subroutine-for-cleaning-recent-interfaces.patch \
+ file://0002-Create-subroutine-for-tearing-down-an-interface.patch \
+ file://0003-Track-interface-socket-family.patch \
+ file://0004-Use-list-for-changed-interfaces.patch \
+ file://0006-Remove-unneeded-function.patch \
+ file://0008-Mark-deleted-interfaces-as-being-changed.patch \
+ file://0009-Fix-possible-NULL-dereference.patch \
+ file://0010-Handle-errors-from-socket-calls.patch \
+ file://0011-Change-a-dynamic-allocation-to-file-scope-variable.patch \
+ file://0001-dns-sd-Include-missing-headers.patch \
+ file://0006-make-Add-top-level-Makefile.patch \
"
-SRC_URI[sha256sum] = "040f6495c18b9f0557bcf9e00cbcfc82b03405f5ba6963dc147730ca0ca90d6f"

CVE_PRODUCT = "apple:mdnsresponder"

@@ -42,13 +45,22 @@ CVE_CHECK_IGNORE += "CVE-2007-0613"

PARALLEL_MAKE = ""

-S = "${WORKDIR}/mDNSResponder-${PV}/mDNSPosix"
+# We install a stub Makefile in the top directory so that the various checks
+# in base.bbclass pass their tests for a Makefile, this ensures (that amongst
+# other things) the sstate checks will clean the build directory when the
+# task hashes changes.
+#
+# We can't use the approach of setting ${S} to mDNSPosix as we need
+# DEBUG_PREFIX_MAP to cover files which come from the Clients directory too.
+S = "${WORKDIR}/git"

EXTRA_OEMAKE += "os=linux DEBUG=0 'CC=${CC}' 'LD=${CCLD} ${LDFLAGS}'"

TARGET_CC_ARCH += "${LDFLAGS}"

do_install () {
+ cd mDNSPosix
+
install -d ${D}${sbindir}
install -m 0755 build/prod/mdnsd ${D}${sbindir}

--
2.39.2

* https://exiv2.org/releases returns 404 now, use github releases
* it's already fixed in master with upgrade to 0.27.6 in:
https://git.openembedded.org/meta-openembedded/commit/?id=00a7d4b284c1afccfa26021111384d2184b82e5b

Signed-off-by: Martin Jansa <Martin.Jansa@...>
---
meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb b/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb
index 31afe78e45..b210fa6340 100644
--- a/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb
+++ b/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2"

DEPENDS = "zlib expat"

-SRC_URI = "https://exiv2.org/releases/${BPN}-${PV}-Source.tar.gz"
+SRC_URI = "https://github.com/Exiv2/${BPN}/releases/download/v${PV}/${BP}-Source.tar.gz"
SRC_URI[sha256sum] = "a79f5613812aa21755d578a297874fb59a85101e793edc64ec2c6bd994e3e778"

# Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either
--
2.39.2

From: Dmitry Baryshkov <dmitry.baryshkov@...>

Change OS_TEST to be soft assignment so that the cross-compilation
doens't fail with the errors like (note the difference in CPU tags):

| make[4]: *** No rule to make target
'../certhigh/Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/certhtml.o', needed by
'Linux3.4_aarch64_glibc_PTH_64_OPT.OBJ/libnss3.so'. Stop.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@...>
Signed-off-by: Khem Raj <raj.khem@...>
---
.../nss/nss/0001-nss-fix-support-cross-compiling.patch | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
index eb6174a7b0..950fae667a 100644
--- a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
+++ b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
@@ -18,7 +18,12 @@ diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk
index 2012d18..78fca62 100644
--- a/nss/coreconf/arch.mk
+++ b/nss/coreconf/arch.mk
-@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m)
+@@ -26,11 +26,11 @@ OS_ARCH := $(subst /,_,$(shell uname -s)
+ # Attempt to differentiate between sparc and x86 Solaris
+ #
+
+-OS_TEST := $(shell uname -m)
++OS_TEST ?= $(shell uname -m)
ifeq ($(OS_TEST),i86pc)
OS_RELEASE := $(shell uname -r)_$(OS_TEST)
else
--
2.39.2

The following changes since commit 278ec081a64e6a7679d6def550101158126cd935:

  nodejs: upgrade 16.18.1 -> 16.19.0 (2023-02-04 12:16:38 -0500)

are available in the Git repository at:

  https://git.openembedded.org/meta-openembedded kirkstone-next

for you to fetch changes up to 82c75b466e55d7dca7a2364986ecb704cf63d141:

  phoronix-test-suite: Fix CVE-2022-40704 (2023-02-16 07:30:46 -0500)

----------------------------------------------------------------
Gary Huband (1):
      chrony: add pkgconfig class as pkg-config is explicitly searched for

Joe Slater (1):
      phoronix-test-suite: Fix CVE-2022-40704

Randy MacLeod (2):
      python3-pillow: add ptest support
      python3-pillow: Add distutils, unixadmin for ptest

Wang Mingyu (3):
      python3-pillow: upgrade 9.2.0 -> 9.3.0
      python3-pillow: upgrade 9.3.0 -> 9.4.0
      apache2: upgrade 2.4.54 -> 2.4.55

Xu Huan (1):
      python3-pillow: upgrade 9.0.1 -> 9.1.1

Yi Zhao (2):
      freeradius: Security fixes for CVE-2022-41860 CVE-2022-41861
      frr: Security fix for CVE-2022-42917

zhengruoqin (1):
      python3-pillow: upgrade 9.1.1 -> 9.2.0

 .../recipes-connectivity/freeradius/files/CVE-2022-41860.patch  | 118 ++++++++++++++++++++++++++++
 .../recipes-connectivity/freeradius/files/CVE-2022-41861.patch  | 53 +++++++++++++
 .../recipes-connectivity/freeradius/freeradius_3.0.21.bb        | 2 +
 meta-networking/recipes-protocols/frr/frr/CVE-2022-42917.patch  | 36 +++++++++
 meta-networking/recipes-protocols/frr/frr/frr.pam               | 3 +-
 meta-networking/recipes-protocols/frr/frr_8.2.2.bb              | 1 +
 meta-networking/recipes-support/chrony/chrony_4.2.bb            | 2 +-
 .../phoronix-test-suite/files/CVE-2022-40704.patch              | 46 +++++++++++
 .../phoronix-test-suite/phoronix-test-suite_10.8.2.bb           | 6 +-
 meta-python/recipes-devtools/python/python3-pillow/run-ptest    | 3 +
 .../python/{python3-pillow_9.0.1.bb => python3-pillow_9.4.0.bb} |  32 ++++++--
 .../apache2/{apache2_2.4.54.bb => apache2_2.4.55.bb} |   2 +-
 12 files changed, 295 insertions(+), 9 deletions(-)
 create mode 100644 meta-networking/recipes-connectivity/freeradius/files/CVE-2022-41860.patch
 create mode 100644 meta-networking/recipes-connectivity/freeradius/files/CVE-2022-41861.patch
 create mode 100644 meta-networking/recipes-protocols/frr/frr/CVE-2022-42917.patch
 create mode 100644 meta-oe/recipes-benchmark/phoronix-test-suite/files/CVE-2022-40704.patch
 create mode 100644 meta-python/recipes-devtools/python/python3-pillow/run-ptest
 rename meta-python/recipes-devtools/python/{python3-pillow_9.0.1.bb => python3-pillow_9.4.0.bb} (52%)
 rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.54.bb => apache2_2.4.55.bb} (99%)

Target nodejs doesn't depend on nodejs-native to build anymore, so there
is no need to stage these binaries.

Signed-off-by: Ross Burton <ross.burton@...>
---
meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb | 13 -------------
1 file changed, 13 deletions(-)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb b/meta-oe/=
recipes-devtools/nodejs/nodejs_18.12.1.bb
index c95a72fa94..0346f54e6f 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
@@ -174,19 +174,6 @@ do_install_ptest () {
chown -R root:root ${D}${PTEST_PATH}
}
=20
-BINARIES =3D " \
- bytecode_builtins_list_generator \
- ${@bb.utils.contains('PACKAGECONFIG', 'icu', 'gen-regexp-special-cas=
e', '', d)} \
- node_mksnapshot \
- torque \
-"
-
-do_install:append:class-native() {
- # Install the native binaries to provide it within sysroot for the t=
arget compilation
- install -d ${D}${bindir}
- (cd ${S}/out/Release && install ${BINARIES} ${D}${bindir})
-}
-
PACKAGES =3D+ "${PN}-npm"
FILES:${PN}-npm =3D "${nonarch_libdir}/node_modules ${bindir}/npm ${bind=
ir}/npx"
RDEPENDS:${PN}-npm =3D "bash python3-core python3-shell python3-datetime=
\
--=20
2.34.1

The purpose of this appears to have been lost, and the build succeeds
without it.

If it is needed, then it should be added to EXTRA_OEMAKE alongside the
CC and CXX assignments.

Signed-off-by: Ross Burton <ross.burton@...>
---
meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb b/meta-oe/=
recipes-devtools/nodejs/nodejs_18.12.1.bb
index 2c6db481c6..c95a72fa94 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
@@ -140,9 +140,10 @@ LDFLAGS:append:x86 =3D " -latomic"
CROSS_FLAGS =3D "--cross-compiling"
CROSS_FLAGS:class-native =3D "--no-cross-compiling"
=20
+#export LD=3D"${CXX}"
+
# Node is way too cool to use proper autotools, so we install two wrappe=
rs to forcefully inject proper arch cflags to workaround gypi
do_configure () {
- export LD=3D"${CXX}"
GYP_DEFINES=3D"${GYP_DEFINES}" export GYP_DEFINES
# $TARGET_ARCH settings don't match --dest-cpu settings
python3 configure.py --verbose --prefix=3D${prefix} \
@@ -158,7 +159,6 @@ do_configure () {
}
=20
do_compile () {
- export LD=3D"${CXX}"
install -D ${RECIPE_SYSROOT_NATIVE}/etc/ssl/openssl.cnf ${B}/deps/op=
enssl/nodejs-openssl.cnf
install -D ${B}/v8-qemu-wrapper.sh ${B}/out/Release/v8-qemu-wrapper.=
sh
oe_runmake BUILDTYPE=3DRelease
--=20
2.34.1

By not forcing the cross-compile build logic in native builds the build
is a _lot_ faster. Walltime in buildstats-diff on my machine:

nodejs-native do_compile -475.6s -41.2% 1153.4s -> 677.7s

Signed-off-by: Ross Burton <ross.burton@...>
---
meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb b/meta-oe/=
recipes-devtools/nodejs/nodejs_18.12.1.bb
index 180e170a35..2c6db481c6 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
@@ -137,18 +137,22 @@ addtask create_v8_qemu_wrapper after do_configure b=
efore do_compile
=20
LDFLAGS:append:x86 =3D " -latomic"
=20
+CROSS_FLAGS =3D "--cross-compiling"
+CROSS_FLAGS:class-native =3D "--no-cross-compiling"
+
# Node is way too cool to use proper autotools, so we install two wrappe=
rs to forcefully inject proper arch cflags to workaround gypi
do_configure () {
export LD=3D"${CXX}"
GYP_DEFINES=3D"${GYP_DEFINES}" export GYP_DEFINES
# $TARGET_ARCH settings don't match --dest-cpu settings
- python3 configure.py --verbose --prefix=3D${prefix} --cross-compilin=
g \
+ python3 configure.py --verbose --prefix=3D${prefix} \
--shared-openssl \
--without-dtrace \
--without-etw \
--dest-cpu=3D"${@map_nodejs_arch(d.getVar('TARGET_ARCH'),=
d)}" \
--dest-os=3Dlinux \
--libdir=3D${libdir} \
+ ${CROSS_FLAGS} \
${ARCHFLAGS} \
${PACKAGECONFIG_CONFARGS}
}
--=20
2.34.1

Instead of overriding do_unpack entirely and calling into base_do_unpack,
use a postfunc. This keeps the prune logic separated neatly.

Signed-off-by: Ross Burton <ross.burton@...>
---
meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb b/meta-oe/=
recipes-devtools/nodejs/nodejs_18.12.1.bb
index e14f1a4d7f..180e170a35 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
@@ -89,10 +89,9 @@ EXTRA_OEMAKE =3D "\
builddir_name=3D./ \
"
=20
-python do_unpack() {
+python prune_sources() {
import shutil
=20
- bb.build.exec_func('base_do_unpack', d)
shutil.rmtree(d.getVar('S') + '/deps/openssl')
if 'ares' in d.getVar('PACKAGECONFIG'):
shutil.rmtree(d.getVar('S') + '/deps/cares')
@@ -105,6 +104,7 @@ python do_unpack() {
if 'zlib' in d.getVar('PACKAGECONFIG'):
shutil.rmtree(d.getVar('S') + '/deps/zlib')
}
+do_unpack[postfuncs] +=3D "prune_sources"
=20
# V8's JIT infrastructure requires binaries such as mksnapshot and
# mkpeephole to be run in the host during the build. However, these
--=20
2.34.1

It's useful to know what configure is detecting, so pass --verbose.

Signed-off-by: Ross Burton <ross.burton@...>
---
meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb b/meta-oe/=
recipes-devtools/nodejs/nodejs_18.12.1.bb
index 6431069e9c..e14f1a4d7f 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
@@ -142,7 +142,7 @@ do_configure () {
export LD=3D"${CXX}"
GYP_DEFINES=3D"${GYP_DEFINES}" export GYP_DEFINES
# $TARGET_ARCH settings don't match --dest-cpu settings
- python3 configure.py --prefix=3D${prefix} --cross-compiling \
+ python3 configure.py --verbose --prefix=3D${prefix} --cross-compilin=
g \
--shared-openssl \
--without-dtrace \
--without-etw \
--=20
2.34.1

The expand argument defaults to True, so there's no need to specify it.

Signed-off-by: Ross Burton <ross.burton@...>
---
meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb b/meta-oe/=
recipes-devtools/nodejs/nodejs_18.12.1.bb
index 02f1ac5d4a..6431069e9c 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
@@ -93,17 +93,17 @@ python do_unpack() {
import shutil
=20
bb.build.exec_func('base_do_unpack', d)
- shutil.rmtree(d.getVar('S') + '/deps/openssl', True)
+ shutil.rmtree(d.getVar('S') + '/deps/openssl')
if 'ares' in d.getVar('PACKAGECONFIG'):
- shutil.rmtree(d.getVar('S') + '/deps/cares', True)
+ shutil.rmtree(d.getVar('S') + '/deps/cares')
if 'brotli' in d.getVar('PACKAGECONFIG'):
- shutil.rmtree(d.getVar('S') + '/deps/brotli', True)
+ shutil.rmtree(d.getVar('S') + '/deps/brotli')
if 'libuv' in d.getVar('PACKAGECONFIG'):
- shutil.rmtree(d.getVar('S') + '/deps/uv', True)
+ shutil.rmtree(d.getVar('S') + '/deps/uv')
if 'nghttp2' in d.getVar('PACKAGECONFIG'):
- shutil.rmtree(d.getVar('S') + '/deps/nghttp2', True)
+ shutil.rmtree(d.getVar('S') + '/deps/nghttp2')
if 'zlib' in d.getVar('PACKAGECONFIG'):
- shutil.rmtree(d.getVar('S') + '/deps/zlib', True)
+ shutil.rmtree(d.getVar('S') + '/deps/zlib')
}
=20
# V8's JIT infrastructure requires binaries such as mksnapshot and
--=20
2.34.1

---
.../recipes-devtools/python/python3-simpleeval/no-build.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python3-simpleeval/no-bu=
ild.patch b/meta-python/recipes-devtools/python/python3-simpleeval/no-bui=
ld.patch
index b090755f8a..8302c3b298 100644
--- a/meta-python/recipes-devtools/python/python3-simpleeval/no-build.pat=
ch
+++ b/meta-python/recipes-devtools/python/python3-simpleeval/no-build.pat=
ch
@@ -1,4 +1,4 @@
-Upstream-Status: Submitted [https://github.com/danthedeckie/simpleeval/p=
ull/119]
+Upstream-Status: Backport [https://github.com/danthedeckie/simpleeval/pu=
ll/119]
Signed-off-by: Ross Burton <ross.burton@...>
=20
From 08bc99211aec32882d5f1c83896eb5d72b9fb125 Mon Sep 17 00:00:00 2001
--=20
2.34.1

---
.../{zchunk_1.2.0.bb =3D> zchunk_1.2.3.bb} | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
rename meta-oe/recipes-support/zchunk/{zchunk_1.2.0.bb =3D> zchunk_1.2.3=
.bb} (52%)

diff --git a/meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb b/meta-oe/rec=
ipes-support/zchunk/zchunk_1.2.3.bb
similarity index 52%
rename from meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb
rename to meta-oe/recipes-support/zchunk/zchunk_1.2.3.bb
index 0baea5032a..760d650de6 100644
--- a/meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb
+++ b/meta-oe/recipes-support/zchunk/zchunk_1.2.3.bb
@@ -6,17 +6,19 @@ LIC_FILES_CHKSUM =3D "file://LICENSE;md5=3Ddaf6e68539f5=
64601a5a5869c31e5242"
=20
SRC_URI =3D "git://github.com/zchunk/zchunk.git;protocol=3Dhttps;branch=3D=
main"
=20
-SRCREV =3D "dd6a30a1e4e8b738b0cafc682f3c00e7706134e5"
+SRCREV =3D "f16dbeb0831eb37a9397356570327abb97860875"
S =3D "${WORKDIR}/git"
=20
-DEPENDS =3D "\
- curl \
- zstd \
- "
-
+DEPENDS =3D "zstd"
DEPENDS:append:libc-musl =3D " argp-standalone"
-LDFLAGS:append:libc-musl =3D " -largp"
=20
-inherit meson pkgconfig
+inherit meson pkgconfig lib_package
+
+PACKAGECONFIG ??=3D "openssl zckdl"
+
+# zckdl gets packaged into zchunk-bin
+PACKAGECONFIG[zckdl] =3D "-Dwith-curl=3Denabled,-Dwith-curl=3Ddisabled,c=
url"
+# Use OpenSSL primitives for SHA
+PACKAGECONFIG[openssl] =3D "-Dwith-openssl=3Denabled,-Dwith-openssl=3Ddi=
sabled,openssl"
=20
BBCLASSEXTEND =3D "native nativesdk"
--=20
2.34.1

From: Mingli Yu <mingli.yu@...>

The ipp related code has IP issue as below.

=====================================================================
$ cat tmp/work/corei7-64-wrs-linux/opencv/4.6.0-r0/git/ippicv_lnx/icv/include/ippicv.h | head -n 30
/*
// Copyright 2014-2019 Intel Corporation All Rights Reserved.
//
// The source code, information and material ("Material") contained herein is
// owned by Intel Corporation or its suppliers or licensors, and title
// to such Material remains with Intel Corporation or its suppliers or
// licensors. The Material contains proprietary information of Intel
// or its suppliers and licensors. The Material is protected by worldwide
// copyright laws and treaty provisions. No part of the Material may be used,
// copied, reproduced, modified, published, uploaded, posted, transmitted,
// distributed or disclosed in any way without Intel's prior express written
// permission. No license under any patent, copyright or other intellectual
// property rights in the Material is granted to or conferred upon you,
// either expressly, by implication, inducement, estoppel or otherwise.
// Any license under such intellectual property rights must be express and
// approved by Intel in writing.
//
// Unless otherwise agreed by Intel in writing,
// you may not remove or alter this notice or any other notice embedded in
// Materials by Intel or Intel's suppliers or licensors in any way.
//
*/

#if !defined( __IPPICV_H__ )
#define __IPPICV_H__

#ifdef __cplusplus
extern "C" {
#endif
=====================================================================

So disable intel IPP [1] to avoid IP issue.

[1] https://www.intel.com/content/www/us/en/developer/articles/troubleshooting/intel-integrated-performance-primitives-intel-ipp-open-source-computer-vision-library-opencv-faq.html

Signed-off-by: Mingli Yu <mingli.yu@...>
---
.../recipes-support/opencv/opencv_4.6.0.bb | 25 +------------------
1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb b/meta-oe/recipes-support/opencv/opencv_4.6.0.bb
index fcbafd78a..1e4c3545b 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.6.0.bb
@@ -12,40 +12,19 @@ DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"

SRCREV_opencv = "b0dc474160e389b9c9045da5db49d03ae17c6a6b"
SRCREV_contrib = "7b77c355a8fdc97667b3fa1e7a0d37e4973fc868"
-SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274"
SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12"
SRCREV_wechat-qrcode = "a8b69ccc738421293254aec5ddb38bd523503252"

-def ipp_filename(d):
- import re
- arch = d.getVar('TARGET_ARCH')
- if re.match("i.86$", arch):
- return "ippicv_2020_lnx_ia32_20191018_general.tgz"
- else:
- return "ippicv_2020_lnx_intel64_20191018_general.tgz"
-
-def ipp_md5sum(d):
- import re
- arch = d.getVar('TARGET_ARCH')
- if re.match("i.86$", arch):
- return "ad189a940fb60eb71f291321322fe3e8"
- else:
- return "7421de0095c7a39162ae13a6098782f9"
-
-IPP_FILENAME = "${@ipp_filename(d)}"
-IPP_MD5 = "${@ipp_md5sum(d)}"

SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg"
SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https \
git://github.com/opencv/opencv_contrib.git;destsuffix=git/contrib;name=contrib;branch=master;protocol=https \
- git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=git/ipp;name=ipp;protocol=https \
git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=git/boostdesc;name=boostdesc;protocol=https \
git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=git/vgg;name=vgg;protocol=https \
git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=git/face;name=face;protocol=https \
git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=git/wechat_qrcode;name=wechat-qrcode;protocol=https \
- file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
file://0003-To-fix-errors-as-following.patch \
file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \
file://0001-Dont-use-isystem.patch \
@@ -63,7 +42,6 @@ S = "${WORKDIR}/git"
OPENCV_DLDIR = "${WORKDIR}/downloads"

do_unpack_extra() {
- tar xzf ${S}/ipp/ippicv/${IPP_FILENAME} -C ${S}

md5() {
# Return the MD5 of $1
@@ -92,8 +70,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${S}/contrib/modules \
-DWITH_1394=OFF \
-DENABLE_PRECOMPILED_HEADERS=OFF \
-DCMAKE_SKIP_RPATH=ON \
- -DOPENCV_ICV_HASH=${IPP_MD5} \
- -DIPPROOT=${S}/ippicv_lnx \
+ -DWITH_IPP=OFF \
-DOPENCV_GENERATE_PKGCONFIG=ON \
-DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \
-DOPENCV_ALLOW_DOWNLOADS=OFF \
--
2.25.1

From: Wang Mingyu <wangmy@...>

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../zabbix/{zabbix_6.2.6.bb => zabbix_6.2.7.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-connectivity/zabbix/{zabbix_6.2.6.bb => zabbix_6.2.7.bb} (96%)

diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.6.bb b/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.7.bb
similarity index 96%
rename from meta-oe/recipes-connectivity/zabbix/zabbix_6.2.6.bb
rename to meta-oe/recipes-connectivity/zabbix/zabbix_6.2.7.bb
index bafde3134..8708852ce 100644
--- a/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.6.bb
+++ b/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.7.bb
@@ -28,7 +28,7 @@ SRC_URI = "https://cdn.zabbix.com/zabbix/sources/stable/6.2/${BPN}-${PV}.tar.gz
file://0001-initialize-msghdr-portably.patch \
file://zabbix-agent.service \
"
-SRC_URI[sha256sum] = "ae40c8cd4b24159466a7483e65f85836a8c963a0bc394a3dd890142aaf30ac17"
+SRC_URI[sha256sum] = "6d423810667b948ed22052d9aa84a035e2d4b92cbe8efdb669cac529806b722d"

inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd

--
2.34.1

From: Wang Mingyu <wangmy@...>

0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch
removed since it's included in 0.13.1

Signed-off-by: Wang Mingyu <wangmy@...>
---
...d-race-related-to-utils-mermaid.html.patch | 38 -------------------
.../{uftrace_0.13.bb => uftrace_0.13.1.bb} | 6 +--
2 files changed, 2 insertions(+), 42 deletions(-)
delete mode 100644 meta-oe/recipes-devtools/uftrace/uftrace/0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch
rename meta-oe/recipes-devtools/uftrace/{uftrace_0.13.bb => uftrace_0.13.1.bb} (87%)

diff --git a/meta-oe/recipes-devtools/uftrace/uftrace/0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch b/meta-oe/recipes-devtools/uftrace/uftrace/0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch
deleted file mode 100644
index 2cb4f26fb..000000000
--- a/meta-oe/recipes-devtools/uftrace/uftrace/0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1fa61d77fa7173744dd6dc9d3c4bb0aa783f5222 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@...>
-Date: Sat, 21 Jan 2023 10:35:46 -0800
-Subject: [PATCH] build: Fix a build race related to utils/mermaid.html.cstr
-
-Sometimes build fails like below
-
-| /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/uftrace/0.13-r0/git/cmds/dump.c: In function 'dump_mermaid_footer':
-| /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/uftrace/0.13-r0/git/cmds/dump.c:1347:10: fatal error: utils/mermaid.html.cstr: No such file or directory
-| 1347 | #include "utils/mermaid.html.cstr" /* This file is a converted of mermaid.html to one string literal in build-time */
-| | ^~~~~~~~~~~~~~~~~~~~~~~~~
-| compilation terminated.
-| make[1]: *** [Makefile:310: /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/uftrace/0.13-r0/build/cmds/dump.o] Error 1
-
-Create a dependency on c-str-conversion for dump.o
-
-Upstream-Status: Submitted [https://github.com/namhyung/uftrace/pull/1622]
-Signed-off-by: Khem Raj <raj.khem@...>
----
- Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 70dc12f0..bb2ac669 100644
---- a/Makefile
-+++ b/Makefile
-@@ -304,6 +304,8 @@ $(objdir)/misc/dbginfo.o: $(srcdir)/misc/dbginfo.c $(objdir)/version.h $(COMMON_
- $(objdir)/misc/bench.o: $(srcdir)/misc/bench.c
- $(QUIET_CC)$(CC) $(BENCH_CFLAGS) -c -o $@ $<
-
-+$(objdir)/cmds/dump.o: c-str-conversion
-+
- $(UFTRACE_OBJS_VERSION): $(objdir)/version.h
-
- $(filter-out $(objdir)/uftrace.o, $(UFTRACE_OBJS)): $(objdir)/%.o: $(srcdir)/%.c $(COMMON_DEPS)
---
-2.39.1
-
diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.13.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.13.1.bb
similarity index 87%
rename from meta-oe/recipes-devtools/uftrace/uftrace_0.13.bb
rename to meta-oe/recipes-devtools/uftrace/uftrace_0.13.1.bb
index 130242098..4e1edc6ce 100644
--- a/meta-oe/recipes-devtools/uftrace/uftrace_0.13.bb
+++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.13.1.bb
@@ -10,10 +10,8 @@ DEPENDS:append:libc-musl = " argp-standalone"

inherit autotools

-SRCREV = "53ec12d40701cf73ddcf5db8cff63b54736d0eda"
-SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https \
- file://0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch \
- "
+SRCREV = "be3f46f7656bd9243b1835337b5350247b030b02"
+SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https"
S = "${WORKDIR}/git"

LDFLAGS:append:libc-musl = " -largp"
--
2.34.1

From: Wang Mingyu <wangmy@...>

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../uchardet/{uchardet_0.0.7.bb => uchardet_0.0.8.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta-oe/recipes-support/uchardet/{uchardet_0.0.7.bb => uchardet_0.0.8.bb} (57%)

diff --git a/meta-oe/recipes-support/uchardet/uchardet_0.0.7.bb b/meta-oe/recipes-support/uchardet/uchardet_0.0.8.bb
similarity index 57%
rename from meta-oe/recipes-support/uchardet/uchardet_0.0.7.bb
rename to meta-oe/recipes-support/uchardet/uchardet_0.0.8.bb
index 9087c8b29..3e164cc26 100644
--- a/meta-oe/recipes-support/uchardet/uchardet_0.0.7.bb
+++ b/meta-oe/recipes-support/uchardet/uchardet_0.0.8.bb
@@ -4,6 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6ecda54f6f525388d71d6b3cd92f7474"

inherit cmake

-SRC_URI = "https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.7.tar.xz"
-SRC_URI[md5sum] = "623406dac5c5ad89e40eedd7f279efae"
-SRC_URI[sha256sum] = "3fc79408ae1d84b406922fa9319ce005631c95ca0f34b205fad867e8b30e45b1"
+SRC_URI = "https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.8.tar.xz"
+SRC_URI[sha256sum] = "e97a60cfc00a1c147a674b097bb1422abd9fa78a2d9ce3f3fdcc2e78a34ac5f0"
--
2.34.1

From: Wang Mingyu <wangmy@...>

Changelog:
Significantly reduced the memory requirements.

Signed-off-by: Wang Mingyu <wangmy@...>
---
meta-oe/recipes-devtools/sip/{sip_6.7.5.bb => sip_6.7.7.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-devtools/sip/{sip_6.7.5.bb => sip_6.7.7.bb} (83%)

diff --git a/meta-oe/recipes-devtools/sip/sip_6.7.5.bb b/meta-oe/recipes-devtools/sip/sip_6.7.7.bb
similarity index 83%
rename from meta-oe/recipes-devtools/sip/sip_6.7.5.bb
rename to meta-oe/recipes-devtools/sip/sip_6.7.7.bb
index fb42ef476..5e361d972 100644
--- a/meta-oe/recipes-devtools/sip/sip_6.7.5.bb
+++ b/meta-oe/recipes-devtools/sip/sip_6.7.7.bb
@@ -11,6 +11,6 @@ LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303"
inherit pypi setuptools3 python3native

PYPI_PACKAGE = "sip"
-SRC_URI[sha256sum] = "9655d089e1d0c5fbf66bde11558a874980729132b5bd0c2ae355ac1a7b893ab4"
+SRC_URI[sha256sum] = "dee9c06fa8ae6d441a401f922867fc6196edda274eebd9fbfec54f0769c2a9e2"

BBCLASSEXTEND = "native"
--
2.34.1