[oe] [meta-oe][PATCH] pkcs11-provider: Upgrade 0.3 -> 0.5
From: Niko Mauno Changelogs: - https://github.com/latchset/pkcs11-provider/releases/tag/v0.4 - https://github.com/latchset/pkcs11-provider/releases/tag/v0.5 Signed-off-by: Niko Mauno --- .../{pkcs11-provider_0.3.bb => pkcs11-provider_0.5.bb} | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) rename meta-oe/recipes-support/pkcs11-provider/{pkcs11-provider_0.3.bb => pkcs11-provider_0.5.bb} (81%) diff --git a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.5.bb similarity index 81% rename from meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb rename to meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.5.bb index 816ee967c..6c19b6616 100644 --- a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb +++ b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.5.bb @@ -10,18 +10,14 @@ HOMEPAGE = "https://github.com/latchset/pkcs11-provider; SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=b53b787444a60266932bd270d1cf2d45" -DEPENDS = "\ -autoconf-archive \ -openssl \ -p11-kit \ -" +DEPENDS = "openssl" -SRCREV = "58040b4e32975cc1d7f39e424ee7b0097cd11311" +SRCREV = "3a4fdd2a2e5643af2a0f857b66a19b9fa109d40f" SRC_URI = "git://github.com/latchset/${BPN}.git;branch=main;protocol=https" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit meson pkgconfig FILES:${PN} += "${libdir}/ossl-modules/pkcs11.so" -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#111257): https://lists.openembedded.org/g/openembedded-devel/message/111257 Mute This Topic: https://lists.openembedded.org/mt/107051199/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-webserver][kirkstone][PATCH] nginx-1.21.1: Drop reference to removed patch
From: Niko Mauno Align to commit 8e297cdc841c6cad34097f00a6903ba25edfc153 ("nginx: Remove obsolete patch") by removing reference to removed patch file. By doing so we mitigate the following BitBake complaint: WARNING: .../meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb: Unable to get checksum for nginx SRC_URI entry 0001-HTTP-2-per-iteration-stream-handling-limit.patch: file could not be found Signed-off-by: Niko Mauno --- meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb index 73b5c93c9..b69fd7dab 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb @@ -1,7 +1,5 @@ require nginx.inc -SRC_URI += "file://0001-HTTP-2-per-iteration-stream-handling-limit.patch" - # 1.20.x branch is the current stable branch, the recommended default # 1.21.x is the current mainline branches containing all new features DEFAULT_PREFERENCE = "-1" -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110967): https://lists.openembedded.org/g/openembedded-devel/message/110967 Mute This Topic: https://lists.openembedded.org/mt/106759962/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-python][PATCH 2/4] python3-pybind11: Prune redundant inherit
On 15.2.2024 5.39, Khem Raj wrote: On Wed, Feb 14, 2024 at 7:30 PM Tim Orling <mailto:ticot...@gmail.com>> wrote: On Wed, Feb 14, 2024 at 12:25 AM Niko Mauno via lists.openembedded.org <http://lists.openembedded.org/ From: Niko Mauno mailto:niko.ma...@vaisala.com>> Inheriting setuptools3 implies the inherit of python3native, so drop the latter inherit as redundant. according to https://github.com/pybind/pybind11/blob/8b48ff878c168b51fe5ef7b8c728815b9e1a9857/pyproject.toml#L3 <https://github.com/pybind/pybind11/blob/8b48ff878c168b51fe5ef7b8c728815b9e1a9857/pyproject.toml#L3 we should drop setuptools3 and inherit pyyhin_setuptools_build_meta Good point I think that could be added as a new patch Thanks, submitted a new series for addressing this issue: https://patchwork.yoctoproject.org/project/oe/list/?series=22759 -Niko -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#109035): https://lists.openembedded.org/g/openembedded-devel/message/109035 Mute This Topic: https://lists.openembedded.org/mt/104349532/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH 2/2] python3-pybind11: Restore strip prevention patch
From: Niko Mauno The patch which removed the pybind11_strip() call from provisioned pybind11*Tools.cmake files was dropped in commit 5c455804aede17e0ea0cbb7ab55f8580f912e664 ("python3-pybind11: Upgrade to 2.10.3"). However this change delegated the requirement to set CMAKE_BUILD_TYPE as 'Debug' or 'RelWithDebInfo' (or as unset) to the cmake utilizing packages which have build time dependency on python3-pybind11, failure to do which causes following kind of BitBake failure with Yocto: ERROR: foobar-1.0.0-r0 do_package: QA Issue: File '/usr/lib/python3.11/site-packages/foobar.so' from foobar was already stripped, this will prevent future debugging! [already-stripped] Restore the patch so that the stripping is delegated to Yocto once more, allowing depending cmake packages to work out of the box also when they use 'Release' or 'MinSizeRel' as CMAKE_BUILD_TYPE by default. Signed-off-by: Joonas Salonpää Signed-off-by: Niko Mauno --- .../0001-Do-not-strip-binaries.patch | 52 +++ .../python/python3-pybind11_2.11.1.bb | 5 +- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch diff --git a/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch b/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch new file mode 100644 index 0..37cb78a30 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch @@ -0,0 +1,52 @@ +From debd676cd94f92a30b3be45f1245aa13d8c398c0 Mon Sep 17 00:00:00 2001 +From: Philip Balister +Date: Wed, 8 Jul 2020 09:41:43 -0400 +Subject: [PATCH] Do not strip binaries. + + * OpenEmbedded strips them after creating debug packages. + +Signed-off-by: Philip Balister +Signed-off-by: Leon Anavi +--- + tools/pybind11NewTools.cmake | 7 --- + tools/pybind11Tools.cmake| 6 -- + 2 files changed, 13 deletions(-) + +diff --git a/tools/pybind11NewTools.cmake b/tools/pybind11NewTools.cmake +index 7d7424a7..accd90c4 100644 +--- a/tools/pybind11NewTools.cmake b/tools/pybind11NewTools.cmake +@@ -233,13 +233,6 @@ function(pybind11_add_module target_name) + endif() + endif() + +- # Use case-insensitive comparison to match the result of $ +- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) +- if(NOT MSVC AND NOT "${uppercase_CMAKE_BUILD_TYPE}" MATCHES DEBUG|RELWITHDEBINFO) +-# Strip unnecessary sections of the binary on Linux/macOS +-pybind11_strip(${target_name}) +- endif() +- + if(MSVC) + target_link_libraries(${target_name} PRIVATE pybind11::windows_extras) + endif() +diff --git a/tools/pybind11Tools.cmake b/tools/pybind11Tools.cmake +index 66ad00a4..855ede41 100644 +--- a/tools/pybind11Tools.cmake b/tools/pybind11Tools.cmake +@@ -212,12 +212,6 @@ function(pybind11_add_module target_name) + endif() + endif() + +- # Use case-insensitive comparison to match the result of $ +- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) +- if(NOT MSVC AND NOT "${uppercase_CMAKE_BUILD_TYPE}" MATCHES DEBUG|RELWITHDEBINFO) +-pybind11_strip(${target_name}) +- endif() +- + if(MSVC) + target_link_libraries(${target_name} PRIVATE pybind11::windows_extras) + endif() +-- +2.39.2 + diff --git a/meta-python/recipes-devtools/python/python3-pybind11_2.11.1.bb b/meta-python/recipes-devtools/python/python3-pybind11_2.11.1.bb index 13f63b7c6..78662fe3c 100644 --- a/meta-python/recipes-devtools/python/python3-pybind11_2.11.1.bb +++ b/meta-python/recipes-devtools/python/python3-pybind11_2.11.1.bb @@ -8,7 +8,10 @@ DEPENDS = "\ " SRCREV = "8a099e44b3d5f85b20f05828d919d2332a8de841" -SRC_URI = "git://github.com/pybind/pybind11.git;branch=stable;protocol=https" +SRC_URI = "\ +git://github.com/pybind/pybind11.git;branch=stable;protocol=https \ +file://0001-Do-not-strip-binaries.patch \ +" S = "${WORKDIR}/git" -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#109033): https://lists.openembedded.org/g/openembedded-devel/message/109033 Mute This Topic: https://lists.openembedded.org/mt/104580057/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH 1/2] python3-pybind11: Migrate to python_setuptools_build_meta
From: Niko Mauno Switch from setuptools3.bbclass to python_setuptools_build_meta.bblass which reflects https://github.com/pybind/pybind11/blob/v2.11.1/pyproject.toml#L3 and mitigates following warning during do_compile: .../python3-pybind11/2.11.1/recipe-sysroot-native/usr/lib/python3.11/site-packages/setuptools/_distutils/cmd.py:66: SetuptoolsDeprecationWarning: setup.py install is deprecated. Here we also fix remaining minor style issue in task declarations (use four space indentation instead of three). Reported-by: Tim Orling Closes: https://lists.openembedded.org/g/openembedded-devel/message/108748 Signed-off-by: Niko Mauno --- .../python/python3-pybind11_2.11.1.bb | 23 +-- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-pybind11_2.11.1.bb b/meta-python/recipes-devtools/python/python3-pybind11_2.11.1.bb index f94ef3637..13f63b7c6 100644 --- a/meta-python/recipes-devtools/python/python3-pybind11_2.11.1.bb +++ b/meta-python/recipes-devtools/python/python3-pybind11_2.11.1.bb @@ -2,31 +2,30 @@ SUMMARY = "Seamless operability between C++11 and Python" HOMEPAGE = "https://github.com/pybind/pybind11; LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f" +DEPENDS = "\ +python3-cmake-native \ +python3-ninja-native \ +" SRCREV = "8a099e44b3d5f85b20f05828d919d2332a8de841" SRC_URI = "git://github.com/pybind/pybind11.git;branch=stable;protocol=https" S = "${WORKDIR}/git" -inherit cmake setuptools3 +inherit cmake python_setuptools_build_meta EXTRA_OECMAKE = "-DPYBIND11_TEST=OFF" -PIP_INSTALL_DIST_PATH = "${S}/dist" -PIP_INSTALL_PACKAGE = "pybind11" - -do_configure() { - cmake_do_configure +do_configure:append() { +cmake_do_configure } -do_compile() { - setuptools3_do_compile - cmake_do_compile +do_compile:append() { +cmake_do_compile } -do_install() { - setuptools3_do_install - cmake_do_install +do_install:append() { +cmake_do_install } BBCLASSEXTEND = "native nativesdk" -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#109032): https://lists.openembedded.org/g/openembedded-devel/message/109032 Mute This Topic: https://lists.openembedded.org/mt/104580056/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCHv2] pkcs11-provider: Add recipe
On 19.12.2023 18.36, Khem Raj wrote: I think SRCPV is redundant here as we do not need it on master. Thanks, now submitted v3 which omits SRCPV from PV value. -Niko -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107642): https://lists.openembedded.org/g/openembedded-devel/message/107642 Mute This Topic: https://lists.openembedded.org/mt/103265166/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCHv3] pkcs11-provider: Add recipe
From: Niko Mauno Starting with version 3.0 the OpenSSL project introduced a new modular system to extend OpenSSL that replaces the deprecated Engine modules. Providers are loaded via configuration directives in the openssl configuration file (or directly loaded by applications). The pkcs11 provider allows applications linked to openssl to use keys and cryptographic operations from a hardware or software token via their PKCS #11 driver and the use of PCKS #11 URIs. The pkcs11 provider can be configured to be automatically loaded via openssl.cnf For more details, visit https://github.com/latchset/pkcs11-provider/blob/main/docs/provider-pkcs11.7.md Signed-off-by: Niko Mauno --- .../pkcs11-provider/pkcs11-provider_git.bb| 28 +++ 1 file changed, 28 insertions(+) create mode 100644 meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_git.bb diff --git a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_git.bb b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_git.bb new file mode 100644 index 0..19412a517 --- /dev/null +++ b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_git.bb @@ -0,0 +1,28 @@ +SUMMARY = "An OpenSSL provider that allows direct interfacing with pkcs11 drivers" +DESCRIPTION = "\ +This is an Openssl 3.x provider to access Hardware or Software Tokens using \ +the PKCS#11 Cryptographic Token Interface\ +\ +This code targets version 3.1 of the interface but should be backwards \ +compatible to previous versions as well.\ +" +HOMEPAGE = "https://github.com/latchset/pkcs11-provider; +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=b53b787444a60266932bd270d1cf2d45" +DEPENDS = "\ +autoconf-archive \ +openssl \ +p11-kit \ +" + +SRCREV = "e2abc4a7ae33159f2fb21b9d87a05ea9e79ef584" +PV = "0.2+git" + +SRC_URI = "git://github.com/latchset/${BPN}.git;branch=main;protocol=https" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +FILES:${PN} += "${libdir}/ossl-modules/pkcs11.so" -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107641): https://lists.openembedded.org/g/openembedded-devel/message/107641 Mute This Topic: https://lists.openembedded.org/mt/103265608/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH] pkcs11-provider: Add recipe
On 19.12.2023 18.05, Jose Quaresma via lists.openembedded.org wrote: Hi Niko, Can the gitpkgv be removed and used with a bbappend on a custom layer? This is not strictly necessary for the package and looks more aligned with the product. Jose Hi Jose, certainly, I have now submitted v2 which omits gitpkgv usage. On related note, I have so far assumed using gitpkgv makes sense as it helps to avoid non-deterministic package versioning for recipes that bump SRCREV value without changing the base version. So I assume this is not considered an issue from the Yocto project perspective. Kind regards, Niko -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107640): https://lists.openembedded.org/g/openembedded-devel/message/107640 Mute This Topic: https://lists.openembedded.org/mt/103264418/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCHv2] pkcs11-provider: Add recipe
From: Niko Mauno Starting with version 3.0 the OpenSSL project introduced a new modular system to extend OpenSSL that replaces the deprecated Engine modules. Providers are loaded via configuration directives in the openssl configuration file (or directly loaded by applications). The pkcs11 provider allows applications linked to openssl to use keys and cryptographic operations from a hardware or software token via their PKCS #11 driver and the use of PCKS #11 URIs. The pkcs11 provider can be configured to be automatically loaded via openssl.cnf For more details, visit https://github.com/latchset/pkcs11-provider/blob/main/docs/provider-pkcs11.7.md Signed-off-by: Niko Mauno --- .../pkcs11-provider/pkcs11-provider_git.bb| 28 +++ 1 file changed, 28 insertions(+) create mode 100644 meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_git.bb diff --git a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_git.bb b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_git.bb new file mode 100644 index 0..2e25d91c5 --- /dev/null +++ b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_git.bb @@ -0,0 +1,28 @@ +SUMMARY = "An OpenSSL provider that allows direct interfacing with pkcs11 drivers" +DESCRIPTION = "\ +This is an Openssl 3.x provider to access Hardware or Software Tokens using \ +the PKCS#11 Cryptographic Token Interface\ +\ +This code targets version 3.1 of the interface but should be backwards \ +compatible to previous versions as well.\ +" +HOMEPAGE = "https://github.com/latchset/pkcs11-provider; +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=b53b787444a60266932bd270d1cf2d45" +DEPENDS = "\ +autoconf-archive \ +openssl \ +p11-kit \ +" + +SRCREV = "e2abc4a7ae33159f2fb21b9d87a05ea9e79ef584" +PV = "0.2+git${SRCPV}" + +SRC_URI = "git://github.com/latchset/${BPN}.git;branch=main;protocol=https" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +FILES:${PN} += "${libdir}/ossl-modules/pkcs11.so" -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107638): https://lists.openembedded.org/g/openembedded-devel/message/107638 Mute This Topic: https://lists.openembedded.org/mt/103265166/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] pkcs11-provider: Add recipe
From: Niko Mauno Starting with version 3.0 the OpenSSL project introduced a new modular system to extend OpenSSL that replaces the deprecated Engine modules. Providers are loaded via configuration directives in the openssl configuration file (or directly loaded by applications). The pkcs11 provider allows applications linked to openssl to use keys and cryptographic operations from a hardware or software token via their PKCS #11 driver and the use of PCKS #11 URIs. The pkcs11 provider can be configured to be automatically loaded via openssl.cnf For more details, visit https://github.com/latchset/pkcs11-provider/blob/main/docs/provider-pkcs11.7.md Signed-off-by: Niko Mauno --- .../pkcs11-provider/pkcs11-provider_git.bb| 29 +++ 1 file changed, 29 insertions(+) create mode 100644 meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_git.bb diff --git a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_git.bb b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_git.bb new file mode 100644 index 0..12c0f5fae --- /dev/null +++ b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_git.bb @@ -0,0 +1,29 @@ +SUMMARY = "An OpenSSL provider that allows direct interfacing with pkcs11 drivers" +DESCRIPTION = "\ +This is an Openssl 3.x provider to access Hardware or Software Tokens using \ +the PKCS#11 Cryptographic Token Interface\ +\ +This code targets version 3.1 of the interface but should be backwards \ +compatible to previous versions as well.\ +" +HOMEPAGE = "https://github.com/latchset/pkcs11-provider; +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=b53b787444a60266932bd270d1cf2d45" +DEPENDS = "\ +autoconf-archive \ +openssl \ +p11-kit \ +" + +SRCREV = "e2abc4a7ae33159f2fb21b9d87a05ea9e79ef584" +PV = "0.2+gitr${SRCPV}" +PKGV = "0.2+gitr${GITPKGV}" + +SRC_URI = "git://github.com/latchset/${BPN}.git;branch=main;protocol=https" + +S = "${WORKDIR}/git" + +inherit autotools gitpkgv pkgconfig + +FILES:${PN} += "${libdir}/ossl-modules/pkcs11.so" -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107634): https://lists.openembedded.org/g/openembedded-devel/message/107634 Mute This Topic: https://lists.openembedded.org/mt/103264418/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH 2/2] contrib: oe-stylize: Use Python3 explicitly
From: Niko Mauno For instance on Debian based host OS 'python' is not provided by default, which results is following error when trying to execute oe-stylize.py script: /usr/bin/env: ‘python’: No such file or directory Update the shebang to explicitly reference 'python3' instead of 'python', which should make the script better out-of-the-box compatible with larger variety of host OSes on which Yocto based development work takes place. Signed-off-by: Niko Mauno --- contrib/oe-stylize.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/oe-stylize.py b/contrib/oe-stylize.py index 1ef6391b6..1fb0a5bcc 100755 --- a/contrib/oe-stylize.py +++ b/contrib/oe-stylize.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """\ Sanitize a bitbake file following the OpenEmbedded style guidelines, -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#103099): https://lists.openembedded.org/g/openembedded-devel/message/103099 Mute This Topic: https://lists.openembedded.org/mt/99286673/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH 1/2] contrib: oe-stylize: Fix ambiguous variable names
From: Niko Mauno Fix pycodestyle warnings: oe-stylize.py:439:9: E741 ambiguous variable name 'l' oe-stylize.py:449:17: E741 ambiguous variable name 'l' by switching iterator variables to non-ambiguous characters. Signed-off-by: Niko Mauno --- contrib/oe-stylize.py | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/oe-stylize.py b/contrib/oe-stylize.py index 30b460e12..1ef6391b6 100755 --- a/contrib/oe-stylize.py +++ b/contrib/oe-stylize.py @@ -436,8 +436,8 @@ if __name__ == "__main__": # -- dump the sanitized .bb file -- addEmptyLine = False # write comments that are not related to variables nor routines -for l in commentBloc: -olines.append(l) +for c in commentBloc: +olines.append(c) # write variables and routines previourVarPrefix = "unknown" for k in OE_vars: @@ -446,8 +446,8 @@ if __name__ == "__main__": if seen_vars[k] != []: if addEmptyLine and not k.startswith(previourVarPrefix): olines.append("") -for l in seen_vars[k]: -olines.append(l) +for s in seen_vars[k]: +olines.append(s) previourVarPrefix = k.split('_')[0] == '' and "unknown" or k.split('_')[0] for line in olines: print(line) -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#103098): https://lists.openembedded.org/g/openembedded-devel/message/103098 Mute This Topic: https://lists.openembedded.org/mt/99286672/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][kirkstone][PATCH] Fix missing leading whitespace with ':append'
Mitigate occurences where ':append' operator is used and leading whitespace character is obviously missing, risking inadvertent string concatenation. Signed-off-by: Niko Mauno Signed-off-by: Khem Raj (cherry picked from commit 6a87f2ba9cdd4b9689b0d1c86b2e99071d1e069b) Signed-off-by: Niko Mauno --- meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb | 2 +- meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb index c8dabc5ea..44804545d 100644 --- a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb +++ b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https \ file://0001-Include-typeinfo-for-typeid.patch \ file://0001-include-utility-header.patch \ " -SRC_URI:append:libc-musl = "file://fix_build_musl.patch" +SRC_URI:append:libc-musl = " file://fix_build_musl.patch" SRCREV = "73532d6a5faae9c721c2cc9535b8ef32d4d18264" DEPENDS = "\ diff --git a/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb b/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb index c95a5b2d3..1c2c6e21e 100644 --- a/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb +++ b/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb @@ -16,7 +16,7 @@ S = "${WORKDIR}/git" DEPENDS = "openssl" -EXTRA_OEMAKE:append = "PREFIX=${prefix} LIBDIR=${libdir} USE_SHARED_LIB=1" +EXTRA_OEMAKE:append = " PREFIX=${prefix} LIBDIR=${libdir} USE_SHARED_LIB=1" # We want to statically link the binary to libfsverity on native Windows EXTRA_OEMAKE:remove:mingw32:class-nativesdk = "USE_SHARED_LIB=1" EXTRA_OEMAKE:remove:mingw32:class-native = "USE_SHARED_LIB=1" -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100831): https://lists.openembedded.org/g/openembedded-devel/message/100831 Mute This Topic: https://lists.openembedded.org/mt/96603270/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-networking][kirkstone][PATCH] nftables: Fix missing leading whitespace with ':append'
Mitigate occurence where ':append' operator is used and leading whitespace character is obviously missing, risking inadvertent string concatenation. Signed-off-by: Niko Mauno Signed-off-by: Khem Raj (cherry picked from commit d25967208bc8c4b1e2099e34150a67508744e4b9) Signed-off-by: Niko Mauno --- meta-networking/recipes-filter/nftables/nftables_1.0.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb b/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb index e078be79a..080a0ed85 100644 --- a/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb +++ b/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb @@ -38,7 +38,7 @@ RDEPENDS:${PN}-ptest += " make bash python3-core python3-ctypes python3-json pyt TESTDIR = "tests" -PRIVATE_LIBS:${PN}-ptest:append = "libnftables.so.1" +PRIVATE_LIBS:${PN}-ptest:append = " libnftables.so.1" do_install_ptest() { cp -rf ${S}/build-aux ${D}${PTEST_PATH} -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100830): https://lists.openembedded.org/g/openembedded-devel/message/100830 Mute This Topic: https://lists.openembedded.org/mt/96603249/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-networking][PATCH] nftables: Fix missing leading whitespace with ':append'
Mitigate occurence where ':append' operator is used and leading whitespace character is obviously missing, risking inadvertent string concatenation. Signed-off-by: Niko Mauno --- meta-networking/recipes-filter/nftables/nftables_1.0.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-filter/nftables/nftables_1.0.6.bb b/meta-networking/recipes-filter/nftables/nftables_1.0.6.bb index fb9c6e7d6..f43a223ac 100644 --- a/meta-networking/recipes-filter/nftables/nftables_1.0.6.bb +++ b/meta-networking/recipes-filter/nftables/nftables_1.0.6.bb @@ -37,7 +37,7 @@ RDEPENDS:${PN}-ptest += " ${PN}-python bash make iproute2 iputils-ping procps py TESTDIR = "tests" -PRIVATE_LIBS:${PN}-ptest:append = "libnftables.so.1" +PRIVATE_LIBS:${PN}-ptest:append = " libnftables.so.1" do_install:append() { # Avoid "contains reference to TMPDIR" warning -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100719): https://lists.openembedded.org/g/openembedded-devel/message/100719 Mute This Topic: https://lists.openembedded.org/mt/96495662/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] Fix missing leading whitespace with ':append'
Mitigate occurences where ':append' operator is used and leading whitespace character is obviously missing, risking inadvertent string concatenation. Signed-off-by: Niko Mauno --- meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb | 2 +- meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb | 2 +- meta-oe/recipes-support/neon/neon_0.32.4.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb index c8dabc5ea..44804545d 100644 --- a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb +++ b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https \ file://0001-Include-typeinfo-for-typeid.patch \ file://0001-include-utility-header.patch \ " -SRC_URI:append:libc-musl = "file://fix_build_musl.patch" +SRC_URI:append:libc-musl = " file://fix_build_musl.patch" SRCREV = "73532d6a5faae9c721c2cc9535b8ef32d4d18264" DEPENDS = "\ diff --git a/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb b/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb index c95a5b2d3..1c2c6e21e 100644 --- a/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb +++ b/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb @@ -16,7 +16,7 @@ S = "${WORKDIR}/git" DEPENDS = "openssl" -EXTRA_OEMAKE:append = "PREFIX=${prefix} LIBDIR=${libdir} USE_SHARED_LIB=1" +EXTRA_OEMAKE:append = " PREFIX=${prefix} LIBDIR=${libdir} USE_SHARED_LIB=1" # We want to statically link the binary to libfsverity on native Windows EXTRA_OEMAKE:remove:mingw32:class-nativesdk = "USE_SHARED_LIB=1" EXTRA_OEMAKE:remove:mingw32:class-native = "USE_SHARED_LIB=1" diff --git a/meta-oe/recipes-support/neon/neon_0.32.4.bb b/meta-oe/recipes-support/neon/neon_0.32.4.bb index c16a2c10a..d281bfde6 100644 --- a/meta-oe/recipes-support/neon/neon_0.32.4.bb +++ b/meta-oe/recipes-support/neon/neon_0.32.4.bb @@ -33,7 +33,7 @@ PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" EXTRA_OECONF += "--enable-shared --enable-threadsafe-ssl=posix" # Do not install into /usr/local -EXTRA_OEMAKE:append:class-native = "prefix=${prefix_native}" +EXTRA_OEMAKE:append:class-native = " prefix=${prefix_native}" do_configure:prepend() { echo "${PV}" > ${S}/.version -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100718): https://lists.openembedded.org/g/openembedded-devel/message/100718 Mute This Topic: https://lists.openembedded.org/mt/96495579/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][thud][PATCH 1/2] gitpkgv.bbclass: Use --git-dir option
From: "niko.ma...@vaisala.com" Avoid redundant shell working directory change by resorting to '--git-dir' option for git command instead. Signed-off-by: Niko Mauno Signed-off-by: Khem Raj --- meta-oe/classes/gitpkgv.bbclass | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass index 2d9680a35..22609f584 100644 --- a/meta-oe/classes/gitpkgv.bbclass +++ b/meta-oe/classes/gitpkgv.bbclass @@ -87,10 +87,8 @@ def get_git_pkgv(d, use_tags): if not os.path.exists(rev_file) or os.path.getsize(rev_file)==0: commits = bb.fetch2.runfetchcmd( -"cd %(repodir)s && " -"git rev-list %(rev)s -- 2> /dev/null " -"| wc -l" % vars, -d, quiet=True).strip().lstrip('0') +"git --git-dir=%(repodir)s rev-list %(rev)s -- 2>/dev/null | wc -l" +% vars, d, quiet=True).strip().lstrip('0') if commits != "": oe.path.remove(rev_file, recurse=False) @@ -105,9 +103,8 @@ def get_git_pkgv(d, use_tags): if use_tags: try: output = bb.fetch2.runfetchcmd( -"cd %(repodir)s && " -"git describe %(rev)s 2>/dev/null" % vars, -d, quiet=True).strip() +"git --git-dir=%(repodir)s describe %(rev)s 2>/dev/null" +% vars, d, quiet=True).strip() ver = gitpkgv_drop_tag_prefix(output) except Exception: ver = "0.0-%s-g%s" % (commits, vars['rev'][:7]) -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][warrior][PATCH 2/2] gitpkgv.bbclass: Support also lightweight tags
From: "niko.ma...@vaisala.com" When checking for commit specific tags during GITPKGVTAG resolution, use additional '--tags' and '--exact-match' options for 'git describe' command. This changes the behaviour so that in case an annotated tag does not exist for the particular commit, then the latest lightweight (non-annotated) tag is used instead, in case that commit has at least one such tag. Signed-off-by: Niko Mauno Signed-off-by: Khem Raj --- meta-oe/classes/gitpkgv.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass index 22609f584..ab591bd45 100644 --- a/meta-oe/classes/gitpkgv.bbclass +++ b/meta-oe/classes/gitpkgv.bbclass @@ -7,8 +7,8 @@ # NN equals the total number of revs up to SRCREV # GITHASH is SRCREV's (full) hash # -# - GITPKGVTAG which is the output of 'git describe' allowing for -# automatic versioning +# - GITPKGVTAG which is the output of 'git describe --tags --exact-match' +# allowing for automatic versioning # # gitpkgv.bbclass assumes the git repository has been cloned, and # contains SRCREV. So ${GITPKGV} and ${GITPKGVTAG} should never be @@ -103,7 +103,7 @@ def get_git_pkgv(d, use_tags): if use_tags: try: output = bb.fetch2.runfetchcmd( -"git --git-dir=%(repodir)s describe %(rev)s 2>/dev/null" +"git --git-dir=%(repodir)s describe %(rev)s --tags --exact-match 2>/dev/null" % vars, d, quiet=True).strip() ver = gitpkgv_drop_tag_prefix(output) except Exception: -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][thud][PATCH 2/2] gitpkgv.bbclass: Support also lightweight tags
From: "niko.ma...@vaisala.com" When checking for commit specific tags during GITPKGVTAG resolution, use additional '--tags' and '--exact-match' options for 'git describe' command. This changes the behaviour so that in case an annotated tag does not exist for the particular commit, then the latest lightweight (non-annotated) tag is used instead, in case that commit has at least one such tag. Signed-off-by: Niko Mauno Signed-off-by: Khem Raj --- meta-oe/classes/gitpkgv.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass index 22609f584..ab591bd45 100644 --- a/meta-oe/classes/gitpkgv.bbclass +++ b/meta-oe/classes/gitpkgv.bbclass @@ -7,8 +7,8 @@ # NN equals the total number of revs up to SRCREV # GITHASH is SRCREV's (full) hash # -# - GITPKGVTAG which is the output of 'git describe' allowing for -# automatic versioning +# - GITPKGVTAG which is the output of 'git describe --tags --exact-match' +# allowing for automatic versioning # # gitpkgv.bbclass assumes the git repository has been cloned, and # contains SRCREV. So ${GITPKGV} and ${GITPKGVTAG} should never be @@ -103,7 +103,7 @@ def get_git_pkgv(d, use_tags): if use_tags: try: output = bb.fetch2.runfetchcmd( -"git --git-dir=%(repodir)s describe %(rev)s 2>/dev/null" +"git --git-dir=%(repodir)s describe %(rev)s --tags --exact-match 2>/dev/null" % vars, d, quiet=True).strip() ver = gitpkgv_drop_tag_prefix(output) except Exception: -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][warrior][PATCH 1/2] gitpkgv.bbclass: Use --git-dir option
From: "niko.ma...@vaisala.com" Avoid redundant shell working directory change by resorting to '--git-dir' option for git command instead. Signed-off-by: Niko Mauno Signed-off-by: Khem Raj --- meta-oe/classes/gitpkgv.bbclass | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass index 2d9680a35..22609f584 100644 --- a/meta-oe/classes/gitpkgv.bbclass +++ b/meta-oe/classes/gitpkgv.bbclass @@ -87,10 +87,8 @@ def get_git_pkgv(d, use_tags): if not os.path.exists(rev_file) or os.path.getsize(rev_file)==0: commits = bb.fetch2.runfetchcmd( -"cd %(repodir)s && " -"git rev-list %(rev)s -- 2> /dev/null " -"| wc -l" % vars, -d, quiet=True).strip().lstrip('0') +"git --git-dir=%(repodir)s rev-list %(rev)s -- 2>/dev/null | wc -l" +% vars, d, quiet=True).strip().lstrip('0') if commits != "": oe.path.remove(rev_file, recurse=False) @@ -105,9 +103,8 @@ def get_git_pkgv(d, use_tags): if use_tags: try: output = bb.fetch2.runfetchcmd( -"cd %(repodir)s && " -"git describe %(rev)s 2>/dev/null" % vars, -d, quiet=True).strip() +"git --git-dir=%(repodir)s describe %(rev)s 2>/dev/null" +% vars, d, quiet=True).strip() ver = gitpkgv_drop_tag_prefix(output) except Exception: ver = "0.0-%s-g%s" % (commits, vars['rev'][:7]) -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][zeus][PATCH 2/2] gitpkgv.bbclass: Support also lightweight tags
From: "niko.ma...@vaisala.com" When checking for commit specific tags during GITPKGVTAG resolution, use additional '--tags' and '--exact-match' options for 'git describe' command. This changes the behaviour so that in case an annotated tag does not exist for the particular commit, then the latest lightweight (non-annotated) tag is used instead, in case that commit has at least one such tag. Signed-off-by: Niko Mauno Signed-off-by: Khem Raj --- meta-oe/classes/gitpkgv.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass index 22609f584..ab591bd45 100644 --- a/meta-oe/classes/gitpkgv.bbclass +++ b/meta-oe/classes/gitpkgv.bbclass @@ -7,8 +7,8 @@ # NN equals the total number of revs up to SRCREV # GITHASH is SRCREV's (full) hash # -# - GITPKGVTAG which is the output of 'git describe' allowing for -# automatic versioning +# - GITPKGVTAG which is the output of 'git describe --tags --exact-match' +# allowing for automatic versioning # # gitpkgv.bbclass assumes the git repository has been cloned, and # contains SRCREV. So ${GITPKGV} and ${GITPKGVTAG} should never be @@ -103,7 +103,7 @@ def get_git_pkgv(d, use_tags): if use_tags: try: output = bb.fetch2.runfetchcmd( -"git --git-dir=%(repodir)s describe %(rev)s 2>/dev/null" +"git --git-dir=%(repodir)s describe %(rev)s --tags --exact-match 2>/dev/null" % vars, d, quiet=True).strip() ver = gitpkgv_drop_tag_prefix(output) except Exception: -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][zeus][PATCH 1/2] gitpkgv.bbclass: Use --git-dir option
From: "niko.ma...@vaisala.com" Avoid redundant shell working directory change by resorting to '--git-dir' option for git command instead. Signed-off-by: Niko Mauno Signed-off-by: Khem Raj --- meta-oe/classes/gitpkgv.bbclass | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass index 2d9680a35..22609f584 100644 --- a/meta-oe/classes/gitpkgv.bbclass +++ b/meta-oe/classes/gitpkgv.bbclass @@ -87,10 +87,8 @@ def get_git_pkgv(d, use_tags): if not os.path.exists(rev_file) or os.path.getsize(rev_file)==0: commits = bb.fetch2.runfetchcmd( -"cd %(repodir)s && " -"git rev-list %(rev)s -- 2> /dev/null " -"| wc -l" % vars, -d, quiet=True).strip().lstrip('0') +"git --git-dir=%(repodir)s rev-list %(rev)s -- 2>/dev/null | wc -l" +% vars, d, quiet=True).strip().lstrip('0') if commits != "": oe.path.remove(rev_file, recurse=False) @@ -105,9 +103,8 @@ def get_git_pkgv(d, use_tags): if use_tags: try: output = bb.fetch2.runfetchcmd( -"cd %(repodir)s && " -"git describe %(rev)s 2>/dev/null" % vars, -d, quiet=True).strip() +"git --git-dir=%(repodir)s describe %(rev)s 2>/dev/null" +% vars, d, quiet=True).strip() ver = gitpkgv_drop_tag_prefix(output) except Exception: ver = "0.0-%s-g%s" % (commits, vars['rev'][:7]) -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 6/7] python-pygobject: Fix style issue
Add missing space characters around the operator in SRCNAME declaration Signed-off-by: Niko Mauno --- meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb index a030df98c..87c1202a1 100644 --- a/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb +++ b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb @@ -8,7 +8,7 @@ inherit gnomebase gobject-introspection distutils-base upstream-version-is-even DEPENDS += "python glib-2.0" -SRCNAME="pygobject" +SRCNAME = "pygobject" SRC_URI = " \ http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \ " -- 2.19.2 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 7/7] python-pygobject: Tune remove operation
Drop '-f, --force' operator from rm command as that will hide the fact if the removed artifacts cease to exist in later version of this recipe. Also drop a superfluous slash from artifact path. Signed-off-by: Niko Mauno --- meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb index 87c1202a1..348a0398f 100644 --- a/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb +++ b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb @@ -27,5 +27,5 @@ RDEPENDS_${PN}_class-native = "" do_install_append() { # Remove files that clash with python3-pygobject; their content is same -rm -rf ${D}${includedir}/pygobject-3.0//pygobject.h ${D}${libdir}/pkgconfig +rm -r ${D}${includedir}/pygobject-3.0/pygobject.h ${D}${libdir}/pkgconfig } -- 2.19.2 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/7] python-pygobject: Fix invalid install path
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/meta?id=1dccb37d89f54d7284b6a81957ab228906f24e1c has replaced PYTHON_PN references with hardcoded 'python' and 'python3' strings in pythonnative.bbclass and python3native.bbclass, respectively. Associated commit message states: "If both are inherited then both native Pythons are available, but the last to be inherited will be the one to set PYTHON." Since after the above-mentioned commit this Pythonv2 recipe installs wrongly into /usr/lib/python3.5/ directory, move inherit of distutils-base.bbclass (which inherits pythonnative.bbclass) to right hand side of gobject-introspection.bbclass (which inherits python3native.bbclass) which changes the install path back to /usr/lib/python2.7/ mitigating the issue. Signed-off-by: Niko Mauno --- meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb index c444fbf05..70c7b9eb5 100644 --- a/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb +++ b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" -inherit autotools pkgconfig gnomebase distutils-base gobject-introspection +inherit autotools pkgconfig gnomebase gobject-introspection distutils-base PYTHON_BASEVERSION = "2.7" PYTHON_PN = "python" -- 2.19.2 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/7] python-pygobject: Drop redundant PYTHON* refs
Remove redundant PYTHON* declarations/references as this recipe builds now correctly without them. Signed-off-by: Niko Mauno --- meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb index 70c7b9eb5..4edf00808 100644 --- a/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb +++ b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb @@ -6,9 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" inherit autotools pkgconfig gnomebase gobject-introspection distutils-base -PYTHON_BASEVERSION = "2.7" -PYTHON_PN = "python" - DEPENDS += "gnome-common-native python glib-2.0" SRCNAME="pygobject" @@ -24,7 +21,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" BBCLASSEXTEND = "native" -EXTRA_OECONF = "--disable-cairo --with-python=${PYTHON}" +EXTRA_OECONF = "--disable-cairo" RDEPENDS_${PN} += "python-setuptools" RDEPENDS_${PN}_class-native = "" -- 2.19.2 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 3/7] python-pygobject: Drop redundant dependencies
Simplify recipe by reflecting following changes introduced to Pythonv3 variant of this recipe in commits http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/meta?id=b663374cf41465c6dc94001d6fa73a5523542fb6 http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/meta?id=521ea98b2c622f5ae7e6d18849a0379fa7ed4e90 in which the gnome-common dependency was left out due to pygobject moving to autoconf-archive, and remaining configure.ac patch file was also deemed unnecessary. Signed-off-by: Niko Mauno --- ...-sysroot-path-to-GI_DATADIR-don-t-se.patch | 28 --- .../python/python-pygobject_3.28.3.bb | 3 +- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch diff --git a/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch b/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch deleted file mode 100644 index 9a11442f1..0 --- a/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5e5350d730f85957a42c6d846d347d080e7dd996 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 23 Oct 2015 12:40:34 +0300 -Subject: [PATCH] configure.ac: add sysroot path to GI_DATADIR; don't set - introspection scanner and compiler paths - -Upstream-Status: Pending [review on oe-core maillist] -Signed-off-by: Alexander Kanavin - configure.ac | 8 +--- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2c0cfbd..cfcb3bf 100644 a/configure.ac -+++ b/configure.ac -@@ -155,7 +155,7 @@ PKG_CHECK_MODULES(GI, - - GOBJECT_INTROSPECTION_CHECK(introspection_required_version) - --GI_DATADIR=$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) -+GI_DATADIR=$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) - AC_SUBST(GI_DATADIR) - - if test "$enable_cairo" != no; then --- -2.1.4 - diff --git a/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb index 4edf00808..fb4a0b181 100644 --- a/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb +++ b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb @@ -6,12 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" inherit autotools pkgconfig gnomebase gobject-introspection distutils-base -DEPENDS += "gnome-common-native python glib-2.0" +DEPENDS += "python glib-2.0" SRCNAME="pygobject" SRC_URI = " \ http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \ -file://0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch \ " SRC_URI[md5sum] = "3bac63c86bb963aa401f97859464aa90" -- 2.19.2 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 5/7] python-pygobject: Remove duplication in inherit
Reflect following change in Pythonv3 variant of this recipe http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/meta?id=a195e0471d0df0ac26e00d6fcb3a2786e080a643 and drop redundant inherit for autotools and pkgconfig also here Signed-off-by: Niko Mauno --- meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb index b2af3faf7..a030df98c 100644 --- a/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb +++ b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" -inherit autotools pkgconfig gnomebase gobject-introspection distutils-base upstream-version-is-even +inherit gnomebase gobject-introspection distutils-base upstream-version-is-even DEPENDS += "python glib-2.0" -- 2.19.2 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 4/7] python-pygobject: Only check for even upstream versions
Reflect following change in Pythonv3 variant of this recipe http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/meta?id=fed093329b504cd46aa758983db6073b70c2af29 and add inherit for upstream-version-is-even.bbclass Signed-off-by: Niko Mauno --- meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb index fb4a0b181..b2af3faf7 100644 --- a/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb +++ b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" -inherit autotools pkgconfig gnomebase gobject-introspection distutils-base +inherit autotools pkgconfig gnomebase gobject-introspection distutils-base upstream-version-is-even DEPENDS += "python glib-2.0" -- 2.19.2 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCHv2] tslib: Align recipe content to better match v1.15
Respective changes to recipe: - updated AUTHOR field to match current author in tslib/AUTHORS file - updated LICENSE field to 'LGPLv2+ & GPLv2+' to reflect licenses in v1.15 (LGPLv2+ for shared library parts, GPLv2+ for command line utility parts) - updated LIC_FILES_CHECKSUM to contain COPYING files for both license families - Replaced EXTRA_OECONF with PACKAGECONFIG that is aligned to current configure defaults, with exception that "Tatung Webpad support" was disabled (as it was enabled by default for some reason despite being seemingly specific to a single manufacturer/product). - removed commented-out detect-stylus lines (a detect-stylus recipe was apparently available in OE-Classic) Signed-off-by: Niko Mauno <niko.ma...@vaisala.com> --- meta-oe/recipes-graphics/tslib/tslib_1.15.bb | 40 +++- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/meta-oe/recipes-graphics/tslib/tslib_1.15.bb b/meta-oe/recipes-graphics/tslib/tslib_1.15.bb index e87b411a8..7ae941a3c 100644 --- a/meta-oe/recipes-graphics/tslib/tslib_1.15.bb +++ b/meta-oe/recipes-graphics/tslib/tslib_1.15.bb @@ -5,10 +5,13 @@ Tslib is generally used on embedded devices to provide a common user \ space interface to touchscreen functionality." HOMEPAGE = "http://tslib.org/; -AUTHOR = "Russell King w/ plugins by Chris Larson et. al." +AUTHOR = "Martin Kepplinger <mart...@posteo.de>" SECTION = "base" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=fc178bcd425090939a8b634d1d6a9594" +LICENSE = "LGPLv2+ & GPLv2+" +LIC_FILES_CHKSUM = "\ +file://COPYING;md5=fc178bcd425090939a8b634d1d6a9594 \ +file://tests/COPYING;md5=a23a74b3f4caf9616230789d94217acb \ +" SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \ file://ts.conf \ @@ -21,7 +24,33 @@ UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases; inherit autotools pkgconfig -EXTRA_OECONF = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00" +PACKAGECONFIG ??= "debounce dejitter iir linear median pthres skip lowpass invert variance input touchkit waveshare" +PACKAGECONFIG[debounce] = "--enable-debounce,--disable-debounce" +PACKAGECONFIG[dejitter] = "--enable-dejitter,--disable-dejitter" +PACKAGECONFIG[iir] = "--enable-iir,--disable-iir" +PACKAGECONFIG[linear] = "--enable-linear,--disable-linear" +PACKAGECONFIG[median] = "--enable-median,--disable-median" +PACKAGECONFIG[pthres] = "--enable-pthres,--disable-pthres" +PACKAGECONFIG[skip] = "--enable-skip,--disable-skip" +PACKAGECONFIG[lowpass] = "--enable-lowpass,--disable-lowpass" +PACKAGECONFIG[invert] = "--enable-invert,--disable-invert" +PACKAGECONFIG[variance] = "--enable-variance,--disable-variance" +PACKAGECONFIG[input] = "--enable-input,--disable-input" +PACKAGECONFIG[tatung] = "--enable-tatung,--disable-tatung" +PACKAGECONFIG[touchkit] = "--enable-touchkit,--disable-touchkit" +PACKAGECONFIG[waveshare] = "--enable-waveshare,--disable-waveshare" +PACKAGECONFIG[ucb1x00] = "--enable-ucb1x00,--disable-ucb1x00" +PACKAGECONFIG[mk712] = "--enable-mk712,--disable-mk712" +PACKAGECONFIG[h3600] = "--enable-h3600,--disable-h3600" +PACKAGECONFIG[dmc] = "--enable-dmc,--disable-dmc" +PACKAGECONFIG[linear-h2200] = "--enable-linear-h2200,--disable-linear-h2200" +PACKAGECONFIG[corgi] = "--enable-corgi,--disable-corgi" +PACKAGECONFIG[collie] = "--enable-collie,--disable-collie" +PACKAGECONFIG[arctic2] = "--enable-arctic2,--disable-arctic2" +PACKAGECONFIG[dmc_dus3000] = "--enable-dmc_dus3000,--disable-dmc_dus3000" +PACKAGECONFIG[cy8mrln-palmpre] = "--enable-cy8mrln-palmpre,--disable-cy8mrln-palmpre" +PACKAGECONFIG[galax] = "--enable-galax,--disable-galax" +PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" do_install_prepend() { install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf @@ -32,9 +61,6 @@ do_install_append() { install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ } -# People should consider using udev's /dev/input/touchscreen0 symlink -# instead of detect-stylus -#RDEPENDS_tslib-conf_weird-machine = "detect-stylus" RPROVIDES_tslib-conf = "libts-0.0-conf" PACKAGES =+ "tslib-conf tslib-tests tslib-calibrate tslib-uinput" -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] tslib: Align recipe content to better match v1.15
On 04/10/2018 01:22 AM, Khem Raj wrote: On 4/9/18 9:06 AM, Niko Mauno wrote: - dropped EXTRA_OECONF altogether as it contained just obsoleted or implied configure options Perhaps a set of packageconfigs would be desired. It may not be reflecting exact set as seen here but whatever knobs currently are available. Submitted v2 which introduces also PACKAGECONFIG -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] tslib: Align recipe content to better match v1.15
Respective changes to recipe: - updated AUTHOR field to match current author in tslib/AUTHORS file - updated LICENSE field to 'LGPLv2+ & GPLv2+' to reflect licenses in v1.15 (LGPLv2+ for shared library parts, GPLv2+ for command line utility parts) - updated LIC_FILES_CHECKSUM to contain COPYING files for both license families - dropped EXTRA_OECONF altogether as it contained just obsoleted or implied configure options - removed commented-out detect-stylus lines (a detect-stylus recipe was apparently available in OE-Classic) Signed-off-by: Niko Mauno <niko.ma...@vaisala.com> --- meta-oe/recipes-graphics/tslib/tslib_1.15.bb | 14 ++ 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-graphics/tslib/tslib_1.15.bb b/meta-oe/recipes-graphics/tslib/tslib_1.15.bb index e87b411a8..dca5506b6 100644 --- a/meta-oe/recipes-graphics/tslib/tslib_1.15.bb +++ b/meta-oe/recipes-graphics/tslib/tslib_1.15.bb @@ -5,10 +5,13 @@ Tslib is generally used on embedded devices to provide a common user \ space interface to touchscreen functionality." HOMEPAGE = "http://tslib.org/; -AUTHOR = "Russell King w/ plugins by Chris Larson et. al." +AUTHOR = "Martin Kepplinger <mart...@posteo.de>" SECTION = "base" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=fc178bcd425090939a8b634d1d6a9594" +LICENSE = "LGPLv2+ & GPLv2+" +LIC_FILES_CHKSUM = "\ +file://COPYING;md5=fc178bcd425090939a8b634d1d6a9594 \ +file://tests/COPYING;md5=a23a74b3f4caf9616230789d94217acb \ +" SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \ file://ts.conf \ @@ -21,8 +24,6 @@ UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases; inherit autotools pkgconfig -EXTRA_OECONF = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00" - do_install_prepend() { install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf } @@ -32,9 +33,6 @@ do_install_append() { install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ } -# People should consider using udev's /dev/input/touchscreen0 symlink -# instead of detect-stylus -#RDEPENDS_tslib-conf_weird-machine = "detect-stylus" RPROVIDES_tslib-conf = "libts-0.0-conf" PACKAGES =+ "tslib-conf tslib-tests tslib-calibrate tslib-uinput" -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qtwebengine: Fix typo in patch filename
Fixes fetcher failure due to typo in patch filename introduced in commit e8ec89bf1724836b054e8629e5ad90eb4fd97868 Signed-off-by: Niko Mauno <niko.ma...@vaisala.com> --- recipes-qt/qt5/qtwebengine_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index c36e345..9177b15 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -122,7 +122,7 @@ SRC_URI += " \ # 49-based.meta-qt5.1 SRC_URI += " \ file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch;patchdir=src/3rdparty \ - file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patchh;patchdir=src/3rdparty \ + file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \ " SRCREV_qtwebengine = "fad625e0ba39e855817bbf206ab9a846d07aeeec" -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel