Initial commit
This commit is contained in:
+42
@@ -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
|
||||
@@ -0,0 +1,44 @@
|
||||
SUMMARY = "A suite of libcamera-based apps for the Raspberry Pi"
|
||||
DESCRIPTION = "This is a small suite of libcamera-based apps that aim to \
|
||||
copy the functionality of the existing \"raspicam\" apps."
|
||||
HOMEPAGE = "https://github.com/raspberrypi/libcamera-apps"
|
||||
SECTION = "console/utils"
|
||||
|
||||
LICENSE = "BSD-2-Clause"
|
||||
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 \
|
||||
"
|
||||
PV = "1.1.2+git${SRCPV}"
|
||||
SRCREV = "12098520a3dec36ba796655baac7efece457f8d8"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
COMPATIBLE_MACHINE = "^rpi$"
|
||||
|
||||
DEPENDS = "libcamera libexif jpeg tiff libpng boost"
|
||||
|
||||
inherit cmake pkgconfig
|
||||
|
||||
EXTRA_OECMAKE = "\
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DBoost_INCLUDE_DIR=${STAGING_INCDIR} \
|
||||
-DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR} \
|
||||
"
|
||||
|
||||
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"
|
||||
|
||||
do_install:append() {
|
||||
# Requires python3-core which not all systems may have
|
||||
rm -v ${D}/${bindir}/camera-bug-report
|
||||
}
|
||||
Reference in New Issue
Block a user