summaryrefslogtreecommitdiff
path: root/poky/meta/lib
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2022-08-22 23:46:06 +0300
committerPatrick Williams <patrick@stwcx.xyz>2022-08-22 23:46:57 +0300
commit53fdac2b0aee16e297ce86b473c56547ff1330ac (patch)
tree2bee75c38a2f8a1c8e1ff5d629a0defab197113f /poky/meta/lib
parentcb2a94c39eddda6e0df65f98fff97cce711c9134 (diff)
downloadopenbmc-53fdac2b0aee16e297ce86b473c56547ff1330ac.tar.xz
subtree updates
poky: e4b5c35fd4..387ab5f18b: Alex Kiernan (2): bind: Remove legacy python3 PACKAGECONFIG code openssh: Add openssh-sftp-server to openssh RDEPENDS Alexander Kanavin (16): gnupg: update 2.3.4 -> 2.3.6 xev: update 1.2.4 -> 1.2.5 xmodmap: update 1.0.10 -> 1.0.11 xf86-input-synaptics: update 1.9.1 -> 1.9.2 encodings: update 1.0.5 -> 1.0.6 font-util: update 1.3.2 -> 1.3.3 xserver-xorg: update 21.1.3 -> 21.1.4 linux-firmware: update 20220610 -> 20220708 libuv: upgrade 1.44.1 -> 1.44.2 log4cplus: upgrade 2.0.7 -> 2.0.8 vala: upgrade 0.56.0 -> 0.56.1 vala: upgrade 0.56.1 -> 0.56.2 webkitgtk: upgrade 2.36.3 -> 2.36.4 xwayland: upgrade 22.1.2 -> 22.1.3 epiphany: upgrade 42.2 -> 42.3 lttng-modules: update 2.13.3 -> 2.13.4 Bruce Ashfield (14): yocto-bsps: update to v5.10.113 yocto-bsps: update to v5.10.128 and buildpaths fixes yocto-bsps: update to v5.15.52 and buildpaths fixes yocto-bsps/5.10: fix buildpaths issue with gen-mach-types yocto-bsps/5.15: fix buildpaths issue with gen-mach-types yocto-bsps/5.10: fix buildpaths issue with pnmtologo yocto-bsps/5.15: fix buildpaths issue with pnmtologo yocto-bsps: update to v5.15.54 yocto-bsps: update to v5.10.130 linux-yocto/5.10: update to v5.10.135 linux-yocto/5.15: update to v5.15.58 linux-yocto-rt/5.15: update to -rt48 (and fix -stable merge) linux-yocto/5.15: update to v5.15.59 linux-yocto/5.15: fix reproducibility issues Dmitry Baryshkov (1): linux-firwmare: restore WHENCE_CHKSUM variable He Zhe (1): lttng-modules: Fix build failure for kernel v5.15.58 Hitendra Prajapati (2): qemu: CVE-2022-35414 can perform an uninitialized read on the translate_fail path, leading to an io_readx or io_writex crash libtirpc: CVE-2021-46828 DoS vulnerability with lots of connections Joshua Watt (1): sstatesig: Include all dependencies in SPDX task signatures Khem Raj (3): lua: Backport fix for CVE-2022-33099 gcc-runtime: Pass -nostartfiles when building dummy libstdc++.so libgcc: Fix standalone target builds with usrmerge distro feature Martin Jansa (2): kernel.bbclass: pass LD also in savedefconfig glibc: revert one upstream change to work around broken DEBUG_BUILD build Mihai Lindner (1): wic/plugins/rootfs: Fix NameError for 'orig_path' Ming Liu (2): rootfs-postcommands.bbclass: move host-user-contaminated.txt to ${S} udev-extraconf:mount.sh: fix a umount issue Mingli Yu (1): strace: set COMPATIBLE_HOST for riscv32 Naveen (1): gcc: Backport a fix for gcc bug 105039 Richard Purdie (5): vim: Upgrade 9.0.0021 -> 9.0.0063 xorg-app: Tweak handling of compression changes in SRC_URI xwayland: upgrade 22.1.1 -> 22.1.2 base/reproducible: Change Source Date Epoch generation methods build-appliance-image: Update to kirkstone head revision Ross Burton (2): oeqa/runtime: add test that the kernel has CONFIG_PREEMPT_RT enabled perf: fix reproduciblity in older releases of Linux Sakib Sajal (3): dpkg: fix CVE-2022-1664 go: update v1.17.10 -> v1.17.12 git: upgrade v2.35.3 -> v2.35.4 Shruthi Ravichandran (2): initscripts: run umountnfs as a KILL script package_manager/ipk: do not pipe stderr to stdout Steve Sakoman (1): poky.conf: bump version for 4.0.3 Sundeep KOKKONDA (2): binutils: stable 2.38 branch updates glibc : stable 2.35 branch updates Tom Hochstein (1): gobject-introspection-data: Disable cache for g-ir-scanner Yi Zhao (1): tiff: Security fixes CVE-2022-1354 and CVE-2022-1355 Yue Tao (1): gnupg: upgrade to 2.3.7 to fix CVE-2022-34903 gr embeter (1): efivar: fix import functionality leimaohui (1): systemd: Added base_bindir into pkg_postinst:udev-hwdb. wangmy (4): bind: upgrade 9.18.2 -> 9.18.3 bind: upgrade 9.18.3 -> 9.18.4 mkfontscale: upgrade 1.2.1 -> 1.2.2 xdpyinfo: upgrade 1.3.2 -> 1.3.3 meta-openembedded: a47ef04661..acbe748798: Akash Hadke (1): polkit: Add --shell /bin/nologin to polkitd user Anuj Mittal (1): yasm: fix buildpaths warning Armin Kuster (1): bigbuckbunny-1080p: update SRC_URI Aryaman Gupta (1): rsyslog: update 8.2202->8.2206 Chen Qi (1): catfish: fix buildpaths issue Davide Gardenal (6): libplist: ignore patched CVEs meta-oe: ignore patched CVEs mongodb: ignore unrelated CVEs php: ignore patched CVEs postgresql: ignore unrelated CVE openjpeg: ignore CVE-2015-1239 Khem Raj (1): ibus: Swith to use main branch instead of master Marta Rybczynska (1): polkit: update patches for musl compilation Martin Jansa (1): glmark2: fix compatibility with python-3.11 Mingli Yu (6): net-snmp: set ac_cv_path_PSPROG postgresql: Fix the buildpaths issue freeradius: Fix buildpaths issue openipmi: Fix buildpaths issue apache2: Fix the buildpaths issue frr: fix buildpaths issue Peter Kjellerstedt (2): libwebsockets: Avoid absolute paths in *.cmake files in the sysroot cryptsetup: Add support for building without SSH tokens Vyacheslav Yurkov (1): polkit: add udisks2 rule Wang Mingyu (3): php: upgrade 8.1.7 -> 8.1.8 ndisc6: upgrade 1.0.5 -> 1.0.6 tracker: upgrade 3.3.0 -> 3.3.1 Yi Zhao (1): polkit-group-rule-udisks2: fix override syntax in RDEPENDS Yue Tao (1): python3-lxml: Security fix CVE-2022-2309 wangmy (4): stunnel: upgrade 5.63 -> 5.64 stunnel: upgrade 5.64 -> 5.65 redis: upgrade 7.0.2 -> 7.0.4 tracker: upgrade 3.3.1 -> 3.3.2 Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I48e5e47f05b456589a0c3106b5a095f1b43780b0
Diffstat (limited to 'poky/meta/lib')
-rw-r--r--poky/meta/lib/oe/package_manager/ipk/__init__.py23
-rw-r--r--poky/meta/lib/oe/reproducible.py1
-rw-r--r--poky/meta/lib/oe/sstatesig.py9
-rw-r--r--poky/meta/lib/oeqa/runtime/cases/rt.py17
4 files changed, 39 insertions, 11 deletions
diff --git a/poky/meta/lib/oe/package_manager/ipk/__init__.py b/poky/meta/lib/oe/package_manager/ipk/__init__.py
index 4cd3963111..9f60f3abcc 100644
--- a/poky/meta/lib/oe/package_manager/ipk/__init__.py
+++ b/poky/meta/lib/oe/package_manager/ipk/__init__.py
@@ -102,12 +102,14 @@ class OpkgDpkgPM(PackageManager):
This method extracts the common parts for Opkg and Dpkg
"""
- try:
- output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).decode("utf-8")
- except subprocess.CalledProcessError as e:
+ proc = subprocess.run(cmd, capture_output=True, encoding="utf-8", shell=True)
+ if proc.returncode:
bb.fatal("Unable to list available packages. Command '%s' "
- "returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8")))
- return opkg_query(output)
+ "returned %d:\n%s" % (cmd, proc.returncode, proc.stderr))
+ elif proc.stderr:
+ bb.note("Command '%s' returned stderr: %s" % (cmd, proc.stderr))
+
+ return opkg_query(proc.stdout)
def extract(self, pkg, pkg_info):
"""
@@ -443,15 +445,16 @@ class OpkgPM(OpkgDpkgPM):
cmd = "%s %s --noaction install %s " % (self.opkg_cmd,
opkg_args,
' '.join(pkgs))
- try:
- output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
- except subprocess.CalledProcessError as e:
+ proc = subprocess.run(cmd, capture_output=True, encoding="utf-8", shell=True)
+ if proc.returncode:
bb.fatal("Unable to dummy install packages. Command '%s' "
- "returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8")))
+ "returned %d:\n%s" % (cmd, proc.returncode, proc.stderr))
+ elif proc.stderr:
+ bb.note("Command '%s' returned stderr: %s" % (cmd, proc.stderr))
bb.utils.remove(temp_rootfs, True)
- return output
+ return proc.stdout
def backup_packaging_data(self):
# Save the opkglib for increment ipk image generation
diff --git a/poky/meta/lib/oe/reproducible.py b/poky/meta/lib/oe/reproducible.py
index 35b8be6d08..2e815df190 100644
--- a/poky/meta/lib/oe/reproducible.py
+++ b/poky/meta/lib/oe/reproducible.py
@@ -152,7 +152,6 @@ def fixed_source_date_epoch(d):
def get_source_date_epoch(d, sourcedir):
return (
get_source_date_epoch_from_git(d, sourcedir) or
- get_source_date_epoch_from_known_files(d, sourcedir) or
get_source_date_epoch_from_youngest_file(d, sourcedir) or
fixed_source_date_epoch(d) # Last resort
)
diff --git a/poky/meta/lib/oe/sstatesig.py b/poky/meta/lib/oe/sstatesig.py
index 7150bd0929..de65244932 100644
--- a/poky/meta/lib/oe/sstatesig.py
+++ b/poky/meta/lib/oe/sstatesig.py
@@ -24,10 +24,19 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCaches):
return "/allarch.bbclass" in inherits
def isImage(mc, fn):
return "/image.bbclass" in " ".join(dataCaches[mc].inherits[fn])
+ def isSPDXTask(task):
+ return task in ("do_create_spdx", "do_create_runtime_spdx")
depmc, _, deptaskname, depmcfn = bb.runqueue.split_tid_mcfn(dep)
mc, _ = bb.runqueue.split_mc(fn)
+ # Keep all dependencies between SPDX tasks in the signature. SPDX documents
+ # are linked together by hashes, which means if a dependent document changes,
+ # all downstream documents must be re-written (even if they are "safe"
+ # dependencies).
+ if isSPDXTask(task) and isSPDXTask(deptaskname):
+ return True
+
# (Almost) always include our own inter-task dependencies (unless it comes
# from a mcdepends). The exception is the special
# do_kernel_configme->do_unpack_and_patch dependency from archiver.bbclass.
diff --git a/poky/meta/lib/oeqa/runtime/cases/rt.py b/poky/meta/lib/oeqa/runtime/cases/rt.py
new file mode 100644
index 0000000000..849ac1914e
--- /dev/null
+++ b/poky/meta/lib/oeqa/runtime/cases/rt.py
@@ -0,0 +1,17 @@
+#
+# SPDX-License-Identifier: MIT
+#
+
+from oeqa.runtime.case import OERuntimeTestCase
+from oeqa.core.decorator.depends import OETestDepends
+
+class RtTest(OERuntimeTestCase):
+ @OETestDepends(['ssh.SSHTest.test_ssh'])
+ def test_is_rt(self):
+ """
+ Check that the kernel has CONFIG_PREEMPT_RT enabled.
+ """
+ status, output = self.target.run("uname -a")
+ self.assertEqual(status, 0, msg=output)
+ # Split so we don't get a substring false-positive
+ self.assertIn("PREEMPT_RT", output.split())