From 58776373dfbbda0388940c41752c07c18b4f15cd Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 13 Apr 2022 09:07:35 -0500 Subject: subtree updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit meta-raspberrypi: cfbb192e5c..83f5577d8d: AJ Bagwell (1): linux-raspberrypi: add UBOOT_ENTRYPOINT to match LOADADDR poky: ed98f1a1ae..30b38d9cb9: Alexander Kanavin (1): connman-conf: ignore eth0 in qemu in a way that is not sysvinit-specific Chen Qi (1): spirv-tools: fix to use sdk-1.3.204 branch Kevin Hao (1): kernel.bbclass: Fix the do_strip() malfunction Khem Raj (2): libarchive: Upgrade to 3.6.1 musl: Move to 1.2.3 release tag Martin Jansa (1): license_image.bbclass: close package.manifest file Ralph Siemsen (2): xz: fix CVE-2022-1271 gzip: upgrade 1.11 -> 1.12 Richard Purdie (2): uninative: Upgrade to 3.6 with gcc 12 support package_ipk/deb: Fix specific version handling Ross Burton (1): python3-cryptography: backport fix for leaky test meta-openembedded: b9e440ead8..1888971b1f: Andreas Müller (5): octave: add PACKAGECONFIG for (Qt-)gui - disabled by default xfce4-eyes-plugin: upgrade 4.5.1 -> 4.6.0 gnome-online-accounts: upgrade 3.43.1 -> 3.44.0 mutter: upgrade 41.2 -> 42.0 gnome-shell: upgrade 41.2 -> 42.0 Clément Péron (1): grpc: remove unused patches Kai Kang (2): wxwidgets: fix wx-config multilib issue python3-wxgtk4: pass '--baselib' to WX_CONFIG Khem Raj (6): Revert "python3-cppy: upgrade 1.2.0 -> 1.2.1" libotr: Include missing sys/socket.h header libcereal: Link in libatomic on rv32 for ptests gnuplot: Disable libcerf and fix typo libcereal: Disable on ppc/ppc64 evolution-data-server: Disable g-i on musl Markus Volk (1): gparted: update to v1.4.0 Naveen Saini (1): ndctl: fix build failure with EXEWRAPPER_ENABLED False Oleksandr Kravchuk (27): python3-beautifulsoup: update to 4.11.1 python3-bidict: update to 0.22.0 python3-can: update t 4.0.0 python3-elementpath: update to 2.5.0 python3-flask-login: update to 0.6.0 python3-flask: update to 2.1.1 python3-gcovr: update to 5.1 python3-google-api-core: update to 2.7.1 python3-google-auth: update to 2.6.3 python3-grpcio-tools: update to 1.45.0 python3-ipython: update to 8.2.0 python3-jmespath: update to 1.0.0 python3-mypy: update to 0.942 python3-pint: update to 0.19.1 python3-portalocker: update to 2.4.0 python3-pulsectl: update to 22.3.2 python3-pycurl: update to 7.45.1 python3-pymogo: update to 4.1.0 python3-pyscaffold: update to 4.2.1 python3-pytest-helpers-namespace: update to 2021.12.29 python3-pywbem: update to 1.4.1 python3-regex: update to 2022.3.15 python3-sympy: update to 1.10.1 python3-tqdm: update to 4.64.1 python3-twitter: update to 4.8.0 python3-xmlschema: update to 1.10.0 python3-zeroconf: update to 0.38.4 Robert Yang (1): python3-wxgtk4: Require DISTRO_FEATURES as gtk3 Sakib Sajal (1): drbd-utils: update 9.13.1 -> 9.20.2 Scott Murray (1): wxwidgets: Fix building without x11 Stefan Herbrechtsmeier (2): grpc: add cmake support for target grpc: remove useless link with libatomic append Stefan Schmidt (4): ot-br-posix: add recipe for an OpenThread Border Router ot-daemon: add recipe for OpenThread daemon wpantund: add new recipe MAINTAINERS: add entry for OpenThread Willy Tu (1): googletests: Update SRC_URI to 9e71237 to move closer to lastest version Yi Zhao (1): libyang: do not inherit binconfig-disabled wangmy (9): haveged: upgrade 1.9.17 -> 1.9.18 hidapi: upgrade 0.10.1 -> 0.11.2 hwdata: upgrade 0.357 -> 0.358 broadcom-bt-firmware: upgrade 12.0.1.1105_p2 -> 12.0.1.1105_p3 byacc: upgrade 20211224 -> 20220128 ctags: upgrade 5.9.20211114.0 -> 5.9.20220410.0 feh: upgrade 3.6.1 -> 3.8 fio: upgrade 3.29 -> 3.30 grpc: upgrade 1.45.1 -> 1.45.2 Signed-off-by: Patrick Williams Change-Id: Ia6d6cf07c9398a7885df6b31b27019da4d8f01d8 --- poky/meta/classes/kernel.bbclass | 2 +- poky/meta/classes/license_image.bbclass | 4 ++-- poky/meta/classes/package_deb.bbclass | 7 ++++++- poky/meta/classes/package_ipk.bbclass | 7 ++++++- 4 files changed, 15 insertions(+), 5 deletions(-) (limited to 'poky/meta/classes') diff --git a/poky/meta/classes/kernel.bbclass b/poky/meta/classes/kernel.bbclass index 7ca847f0a3..bc52419e09 100644 --- a/poky/meta/classes/kernel.bbclass +++ b/poky/meta/classes/kernel.bbclass @@ -711,7 +711,7 @@ python do_strip() { extra_sections = d.getVar('KERNEL_IMAGE_STRIP_EXTRA_SECTIONS') kernel_image = d.getVar('B') + "/" + d.getVar('KERNEL_OUTPUT_DIR') + "/vmlinux" - if (extra_sections and kernel_image.find('${KERNEL_IMAGEDEST}/vmlinux') != -1): + if (extra_sections and kernel_image.find(d.getVar('KERNEL_IMAGEDEST') + '/vmlinux') != -1): kernel_image_stripped = kernel_image + ".stripped" shutil.copy2(kernel_image, kernel_image_stripped) oe.package.runstrip((kernel_image_stripped, 8, strip, extra_sections)) diff --git a/poky/meta/classes/license_image.bbclass b/poky/meta/classes/license_image.bbclass index 0a5ea0a2fb..7e1d0e08a9 100644 --- a/poky/meta/classes/license_image.bbclass +++ b/poky/meta/classes/license_image.bbclass @@ -19,8 +19,8 @@ python write_package_manifest() { pkgs = image_list_installed_packages(d) output = format_pkg_list(pkgs) - open(os.path.join(license_image_dir, 'package.manifest'), - 'w+').write(output) + with open(os.path.join(license_image_dir, 'package.manifest'), "w+") as package_manifest: + package_manifest.write(output) } python license_create_manifest() { diff --git a/poky/meta/classes/package_deb.bbclass b/poky/meta/classes/package_deb.bbclass index 2e75e222bc..a9b8ba0118 100644 --- a/poky/meta/classes/package_deb.bbclass +++ b/poky/meta/classes/package_deb.bbclass @@ -182,7 +182,8 @@ def deb_write_pkg(pkg, d): # '<' = less or equal # '>' = greater or equal # adjust these to the '<<' and '>>' equivalents - # + # Also, "=" specifiers only work if they have the PR in, so 1.2.3 != 1.2.3-r0 + # so to avoid issues, map this to ">= 1.2.3 << 1.2.3.0" for dep in list(var.keys()): if '(' in dep or '/' in dep: newdep = re.sub(r'[(:)/]', '__', dep) @@ -197,6 +198,10 @@ def deb_write_pkg(pkg, d): var[dep][i] = var[dep][i].replace("< ", "<< ") elif (v or "").startswith("> "): var[dep][i] = var[dep][i].replace("> ", ">> ") + elif (v or "").startswith("= ") and "-r" not in v: + ver = var[dep][i].replace("= ", "") + var[dep][i] = var[dep][i].replace("= ", ">= ") + var[dep].append("<< " + ver + ".0") rdepends = bb.utils.explode_dep_versions2(localdata.getVar("RDEPENDS") or "") debian_cmp_remap(rdepends) diff --git a/poky/meta/classes/package_ipk.bbclass b/poky/meta/classes/package_ipk.bbclass index f67cb0e5c9..9fe3c52fae 100644 --- a/poky/meta/classes/package_ipk.bbclass +++ b/poky/meta/classes/package_ipk.bbclass @@ -168,13 +168,18 @@ def ipk_write_pkg(pkg, d): # '<' = less or equal # '>' = greater or equal # adjust these to the '<<' and '>>' equivalents - # + # Also, "=" specifiers only work if they have the PR in, so 1.2.3 != 1.2.3-r0 + # so to avoid issues, map this to ">= 1.2.3 << 1.2.3.0" for dep in var: for i, v in enumerate(var[dep]): if (v or "").startswith("< "): var[dep][i] = var[dep][i].replace("< ", "<< ") elif (v or "").startswith("> "): var[dep][i] = var[dep][i].replace("> ", ">> ") + elif (v or "").startswith("= ") and "-r" not in v: + ver = var[dep][i].replace("= ", "") + var[dep][i] = var[dep][i].replace("= ", ">= ") + var[dep].append("<< " + ver + ".0") rdepends = bb.utils.explode_dep_versions2(localdata.getVar("RDEPENDS") or "") debian_cmp_remap(rdepends) -- cgit v1.2.3