subtree updates
meta-openembedded: 9a52bfc4a6..af11f6ce73:
Andreas Müller (4):
nautilus: Add a packageconfig for libportal - disabled by default
gtk4: upgrade 4.4.0 -> 4.6.2
libadwaita: initial add 1.1.0
gtksourceview5: upgrade 5.2.0 -> 5.4.0
Carlos Rafael Giani (3):
libopenmpt: Remove unnecessary python code block
pipewire: Upgrade to version 0.3.49
wireplumber: Upgrade to version 0.4.9
Kai Kang (4):
wxwidgets: 3.1.4 -> 3.1.5
python3-wxgtk4: add recipe
wxwidgets: fix typo
mcelog: fix compile error
Khem Raj (1):
python3-wxgtk4: Use cross prefix with native wx-config
Matthias Klein (1):
paho-mqtt-c: upgrade 1.3.9 -> 1.3.10
Mingli Yu (1):
mariadb: increase MY_AES_CTX_SIZE
Potin Lai (4):
libimobiledevice-glue: add recipe
libimobiledevice-glue: fix undefined bswap error
libirecovery: add recipe
idevicerestore: add recipe
S. Lockwood-Childs (1):
python3-evdev: fix host header contamination
Yi Zhao (2):
strongswan: 5.9.4 -> 5.9.5
libnetfilter-conntrack: upgrade 1.0.8 -> 1.0.9
meta-raspberrypi: c06ae5eacf..31c33d155c:
Khem Raj (3):
linux-raspberrypi_5.15.bb: Upgrade to 5.15.32
raspberrypi-firmware: Update to match 5.15.32
armstubs: Upgrade to 20211101
poky: 5fe3689f4f..1976521190:
Chen Qi (1):
gobject-introspection: fix default search path for girdir
Daniel Ammann (2):
overview-manual: Fix reference
ref-manual: Add vfat in list of filesystems supported by kickstart
Jagadeesh Krishnanjanappa (1):
cmake: support to create per-toolchain cmake file in SDK
Khem Raj (2):
weston: Add a knob to control simple clients
meson: Robustify compiler detection logic
Marta Rybczynska (1):
doc: migration-3.5: extend the section on inclusive language
Michael Halstead (1):
releases: update to include 3.4.3
Michael Opdenacker (4):
overview-manual: add missing upper case
docs: add poky.yaml and sphinx-static/switchers.js to "make clean"
manuals: fix quoting of double dashes
migration-guides: preliminary description for 3.5
Oleksandr Kravchuk (1):
python3: update to 3.10.4
Peter Kjellerstedt (1):
ref-manual: Remove references to AVAILABLE_LICENSES
Rasmus Villemoes (1):
git: make expat and curl into PACKAGECONFIG items
Richard Purdie (11):
set_versions/switchers: Drop versions shown to the active releases
mirrors: Add missing gitsm entries for yocto/oe mirrors
base: Don't add duplicates to sys.path
base: Clean up module import compatibility code
modutils-initscripts: Change license PD -> MIT
keymaps: Clean up license handling
initscripts: Clean up license handling/identifiers
bitbake: cooker: Further fixes to inotify to fix memres bitbake issues
bitbake: cooker: Restore sys.path and sys.modules between parses
bitbake: cooker: Ensure any existing hashserv connection is closed
bitbake: cooker: Avoid error if siggen wasn't setup
Ross Burton (24):
ref-manual: update Python class documentation
buildtools-tarball: include nativesdk-python3-pyyaml
image_types: hddimg and iso only work on x86
oeqa/selftest/devtool: ensure Git username is set before upgrade tests
oeqa/selftest/wic: use os.rename instead of bb.utils.rename
oeqa/selftest/wic: remove redundant asserts
oeqa/selftest/wic: clean up only_for_arch decorator
oeqa/selftest/wic: don't hardcode kernel image type in test_wic_rm
oeqa/selftest/wic: add more arch-specific annotations
oeqa/selftest/buildoptions: set PACKAGE_CLASSES in test_arch_work_dir_and_export_source
oeqa/runtime/decorator/package.py: remove use of strToSet
oeqa/core/decorator: remove redundant code
testimage: inline updateTestData()
oeqa/core/utils/misc: remove redundant file
oeqa/selftest: remove unused imports
oeqa/core/decorators/data: improve has_* logic
oeqa/selftest: tag tests that use runqemu
oeqa: rationalise skipifqemu decorators
oeqa/selftest/oescripts: refactor skipping logic
oeqa/selftest/wic: cleanup WicTestCase.setUpLocal
oeqa/selftest/wic: rearrange tests
oeqa/selftest/wic: use os.path.join to join paths
oeqa/selftest/wic: use self.td instead of get_bb_var to save on bitbake calls
oeqa/selftest: generalise test_devtool_virtual_kernel_modify
Simon Kuhnle (1):
convert-variable-renames: Fix typo in description
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ic8359fe5772351a45a3154c6a7f5042a88ff934c
diff --git a/poky/meta/recipes-devtools/cmake/cmake/SDKToolchainConfig.cmake.template b/poky/meta/recipes-devtools/cmake/cmake/SDKToolchainConfig.cmake.template
new file mode 100644
index 0000000..c69569a
--- /dev/null
+++ b/poky/meta/recipes-devtools/cmake/cmake/SDKToolchainConfig.cmake.template
@@ -0,0 +1,31 @@
+set(SDK_INSTALL_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../../..")
+set(HOST_SYSROOT "${SDK_INSTALL_DIR}/sysroots/@OECORE_SDK_SYS")
+set(TARGET_SYSROOT "${SDK_INSTALL_DIR}/sysroots/@OECORE_TARGET_SYS")
+set(HOST_BIN "${HOST_SYSROOT}/usr/bin")
+set(TOOLCHAIN_NAME "@OECORE_TARGET_ALIAS")
+set(GCC_DIR "${HOST_BIN}/${TOOLCHAIN_NAME}")
+
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_PROCESSOR "@OECORE_TARGET_ARCH")
+
+set(CMAKE_C_COMPILER "${GCC_DIR}/${TOOLCHAIN_NAME}-gcc")
+set(CMAKE_CXX_COMPILER "${GCC_DIR}/${TOOLCHAIN_NAME}-g++")
+
+set(ARCH_FLAGS "@OECORE_TUNE_CCARGS")
+set(CMAKE_C_FLAGS "${ARCH_FLAGS}" CACHE STRING "" FORCE )
+set(CMAKE_CXX_FLAGS "${ARCH_FLAGS}" CACHE STRING "" FORCE )
+set(CMAKE_ASM_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" FORCE )
+set(CMAKE_LDFLAGS_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" FORCE )
+
+set(CMAKE_SYSROOT "${TARGET_SYSROOT}")
+
+set(CMAKE_FIND_ROOT_PATH "${TARGET_SYSROOT}" )
+
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER )
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY )
+
+set(CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX "")
+
+set(CMAKE_PROGRAM_PATH "${HOST_SYSROOT}/usr/bin" CACHE STRING "" FORCE)
diff --git a/poky/meta/recipes-devtools/cmake/cmake/cmake-setup.py b/poky/meta/recipes-devtools/cmake/cmake/cmake-setup.py
new file mode 100755
index 0000000..af587a4
--- /dev/null
+++ b/poky/meta/recipes-devtools/cmake/cmake/cmake-setup.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+
+import os
+import string
+import sys
+
+class Template(string.Template):
+ delimiter = "@"
+
+class Environ():
+ def __getitem__(self, name):
+ if name == "OECORE_SDK_SYS":
+ return os.path.basename(os.environ["OECORE_NATIVE_SYSROOT"])
+ elif name == "OECORE_TARGET_SYS":
+ return os.path.basename(os.environ["OECORE_TARGET_SYSROOT"])
+ elif name == "OECORE_TARGET_ALIAS":
+ return os.path.basename(os.environ["TARGET_PREFIX"].strip("-"))
+ else:
+ return os.environ[name]
+
+try:
+ sysroot = os.environ['OECORE_NATIVE_SYSROOT']
+except KeyError:
+ print("Not in environment setup, bailing")
+ sys.exit(1)
+
+template_file = os.path.join(sysroot, 'usr/share/cmake/SDKToolchainConfig.cmake.template')
+cross_file = os.path.join(sysroot, 'usr/share/cmake/%s-toolchain.cmake' % (os.path.basename(os.environ["OECORE_TARGET_SYSROOT"])))
+with open(template_file) as in_file:
+ template = in_file.read()
+ output = Template(template).substitute(Environ())
+ with open(cross_file, "w") as out_file:
+ out_file.write(output)
diff --git a/poky/meta/recipes-devtools/cmake/cmake_3.22.3.bb b/poky/meta/recipes-devtools/cmake/cmake_3.22.3.bb
index 36c6357..e111dd3 100644
--- a/poky/meta/recipes-devtools/cmake/cmake_3.22.3.bb
+++ b/poky/meta/recipes-devtools/cmake/cmake_3.22.3.bb
@@ -6,6 +6,8 @@
SRC_URI:append:class-nativesdk = " \
file://OEToolchainConfig.cmake \
+ file://SDKToolchainConfig.cmake.template \
+ file://cmake-setup.py \
file://environment.d-cmake.sh \
file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \
"
@@ -42,6 +44,11 @@
mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
install -m 644 ${WORKDIR}/environment.d-cmake.sh ${D}${SDKPATHNATIVE}/environment-setup.d/cmake.sh
+
+ # install cmake-setup.py to create arch-specific toolchain cmake file from template
+ install -m 0644 ${WORKDIR}/SDKToolchainConfig.cmake.template ${D}${datadir}/cmake/
+ install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d
+ install -m 0755 ${WORKDIR}/cmake-setup.py ${D}${SDKPATHNATIVE}/post-relocate-setup.d/
}
FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}"
diff --git a/poky/meta/recipes-devtools/git/git_2.35.1.bb b/poky/meta/recipes-devtools/git/git_2.35.1.bb
index 0cff3ce..47c2211 100644
--- a/poky/meta/recipes-devtools/git/git_2.35.1.bb
+++ b/poky/meta/recipes-devtools/git/git_2.35.1.bb
@@ -3,7 +3,7 @@
DESCRIPTION = "Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency."
SECTION = "console/utils"
LICENSE = "GPL-2.0-only"
-DEPENDS = "openssl curl zlib expat"
+DEPENDS = "openssl zlib"
PROVIDES:append:class-native = " git-replacement-native"
@@ -18,10 +18,12 @@
CVE_PRODUCT = "git-scm:git"
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "expat curl"
PACKAGECONFIG[cvsserver] = ""
PACKAGECONFIG[svn] = ""
PACKAGECONFIG[manpages] = ",,asciidoc-native xmlto-native"
+PACKAGECONFIG[curl] = "--with-curl,--without-curl,curl"
+PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat"
EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \
--without-tcltk \
diff --git a/poky/meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch b/poky/meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch
new file mode 100644
index 0000000..58fa119
--- /dev/null
+++ b/poky/meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch
@@ -0,0 +1,56 @@
+From 8739e1c3bef653415ad4b9b9c318ccfa76c43da6 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 31 Mar 2022 15:00:24 -0700
+Subject: [PATCH] Check for clang before guessing gcc or lcc
+
+clang --version can yield a string like below when its installed into
+such a directory
+
+clang version 14.0.0 (https://github.com/llvm/llvm-project 3f43d803382d57e3fc010ca19833077d1023e9c9)
+Target: aarch64-yoe-linux
+Thread model: posix
+InstalledDir: /mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux/gnome-text-editor/42.0-r0/recipe-sysroot-native/usr/bin/aarch64-yoe-linux
+
+as you can see InstallDir has 'xt-' subtring and this trips the check to
+guess gcc
+
+if 'Free Software Foundation' in out or 'xt-' in out:
+
+Therefore, check if compiler is clang then there is no point of running
+this check anyway.
+
+Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/10218]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ mesonbuild/compilers/detect.py | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py
+index 53948b01a..ba335cf39 100644
+--- a/mesonbuild/compilers/detect.py
++++ b/mesonbuild/compilers/detect.py
+@@ -427,13 +427,14 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin
+ version = search_version(out)
+
+ guess_gcc_or_lcc: T.Optional[str] = None
+- if 'Free Software Foundation' in out or 'xt-' in out:
+- guess_gcc_or_lcc = 'gcc'
+- if 'e2k' in out and 'lcc' in out:
+- guess_gcc_or_lcc = 'lcc'
+- if 'Microchip Technology' in out:
+- # this output has "Free Software Foundation" in its version
+- guess_gcc_or_lcc = None
++ if not 'clang' in compiler_name:
++ if 'Free Software Foundation' in out or 'xt-' in out:
++ guess_gcc_or_lcc = 'gcc'
++ if 'e2k' in out and 'lcc' in out:
++ guess_gcc_or_lcc = 'lcc'
++ if 'Microchip Technology' in out:
++ # this output has "Free Software Foundation" in its version
++ guess_gcc_or_lcc = None
+
+ if guess_gcc_or_lcc:
+ defines = _get_gnu_compiler_defines(compiler)
+--
+2.35.1
+
diff --git a/poky/meta/recipes-devtools/meson/meson_0.61.3.bb b/poky/meta/recipes-devtools/meson/meson_0.61.3.bb
index 92f99a9..1c21493 100644
--- a/poky/meta/recipes-devtools/meson/meson_0.61.3.bb
+++ b/poky/meta/recipes-devtools/meson/meson_0.61.3.bb
@@ -15,6 +15,7 @@
file://0001-Make-CPU-family-warnings-fatal.patch \
file://0002-Support-building-allarch-recipes-again.patch \
file://0001-is_debianlike-always-return-False.patch \
+ file://0001-Check-for-clang-before-guessing-gcc-or-lcc.patch \
"
SRC_URI[sha256sum] = "9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b"
diff --git a/poky/meta/recipes-devtools/python/python3_3.10.3.bb b/poky/meta/recipes-devtools/python/python3_3.10.4.bb
similarity index 99%
rename from poky/meta/recipes-devtools/python/python3_3.10.3.bb
rename to poky/meta/recipes-devtools/python/python3_3.10.4.bb
index 5c0f0a9..522f0d7 100644
--- a/poky/meta/recipes-devtools/python/python3_3.10.3.bb
+++ b/poky/meta/recipes-devtools/python/python3_3.10.4.bb
@@ -40,7 +40,7 @@
file://12-distutils-prefix-is-inside-staging-area.patch \
file://0001-Don-t-search-system-for-headers-libraries.patch \
"
-SRC_URI[sha256sum] = "596c72de998dc39205bc4f70ef0dbf7edec740a306d09b49a9bd0a77806730dc"
+SRC_URI[sha256sum] = "80bf925f571da436b35210886cf79f6eb5fa5d6c571316b73568343451f77a19"
# exclude pre-releases for both python 2.x and 3.x
UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"