From d7d010de6b39245fe54c271b022caa931ba730ae Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 29 May 2024 07:35:28 -0400 Subject: Update bbappends for scarthgap 5.0.1 Make python3-grpcio and python3-pyqt5 bbappends wildcards to handle version bump in scarthgap 5.0.1 and any future updates. Also fix python3-pyqt5 bbappend for Yocto layer compatibility requirements. Bug-AGL: SPEC-5149 Change-Id: Ie3b88f875c7186d54c470173ebb23472ed0bb4ed Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29952 Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- recipes-devtools/python/python3-grpcio_1.62.%.bbappend | 1 + recipes-devtools/python/python3-grpcio_1.62.1.bbappend | 1 - recipes-devtools/python/python3-pyqt5_5.15.%.bbappend | 1 + recipes-devtools/python/python3-pyqt5_5.15.9.bbappend | 9 --------- recipes-devtools/python/python3-pyqt5_agldemo.inc | 9 +++++++++ 5 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 recipes-devtools/python/python3-grpcio_1.62.%.bbappend delete mode 100644 recipes-devtools/python/python3-grpcio_1.62.1.bbappend create mode 100644 recipes-devtools/python/python3-pyqt5_5.15.%.bbappend delete mode 100644 recipes-devtools/python/python3-pyqt5_5.15.9.bbappend create mode 100644 recipes-devtools/python/python3-pyqt5_agldemo.inc diff --git a/recipes-devtools/python/python3-grpcio_1.62.%.bbappend b/recipes-devtools/python/python3-grpcio_1.62.%.bbappend new file mode 100644 index 000000000..26036fc88 --- /dev/null +++ b/recipes-devtools/python/python3-grpcio_1.62.%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'python3-grpcio_agldemo.inc', '', d)} diff --git a/recipes-devtools/python/python3-grpcio_1.62.1.bbappend b/recipes-devtools/python/python3-grpcio_1.62.1.bbappend deleted file mode 100644 index 26036fc88..000000000 --- a/recipes-devtools/python/python3-grpcio_1.62.1.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'python3-grpcio_agldemo.inc', '', d)} diff --git a/recipes-devtools/python/python3-pyqt5_5.15.%.bbappend b/recipes-devtools/python/python3-pyqt5_5.15.%.bbappend new file mode 100644 index 000000000..34108b951 --- /dev/null +++ b/recipes-devtools/python/python3-pyqt5_5.15.%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'python3-pyqt5_agldemo.inc', '', d)} diff --git a/recipes-devtools/python/python3-pyqt5_5.15.9.bbappend b/recipes-devtools/python/python3-pyqt5_5.15.9.bbappend deleted file mode 100644 index 408c48b30..000000000 --- a/recipes-devtools/python/python3-pyqt5_5.15.9.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -# Enable SVG support -DEPENDS:append = " qtsvg" -PYQT_MODULES:append = " QtSvg" - -# Fix python interpreter paths in pyrcc5, etc., adapted from newer upstream -# recipe -do_install:append() { - sed -i "s,^exec .*python${PYTHON_BASEVERSION},exec ${bindir}/python3," ${D}/${bindir}/* -} diff --git a/recipes-devtools/python/python3-pyqt5_agldemo.inc b/recipes-devtools/python/python3-pyqt5_agldemo.inc new file mode 100644 index 000000000..408c48b30 --- /dev/null +++ b/recipes-devtools/python/python3-pyqt5_agldemo.inc @@ -0,0 +1,9 @@ +# Enable SVG support +DEPENDS:append = " qtsvg" +PYQT_MODULES:append = " QtSvg" + +# Fix python interpreter paths in pyrcc5, etc., adapted from newer upstream +# recipe +do_install:append() { + sed -i "s,^exec .*python${PYTHON_BASEVERSION},exec ${bindir}/python3," ${D}/${bindir}/* +} -- cgit 1.2.3-korg