diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2023-05-19 17:38:37 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2023-05-19 21:39:02 +0300 |
commit | dc9d614711d1f205166fa42a0af05054fe06b26d (patch) | |
tree | b96ac45842c6be65a4967ef904dfd95ab307e10c /meta-raspberrypi | |
parent | b8485a60bce61ef2c5e6337a2f7b677871565a01 (diff) | |
download | openbmc-dc9d614711d1f205166fa42a0af05054fe06b26d.tar.xz |
subtree updates
meta-security: 53c5cc794f..ddf301c45c:
Adrian Zaharia (1):
libmhash: fix multilib header conflict - mutils/mhash_config.h
Alexander Kanavin (1):
maintainers.inc: rename to avoid clashes with oe-core
Armin Kuster (15):
meta-tpm: rename recipes-tpm to recipes-tpm1
recipes-tpm: use this for common tpm recipes
swtpm: update to 0.8.0
libtpm: update to 0.9.6
ossec-hids: update to tip of 3.7.0
libhtp: update to 0.5.43
suricata: update to 6.0.11
fscryptctl: update to 1.0.1
oeqa: fix hash test to match new changes
integrity-image-minimal: adapt QEMU cmdline to new changes
lynis: Add decoding OE and Poky
os-release.bbappend: drop now CPE_NAME is in core
openembedded-release: drop as os-release does this now
tpm2-tss: drop vendor from PACKAGECONFIG
packagegroup-security-tpm2: restore pkgs removed earlier
Paul Gortmaker (4):
dm-verity: ensure people don't ignore the DISTRO_FEATURES warning
dm-verity: don't make read-only-rootfs sound like a requirement
dm-verity: document the meta-intel dependency in the systemd example
dm-verity: add x86-64 systemd based example instructions
Peter Hoyes (1):
meta-parsec/layer.conf: Insert addpylib declaration
Peter Kjellerstedt (1):
tpm2-tools: Remove unnecessary and optional dependencies
Stefan Berger (12):
ima: Document and replace keys and adapt scripts for EC keys
ima: Fix the ima_policy_appraise_all to appraise executables & libraries
ima: Fix the IMA kernel feature
ima: Rename IMA_EVM_POLICY_SYSTEMD to IMA_EVM_POLICY
ima: Sign all executables and the ima-policy in the root filesystem
integrity: Update the README for IMA support
linux: overlayfs: Add kernel patch resolving a file change notification issue
ima-evm-utils: Update ima-evm-utils to v1.5 and add a patch
linux: overlayfs: Drop kernel patch resolving a file change notification issue
ima: Drop kernel config option CONFIG_SQUASHFS_XATTR=y from ima.cfg
integrity: Fix the do_configure function
integrity: Rename linux-%.bbappend to linux-yocto%.bbappend
meta-raspberrypi: bf948e0aa8..928bb234bb:
Martin Jansa (3):
rpi-libcamera-apps: fix flags used in aarch64 builds
rpi-libcamera-apps: fix version generation on hosts with older python
rpi-libcamera-apps: bump to latest SRCREV and set PV
meta-arm: 0b5724266a..f9d80e1a14:
Emekcan Aras (2):
arm-bsp/trusted-firmware-m: Align Capsule Update with GPT changes
arm-bsp/wic: corstone1000: Fix and limit the partition size for corstone1000
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I56f7d26070d879e3138618332841c30cf57eb7d9
Diffstat (limited to 'meta-raspberrypi')
2 files changed, 50 insertions, 8 deletions
diff --git a/meta-raspberrypi/recipes-multimedia/libcamera-apps/rpi-libcamera-apps/0001-utils-version.py-use-usr-bin-env-in-shebang.patch b/meta-raspberrypi/recipes-multimedia/libcamera-apps/rpi-libcamera-apps/0001-utils-version.py-use-usr-bin-env-in-shebang.patch new file mode 100644 index 0000000000..4c066dee38 --- /dev/null +++ b/meta-raspberrypi/recipes-multimedia/libcamera-apps/rpi-libcamera-apps/0001-utils-version.py-use-usr-bin-env-in-shebang.patch @@ -0,0 +1,42 @@ +From 738f530829fb5ee37d74191d34f75d72921284ca Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Thu, 4 May 2023 18:07:16 +0000 +Subject: [PATCH] utils/version.py: use /usr/bin/env in shebang + +* it uses subprocess text=True which is available only since python-3.7 + when running on host with python-3.6 it fails with: +Traceback (most recent call last): + File "TOPDIR/BUILD/work/raspberrypi4_64-oe-linux/rpi-libcamera-apps/git-r0/git/utils/version.py", line 19, in generate_version + stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, text=True) + File "/usr/lib/python3.6/subprocess.py", line 423, in run + with Popen(*popenargs, **kwargs) as process: +TypeError: __init__() got an unexpected keyword argument 'text' + +During handling of the above exception, another exception occurred: + +Traceback (most recent call last): + File "TOPDIR/BUILD/work/raspberrypi4_64-oe-linux/rpi-libcamera-apps/git-r0/git/utils/version.py", line 52, in <module> + generate_version() + File "TOPDIR/BUILD/work/raspberrypi4_64-oe-linux/rpi-libcamera-apps/git-r0/git/utils/version.py", line 48, in generate_version + print(f'{commit} {datetime.now().strftime("%d-%m-%Y (%H:%M:%S)")}', end="") +UnboundLocalError: local variable 'commit' referenced before assignment +Generating version string: + + even when newer python3 is in PATH (either from buildtools or from python3native) + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Pending +--- + utils/version.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/version.py b/utils/version.py +index fc2d431..1400eed 100755 +--- a/utils/version.py ++++ b/utils/version.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 ++#!/usr/bin/env python3 + + # Copyright (C) 2021, Raspberry Pi (Trading) Limited + # Generate version information for libcamera-apps diff --git a/meta-raspberrypi/recipes-multimedia/libcamera-apps/rpi-libcamera-apps_git.bb b/meta-raspberrypi/recipes-multimedia/libcamera-apps/rpi-libcamera-apps_git.bb index 073105dffd..062ded9a18 100644 --- a/meta-raspberrypi/recipes-multimedia/libcamera-apps/rpi-libcamera-apps_git.bb +++ b/meta-raspberrypi/recipes-multimedia/libcamera-apps/rpi-libcamera-apps_git.bb @@ -9,8 +9,10 @@ LIC_FILES_CHKSUM = "file://license.txt;md5=a0013d1b383d72ba4bdc5b750e7d1d77" SRC_URI = "\ git://github.com/raspberrypi/libcamera-apps.git;protocol=https;branch=main \ + file://0001-utils-version.py-use-usr-bin-env-in-shebang.patch \ " -SRCREV = "22a52590c33a813743b4e6337478c208201c77b1" +PV = "1.1.2+git${SRCPV}" +SRCREV = "12098520a3dec36ba796655baac7efece457f8d8" S = "${WORKDIR}/git" @@ -26,19 +28,17 @@ EXTRA_OECMAKE = "\ -DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR} \ " -EXTRA_OECMAKE:append:raspberrypi3 = " -DENABLE_COMPILE_FLAGS_FOR_TARGET=armv8-neon" -EXTRA_OECMAKE:append:raspberrypi4 = " -DENABLE_COMPILE_FLAGS_FOR_TARGET=armv8-neon" +LIBCAMERA_ARCH = "${TARGET_ARCH}" +LIBCAMERA_ARCH:aarch64 = "arm64" +LIBCAMERA_ARCH:arm = "armv8-neon" +EXTRA_OECMAKE += "-DENABLE_COMPILE_FLAGS_FOR_TARGET=${LIBCAMERA_ARCH}" PACKAGECONFIG[x11] = "-DENABLE_X11=1,-DENABLE_X11=0" PACKAGECONFIG[qt] = "-DENABLE_QT=1,-DENABLE_QT=0" PACKAGECONFIG[opencv] = "-DENABLE_OPENCV=1,-DENABLE_OPENCV=0" PACKAGECONFIG[tensorflow-lite] = "-DENABLE_TFLITE=1,-DENABLE_TFLITE=0" -# Build does not version solibs so we need to change the suffix -SOLIBS = ".so" -FILES_SOLIBSDEV = "" - do_install:append() { # Requires python3-core which not all systems may have - rm ${D}/${bindir}/camera-bug-report + rm -v ${D}/${bindir}/camera-bug-report } |