[oe] [meta-networking][PATCH] drbd-utils: upgrade 9.10.0 -> 9.11.0
Signed-off-by: Zheng Ruoqin
---
.../drbd/{drbd-utils_9.10.0.bb => drbd-utils_9.11.0.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-networking/recipes-support/drbd/{drbd-utils_9.10.0.bb =>
drbd-utils_9.11.0.bb} (93%)
diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.10.0.bb
b/meta-networking/recipes-support/drbd/drbd-utils_9.11.0.bb
similarity index 93%
rename from meta-networking/recipes-support/drbd/drbd-utils_9.10.0.bb
rename to meta-networking/recipes-support/drbd/drbd-utils_9.11.0.bb
index 0e14ae7..286b0f6 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils_9.10.0.bb
+++ b/meta-networking/recipes-support/drbd/drbd-utils_9.11.0.bb
@@ -12,9 +12,9 @@ SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils
\
git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers
\
${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)}
\
"
-# v9.10.0
-SRCREV_drbd-utils = "859151b228d3b3aacefb09d06d515a2589c22e35"
-SRCREV_drbd-headers = "0955b3423f08f8e11ff05092bc1b766609fd804b"
+# v9.11.0
+SRCREV_drbd-utils = "63092751e76e1fba397e53df4be5c1161b83a223"
+SRCREV_drbd-headers = "d100ee01bf5aa8d5220767e4e35c4224faa8d865"
S = "${WORKDIR}/git"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python] [PATCH] python-bcrypt: upgrade 3.1.4 -> 3.1.7
Signed-off-by: Zang Ruochen
---
meta-python/recipes-devtools/python/python-bcrypt.inc | 4 ++--
.../python/{python-bcrypt_3.1.4.bb => python-bcrypt_3.1.7.bb} | 0
.../python/{python3-bcrypt_3.1.4.bb => python3-bcrypt_3.1.7.bb} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta-python/recipes-devtools/python/{python-bcrypt_3.1.4.bb =>
python-bcrypt_3.1.7.bb} (100%)
rename meta-python/recipes-devtools/python/{python3-bcrypt_3.1.4.bb =>
python3-bcrypt_3.1.7.bb} (100%)
diff --git a/meta-python/recipes-devtools/python/python-bcrypt.inc
b/meta-python/recipes-devtools/python/python-bcrypt.inc
index 4490969..a264003 100644
--- a/meta-python/recipes-devtools/python/python-bcrypt.inc
+++ b/meta-python/recipes-devtools/python/python-bcrypt.inc
@@ -4,8 +4,8 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=8f7bb094c7232b058c7e9f2e431f389c"
DEPENDS += "${PYTHON_PN}-cffi-native"
-SRC_URI[md5sum] = "8408abc974446e64862a9742104e97b6"
-SRC_URI[sha256sum] =
"67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d"
+SRC_URI[md5sum] = "5d6f93b575ce52470af37a8e7dce76fe"
+SRC_URI[sha256sum] =
"0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42"
inherit pypi
diff --git a/meta-python/recipes-devtools/python/python-bcrypt_3.1.4.bb
b/meta-python/recipes-devtools/python/python-bcrypt_3.1.7.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python-bcrypt_3.1.4.bb
rename to meta-python/recipes-devtools/python/python-bcrypt_3.1.7.bb
diff --git a/meta-python/recipes-devtools/python/python3-bcrypt_3.1.4.bb
b/meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python3-bcrypt_3.1.4.bb
rename to meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python] [PATCH] python-backports-ssl: upgrade 3.5.0.1 -> 3.7.0.1
Signed-off-by: Zang Ruochen
---
...hon-backports-ssl_3.5.0.1.bb => python-backports-ssl_3.7.0.1.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-python/recipes-devtools/python/{python-backports-ssl_3.5.0.1.bb =>
python-backports-ssl_3.7.0.1.bb} (79%)
diff --git
a/meta-python/recipes-devtools/python/python-backports-ssl_3.5.0.1.bb
b/meta-python/recipes-devtools/python/python-backports-ssl_3.7.0.1.bb
similarity index 79%
rename from meta-python/recipes-devtools/python/python-backports-ssl_3.5.0.1.bb
rename to meta-python/recipes-devtools/python/python-backports-ssl_3.7.0.1.bb
index 45492da..9032a7c 100644
--- a/meta-python/recipes-devtools/python/python-backports-ssl_3.5.0.1.bb
+++ b/meta-python/recipes-devtools/python/python-backports-ssl_3.7.0.1.bb
@@ -7,10 +7,10 @@ match_hostname() function for performing this check instead
of requiring every a
implement the check separately. This backport brings match_hostname() to users
of earlier versions of Python"
LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=95a5ee8fd779fbeca8b4cbca64433c87"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=b2adbe8bfdeb625c9a01afd9aaa66619"
-SRC_URI[md5sum] = "c03fc5e2c7b3da46b81acf5cbacfe1e6"
-SRC_URI[sha256sum] =
"502ad98707319f4a51fa2ca1c677bd659008d27ded9f6380c79e8932e38dcdf2"
+SRC_URI[md5sum] = "32d2f593af01a046bec3d2f5181a420a"
+SRC_URI[sha256sum] =
"bb82e60f9fbf4c080eabd957c39f0641f0fc247d9a16e31e26d594d8f42b9fd2"
PYPI_PACKAGE = "backports.ssl_match_hostname"
inherit pypi setuptools
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python] [PATCH] python-aws-iot-device-sdk-python: upgrade 1.4.0 -> 1.4.7
Signed-off-by: Zang Ruochen
---
.../recipes-devtools/python/python-aws-iot-device-sdk-python.inc | 4 ++--
...-sdk-python_1.4.0.bb => python-aws-iot-device-sdk-python_1.4.7.bb} | 0
...sdk-python_1.4.0.bb => python3-aws-iot-device-sdk-python_1.4.7.bb} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename
meta-python/recipes-devtools/python/{python-aws-iot-device-sdk-python_1.4.0.bb
=> python-aws-iot-device-sdk-python_1.4.7.bb} (100%)
rename
meta-python/recipes-devtools/python/{python3-aws-iot-device-sdk-python_1.4.0.bb
=> python3-aws-iot-device-sdk-python_1.4.7.bb} (100%)
diff --git
a/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc
b/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc
index 7423fa7..60493e1 100644
--- a/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc
+++ b/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "\
file://AWSIoTPythonSDK/core/protocol/paho/client.py;endline=14;md5=5a3c8a1a4bb71bd934f450ecff972ad9
\
"
-SRC_URI[md5sum] = "50a5c46410c2b44b5c09f1ea5eb15a3b"
-SRC_URI[sha256sum] =
"b3c8af3ce24eab861447a194f3c382509dd70e90452c86a5426f1e7272460177"
+SRC_URI[md5sum] = "2b3df629827d8bc18ca4d927b4885a17"
+SRC_URI[sha256sum] =
"7e67c8cfeee8a1c8fd251bcc418de9d4dca697753565c9a9e614525179d9555d"
inherit pypi
diff --git
a/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.4.0.bb
b/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.4.7.bb
similarity index 100%
rename from
meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.4.0.bb
rename to
meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.4.7.bb
diff --git
a/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.0.bb
b/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.7.bb
similarity index 100%
rename from
meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.0.bb
rename to
meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.7.bb
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python] [PATCH] python-astroid: upgrade 1.6.5 -> 2.3.2
-Add depends:pytest-runner-native.
Signed-off-by: Zang Ruochen
---
meta-python/recipes-devtools/python/python-astroid.inc | 6 --
.../python/{python-astroid_1.6.5.bb => python-astroid_2.3.2.bb} | 0
.../python/{python3-astroid_1.6.5.bb => python3-astroid_2.3.2.bb} | 0
3 files changed, 4 insertions(+), 2 deletions(-)
rename meta-python/recipes-devtools/python/{python-astroid_1.6.5.bb =>
python-astroid_2.3.2.bb} (100%)
rename meta-python/recipes-devtools/python/{python3-astroid_1.6.5.bb =>
python3-astroid_2.3.2.bb} (100%)
diff --git a/meta-python/recipes-devtools/python/python-astroid.inc
b/meta-python/recipes-devtools/python/python-astroid.inc
index fae0f13..171d320 100644
--- a/meta-python/recipes-devtools/python/python-astroid.inc
+++ b/meta-python/recipes-devtools/python/python-astroid.inc
@@ -4,11 +4,13 @@ SECTION = "devel/python"
LICENSE = "LGPL-2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-SRC_URI[md5sum] = "2dd01ef0d5b5f0fc754c1ba40137b61c"
-SRC_URI[sha256sum] =
"fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a"
+SRC_URI[md5sum] = "b2cd5c0383ff33c1410e737c2607aa7a"
+SRC_URI[sha256sum] =
"09a3fba616519311f1af8a461f804b68f0370e100c9264a035aa7846d7852e33"
inherit pypi
+DEPENDS += "${PYTHON_PN}-pytest-runner-native"
+
PACKAGES =+ "${PN}-tests"
FILES_${PN}-tests += " \
diff --git a/meta-python/recipes-devtools/python/python-astroid_1.6.5.bb
b/meta-python/recipes-devtools/python/python-astroid_2.3.2.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python-astroid_1.6.5.bb
rename to meta-python/recipes-devtools/python/python-astroid_2.3.2.bb
diff --git a/meta-python/recipes-devtools/python/python3-astroid_1.6.5.bb
b/meta-python/recipes-devtools/python/python3-astroid_2.3.2.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python3-astroid_1.6.5.bb
rename to meta-python/recipes-devtools/python/python3-astroid_2.3.2.bb
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python] [PATCH] python-pytun: upgrade 2.2.1 -> 2.3.0
Signed-off-by: Zang Ruochen
---
meta-python/recipes-connectivity/python-pytun/python-pytun.inc| 4 ++--
.../python-pytun/{python-pytun_2.2.1.bb => python-pytun_2.3.0.bb} | 0
.../python-pytun/{python3-pytun_2.2.1.bb => python3-pytun_2.3.0.bb} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta-python/recipes-connectivity/python-pytun/{python-pytun_2.2.1.bb =>
python-pytun_2.3.0.bb} (100%)
rename meta-python/recipes-connectivity/python-pytun/{python3-pytun_2.2.1.bb
=> python3-pytun_2.3.0.bb} (100%)
diff --git a/meta-python/recipes-connectivity/python-pytun/python-pytun.inc
b/meta-python/recipes-connectivity/python-pytun/python-pytun.inc
index 79a8bfb..3991a83 100644
--- a/meta-python/recipes-connectivity/python-pytun/python-pytun.inc
+++ b/meta-python/recipes-connectivity/python-pytun/python-pytun.inc
@@ -2,8 +2,8 @@ SUMMARY = "Python TUN/TAP tunnel module"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=13f7629e8e4989b66b4a913ab05a91de"
-SRC_URI[md5sum] = "5b35b1cf80a02cca7ec72eb95d6b0192"
-SRC_URI[sha256sum] =
"07595dadf85f5176eb08c8d4d9ba5b862a180e96633f670f91437c47a1bead0d"
+SRC_URI[md5sum] = "adcaeea56d0ed06814487cdbde32d198"
+SRC_URI[sha256sum] =
"5ead86b3391acef239535ebcabeb04d2cdc6b40ab14580d28c6da193c2d1fe53"
PYPI_PACKAGE = "python-pytun"
diff --git
a/meta-python/recipes-connectivity/python-pytun/python-pytun_2.2.1.bb
b/meta-python/recipes-connectivity/python-pytun/python-pytun_2.3.0.bb
similarity index 100%
rename from meta-python/recipes-connectivity/python-pytun/python-pytun_2.2.1.bb
rename to meta-python/recipes-connectivity/python-pytun/python-pytun_2.3.0.bb
diff --git
a/meta-python/recipes-connectivity/python-pytun/python3-pytun_2.2.1.bb
b/meta-python/recipes-connectivity/python-pytun/python3-pytun_2.3.0.bb
similarity index 100%
rename from meta-python/recipes-connectivity/python-pytun/python3-pytun_2.2.1.bb
rename to meta-python/recipes-connectivity/python-pytun/python3-pytun_2.3.0.bb
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python] [PATCH] python-pyro4: upgrade 4.73 -> 4.77
Signed-off-by: Zang Ruochen
---
.../python-pyro4/{python-pyro4_4.73.bb => python-pyro4_4.77.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-python/recipes-connectivity/python-pyro4/{python-pyro4_4.73.bb =>
python-pyro4_4.77.bb} (70%)
diff --git a/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.73.bb
b/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.77.bb
similarity index 70%
rename from meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.73.bb
rename to meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.77.bb
index 88f5b18..738cf86 100644
--- a/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.73.bb
+++ b/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.77.bb
@@ -2,8 +2,8 @@ SUMMARY = "Python Remote Objects"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=cd13dafd4eeb0802bb6efea6b4a4bdbc"
-SRC_URI[md5sum] = "0375c061b93411feb86da01e801df888"
-SRC_URI[sha256sum] =
"536b07a097d0619e7ab1effa3747fda177a24168d17a07a93ca9ac30977608f7"
+SRC_URI[md5sum] = "21f015ae93cf9ea2bbbc418a2267e9fb"
+SRC_URI[sha256sum] =
"2bfe12a22f396474b0e57c898c7e2c561a8f850bf2055d8cf0f7119f0c7a523f"
PYPI_PACKAGE = "Pyro4"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] Build info in the spec file
Ok, thanks for the clarification. On Wed, Oct 23, 2019 at 3:38 PM Richard Purdie wrote: > > On Wed, 2019-10-23 at 14:00 -0700, Muminul Russell wrote: > > Hello Developers, > > > > Yocto can generate spec file for rpm packaging. But that spec file > > does not have %build and %install macro. Is there any work done > > already to include those 2 macros? Or could you give me hints how can > > I do that? > > OE uses its own cross building process. You can't encode that cross > building process into those macros. rpmbuild assumes native compiling. > People have tried and concluded its really not practical. > > Think about the fact that even if you did have something there, the > original process used to run the build would be different. That means > two different code paths, one of which will probably end up with > different results and hence be broken. > > So yes, I understand the desire but it really doesn't make sense. > > Cheers, > > Richard > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] Build info in the spec file
On Wed, 2019-10-23 at 14:00 -0700, Muminul Russell wrote: > Hello Developers, > > Yocto can generate spec file for rpm packaging. But that spec file > does not have %build and %install macro. Is there any work done > already to include those 2 macros? Or could you give me hints how can > I do that? OE uses its own cross building process. You can't encode that cross building process into those macros. rpmbuild assumes native compiling. People have tried and concluded its really not practical. Think about the fact that even if you did have something there, the original process used to run the build would be different. That means two different code paths, one of which will probably end up with different results and hence be broken. So yes, I understand the desire but it really doesn't make sense. Cheers, Richard -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 1/2] python3-astor: Upgrade 0.7.1->0.8.0
Signed-off-by: Richard Purdie
---
.../python/{python3-astor_0.7.1.bb => python3-astor_0.8.0.bb} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta-python/recipes-devtools/python/{python3-astor_0.7.1.bb =>
python3-astor_0.8.0.bb} (100%)
diff --git a/meta-python/recipes-devtools/python/python3-astor_0.7.1.bb
b/meta-python/recipes-devtools/python/python3-astor_0.8.0.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python3-astor_0.7.1.bb
rename to meta-python/recipes-devtools/python/python3-astor_0.8.0.bb
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 2/2] python3-astor: Fix issue with new version of setuptools
Signed-off-by: Richard Purdie --- .../python3-astor/fix-new-setuptools.patch | 18 ++ .../python/python3-astor_0.8.0.bb | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 meta-python/recipes-devtools/python/python3-astor/fix-new-setuptools.patch diff --git a/meta-python/recipes-devtools/python/python3-astor/fix-new-setuptools.patch b/meta-python/recipes-devtools/python/python3-astor/fix-new-setuptools.patch new file mode 100644 index 0..90defe25c --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-astor/fix-new-setuptools.patch @@ -0,0 +1,18 @@ +New versions of setuptools can't parse this expression. We know our python versions +match so just remove it until upstream fixes it. + +Signed-off-by: Richard Purdie +Upstream-Status: Pending + +Index: git/setup.cfg +=== +--- git.orig/setup.cfg git/setup.cfg +@@ -34,7 +34,6 @@ classifiers = + zip_safe = True + include_package_data = True + packages = find: +-python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.* + + [options.packages.find] + exclude = tests diff --git a/meta-python/recipes-devtools/python/python3-astor_0.8.0.bb b/meta-python/recipes-devtools/python/python3-astor_0.8.0.bb index c2dc9245c..97dbdbbea 100644 --- a/meta-python/recipes-devtools/python/python3-astor_0.8.0.bb +++ b/meta-python/recipes-devtools/python/python3-astor_0.8.0.bb @@ -4,7 +4,8 @@ SECTION = "devel/python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=561205fdabc3ec52cae2d30815b8ade7" -SRC_URI = "git://github.com/berkerpeksag/astor.git" +SRC_URI = "git://github.com/berkerpeksag/astor.git \ + file://fix-new-setuptools.patch" SRCREV ?= "4ca3a26e52f08678854c2841cd0fdf223461e47d" inherit setuptools3 -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] Build info in the spec file
Hello Developers, Yocto can generate spec file for rpm packaging. But that spec file does not have %build and %install macro. Is there any work done already to include those 2 macros? Or could you give me hints how can I do that? Thanks in advance, Russell -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] libiio: Disable python support for determism
Recent cmake changes in OE-Core mean python is now detected from
PATH. For determism, disable the python bindings to match
previous behaviour.
Signed-off-by: Richard Purdie
---
meta-oe/recipes-support/libiio/libiio_git.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-oe/recipes-support/libiio/libiio_git.bb
b/meta-oe/recipes-support/libiio/libiio_git.bb
index 4e57d5b77..63248b4e3 100644
--- a/meta-oe/recipes-support/libiio/libiio_git.bb
+++ b/meta-oe/recipes-support/libiio/libiio_git.bb
@@ -22,6 +22,7 @@ DEPENDS = " \
EXTRA_OECMAKE = " \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DUDEV_RULES_INSTALL_DIR=${nonarch_base_libdir}/udev/rules.d \
+-DPYTHON_BINDINGS=OFF \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DWITH_SYSTEMD=ON
-DSYSTEMD_UNIT_INSTALL_DIR=${systemd_system_unitdir}', '', d)} \
"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] protobuf-c: fix race condition
On Wed, Oct 23, 2019 at 08:50:10AM -0700, akuster808 wrote:
>
>
> On 10/22/19 2:37 PM, Martin Jansa wrote:
> > On Fri, Oct 18, 2019 at 09:06:54PM +0200, Martin Jansa wrote:
> >> One more data point is that it might be fixed completely with 1.3.2 version
> >> used in zeus/master and failing less often then without this patch in 1.3.1
> >> used in thud/warrior.
> >>
> >> I was rebuilding it 300 times in thud/warrior/zeus and got 5-6 failures in
> >> thud/warrior but none in zeus.
> >>
> >> I've started another for loop to rebuilt it 1000 time with zeus and if it
> >> works then I'll retest warrior and thud with 1.3.2 upgrade backported to
> >> them - if it works then we can either backport whole upgrade or check the
> >> 1.3.1 1.3.2 diff to find out what else we need to backport from there.
> > 1000 times in zeus = 0 failures
> > 100 times in thud with 1.3.2 backported ~ 10 failures
> > 1000 times in thud with 1.3.2 as well as protobuf-native 3.9.2 = 0 failures
> >
> > The protobuf-c upgrade isn't need to be backported to thud, there aren't
> > many changes:
> > https://github.com/protobuf-c/protobuf-c/compare/269771b4b45d3aba04e59569f5363db8d9ff...1390409f4ee4e26d0635310995b516eb702c3f9e
> >
> > protobuf on the other hand was upgraded from 3.6.1 to 3.9.2 in zeus and
> > the diff is big (1028 commits):
> > https://github.com/protocolbuffers/protobuf/compare/48cb18e5c419ddd23d9badcfe4e9df7bde1979b2...52b2447247f535663ac1c292e088b4b27d2910ef
> >
> > quick grep in git log didn't reveal what might be causing the race
> > condition, upgrading whole protobuf in warrior and thud isn't an option
> > as well.
> >
> > Anyone interested in digging a bit deeper?
> >
> > I don't want to block this change, because it seems to completely fix it
> > for zeus/master and partially improve it also for warrior and thud.
> >
> > We don't use protobuf much, so for our builds I think I'll just backport
> > whole protobuf upgrade to thud once protobuf-c fix is in thud.
>
> So is https://patchwork.openembedded.org/patch/165905/ still a go for
> warrior?
I think it is and for thud as well. Once there is a fix for protobuf as
well, it should be in separate follow-up change anyway.
with protobuf-c fix included I got 28 failures in 1000 rebuilds
without protobuf-c fix I got 5 failures in 308 rebuilds (still running)
so the rate seems similar if not the same (but there might be other
aspects like load on the build machine from other builds), before I was
seeing lower frequency of failures with this included.
Cheers,
> >> On Fri, Oct 18, 2019 at 11:07 AM Khem Raj wrote:
> >>
> >>> Yes I have seen same build failures on master even after this fix on
> >>> machine with more cpus so the fix while seems to address the problem is
> >>> not
> >>> fixing is completely when I get a chance I will look into the logic myself
> >>> too but I think we have to delve into it a bit More
> >>>
> >>> On Fri, Oct 18, 2019 at 3:41 AM Martin Jansa
> >>> wrote:
> >>>
> Hmm I spoke too soon, at least rebuilding protobuf-c-native with this
> change backported to thud still failed once with:
>
> ../git/t/generated-code2/cxx-generate-packed-data.cc:28:17: error: ‘foo’
> is
> not a namespace-name
> using namespace foo;
> ^~~
> ../git/t/generated-code2/cxx-generate-packed-data.cc:28:20: error:
> expected
> namespace-name before ‘;’ token
> using namespace foo;
> ^
> ../git/t/generated-code2/cxx-generate-packed-data.cc:31:36: error:
> ‘TestEnumSmall’ does not name a type
> #define TEST_ENUM_SMALL_TYPE_NAME TestEnumSmall
> ^
> ../git/t/generated-code2/common-test-arrays.h:44:1: note: in expansion of
> macro ‘TEST_ENUM_SMALL_TYPE_NAME’
> TEST_ENUM_SMALL_TYPE_NAME enum_small_0[] = { TEST_ENUM_SMALL(VALUE) };
> ^
> ../git/t/generated-code2/cxx-generate-packed-data.cc:31:36: error:
> ‘TestEnumSmall’ does not name a type
> #define TEST_ENUM_SMALL_TYPE_NAME TestEnumSmall
> ^
> ../git/t/generated-code2/common-test-arrays.h:45:1: note: in expansion of
> macro ‘TEST_ENUM_SMALL_TYPE_NAME’
> TEST_ENUM_SMALL_TYPE_NAME enum_small_1[] = {
> TEST_ENUM_SMALL(OTHER_VALUE)
> };
> ^
> ../git/t/generated-code2/cxx-generate-packed-data.cc:31:36: error:
> ‘TestEnumSmall’ does not name a type
> #define TEST_ENUM_SMALL_TYPE_NAME TestEnumSmall
> ^
> ../git/t/generated-code2/common-test-arrays.h:47:1: note: in expansion of
> macro ‘TEST_ENUM_SMALL_TYPE_NAME’
> TEST_ENUM_SMALL_TYPE_NAME enum_small_random[] =
>
> {T(0),T(1),T(1),T(0),T(0),T(1),T(1),T(1),T(0),T(0),T(0),T(0),T(0),T(1),T(1),T(1),T(1),T(1),T(1),T(0),T(1),T(1),T(0),T(1),T(1),T(0)
> };
> ^~
[oe] [warrior 09/10] tcpdump: upgrade 4.9.2 -> 4.9.3
From: Peiran Hong
This upgrade adds some new features and fixes numerous bugs including
the following CVEs:
CVE: CVE-2017-16808 (AoE)
CVE: CVE-2018-14468 (FrameRelay)
CVE: CVE-2018-14469 (IKEv1)
CVE: CVE-2018-14470 (BABEL)
CVE: CVE-2018-14466 (AFS/RX)
CVE: CVE-2018-14461 (LDP)
CVE: CVE-2018-14462 (ICMP)
CVE: CVE-2018-14465 (RSVP)
CVE: CVE-2018-14881 (BGP)
CVE: CVE-2018-14464 (LMP)
CVE: CVE-2018-14463 (VRRP)
CVE: CVE-2018-14467 (BGP)
CVE: CVE-2018-10103 (SMB - partially fixed, but SMB printing disabled)
CVE: CVE-2018-10105 (SMB - too unreliably reproduced,
SMB printing disabled)
CVE: CVE-2018-14880 (OSPF6)
CVE: CVE-2018-16451 (SMB)
CVE: CVE-2018-14882 (RPL)
CVE: CVE-2018-16227 (802.11)
CVE: CVE-2018-16229 (DCCP)
CVE: CVE-2018-16301 (was fixed in libpcap)
CVE: CVE-2018-16230 (BGP)
CVE: CVE-2018-16452 (SMB)
CVE: CVE-2018-16300 (BGP)
CVE: CVE-2018-16228 (HNCP)
CVE: CVE-2019-15166 (LMP)
CVE: CVE-2019-15167 (VRRP)
CVE: CVE-2018-14879 (tcpdump -V)
Deleted patch "0001-CVE-2017-16808-AoE-Add-a-missing-bounds-check.patch"
since the fix is included in the upgrade.
Modified patches "avoid-absolute-path-when-searching-for-libdlpi.patch",
"unnecessary-to-check-libpcap.patch", and "add-ptest.path" since
the upgrade renamed configure.in to configure.ac and made changes
to the file.
Added PACKAGECONFIG for smb. It is disabled by default in
the upgraded version in both the package's configure script and this
bitbake recipe since it is insecure.
Modified the parsing of ptest result to align with the new output
format.
With core-image-minimal on qemux86-64/kvm:
Recipe | Passed | Failed | Skipped | Time(s)
Before | 408 | 0| 2 | 4
After | 431 | 11 | 2 | 10
11 test failed after the upgrade since libpcap is not upgraded
alongside with tcpdump.
Signed-off-by: Peiran Hong
Signed-off-by: Khem Raj
(cherry picked from commit 71535e2f0ea76d39d2911e022905ec8ee9843872)
[Upgrade is a resonable path do to the # of patches needed to address
all this issues]
Signed-off-by: Armin Kuster
---
.../recipes-support/tcpdump/tcpdump/add-ptest.patch | 9 +
...oid-absolute-path-when-searching-for-libdlpi.patch | 19 ++-
.../recipes-support/tcpdump/tcpdump/run-ptest | 4 ++--
.../tcpdump/unnecessary-to-check-libpcap.patch| 15 ---
.../tcpdump/{tcpdump_4.9.2.bb => tcpdump_4.9.3.bb}| 12 +---
5 files changed, 34 insertions(+), 25 deletions(-)
rename meta-networking/recipes-support/tcpdump/{tcpdump_4.9.2.bb =>
tcpdump_4.9.3.bb} (74%)
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch
b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch
index b71435a..f8ff354 100644
--- a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch
+++ b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch
@@ -1,18 +1,19 @@
-From 8ee1ab1ac89557d48ac1ab7ddcc3c51be9b734ad Mon Sep 17 00:00:00 2001
+From 8c9c728757f89ebe6c4019114b83a63c63596f69 Mon Sep 17 00:00:00 2001
From: "Hongjun.Yang"
-Date: Wed, 22 Oct 2014 10:02:48 +0800
+Date: Wed, 2 Oct 2019 16:57:06 -0400
Subject: [PATCH] Add ptest for tcpdump
Upstream-Status: Pending
Signed-off-by: Hongjun.Yang
+Signed-off-by: Peiran Hong
---
Makefile.in | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
-index 0941f0e..3ce40c6 100644
+index 3b589184..7b10e38c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -437,9 +437,17 @@ distclean:
@@ -23,7 +24,7 @@ index 0941f0e..3ce40c6 100644
+buildtest-TESTS: tcpdump
+
+runtest-PTEST:
- (cd tests && ./TESTrun.sh)
+ (mkdir -p tests && SRCDIR=`cd ${srcdir}; pwd` && export SRCDIR &&
$$SRCDIR/tests/TESTrun.sh )
+install-ptest:
+ cp -r tests $(DESTDIR)
diff --git
a/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch
b/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch
index d82c160..977ab95 100644
---
a/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch
+++
b/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch
@@ -1,6 +1,6 @@
-From a2bfd28034d9aa48d8ff109c1314e53bc9779752 Mon Sep 17 00:00:00 2001
+From 02085028cdaf075943c27ebc02bb6de0289ec1d3 Mon Sep 17 00:00:00 2001
From: Andre McCurdy
-Date: Wed, 24 Oct 2018 22:26:08 -0700
+Date: Wed, 2 Oct 2019 16:43:48 -0400
Subject: [PATCH] avoid absolute path when searching for libdlpi
Let the build environment control library search paths.
@@ -8,15 +8,16 @@ Let the build environment control library search paths.
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Andre McCurdy
+Signed-off-by: Peiran Hong
---
- configure.in | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 inserti
[oe] [warrior 10/10] tcpdump: Delete unused patch
From: Peiran Hong
Delete patch "0001-CVE-2017-16808-AoE-Add-a-missing-bounds-check.patch"
since it is not used in the tcpdump recipe anymore.
Signed-off-by: Peiran Hong
Signed-off-by: Khem Raj
(cherry picked from commit 01b55a8a552d460acbe3673268733a78b47c5c03)
Signed-off-by: Armin Kuster
---
...2017-16808-AoE-Add-a-missing-bounds-check.patch | 61 --
1 file changed, 61 deletions(-)
delete mode 100644
meta-networking/recipes-support/tcpdump/tcpdump/0001-CVE-2017-16808-AoE-Add-a-missing-bounds-check.patch
diff --git
a/meta-networking/recipes-support/tcpdump/tcpdump/0001-CVE-2017-16808-AoE-Add-a-missing-bounds-check.patch
b/meta-networking/recipes-support/tcpdump/tcpdump/0001-CVE-2017-16808-AoE-Add-a-missing-bounds-check.patch
deleted file mode 100644
index 919f2b0..000
---
a/meta-networking/recipes-support/tcpdump/tcpdump/0001-CVE-2017-16808-AoE-Add-a-missing-bounds-check.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From c45443a0d3e16b92622bea6b589e5930e8f0d815 Mon Sep 17 00:00:00 2001
-From: Peiran Hong
-Date: Fri, 13 Sep 2019 17:02:57 -0400
-Subject: [PATCH] CVE-2017-16808/AoE: Add a missing bounds check.
-
- netdissect.h | 12
- print-aoe.c | 1 +
- 2 files changed, 13 insertions(+)
-
-diff --git a/netdissect.h b/netdissect.h
-index 089b0406..cd05fdb9 100644
a/netdissect.h
-+++ b/netdissect.h
-@@ -69,6 +69,11 @@ typedef struct {
- typedef unsigned char nd_uint8_t;
- typedef signed char nd_int8_t;
-
-+/*
-+ * Use this for MAC addresses.
-+ */
-+#define MAC_ADDR_LEN6 /* length of MAC addresses */
-+
- /* snprintf et al */
-
- #include
-@@ -309,12 +314,19 @@ struct netdissect_options {
- ((uintptr_t)ndo->ndo_snapend - (l) <= (uintptr_t)ndo->ndo_snapend && \
- (uintptr_t)&(var) <= (uintptr_t)ndo->ndo_snapend - (l)))
-
-+#define ND_TTEST_LEN(p, l) \
-+ (IS_NOT_NEGATIVE(l) && \
-+((uintptr_t)ndo->ndo_snapend - (l) <= (uintptr_t)ndo->ndo_snapend && \
-+ (uintptr_t)(p) <= (uintptr_t)ndo->ndo_snapend - (l)))
-+
- /* True if "var" was captured */
- #define ND_TTEST(var) ND_TTEST2(var, sizeof(var))
-
- /* Bail if "l" bytes of "var" were not captured */
- #define ND_TCHECK2(var, l) if (!ND_TTEST2(var, l)) goto trunc
-
-+#define ND_TCHECK_LEN(p, l) if (!ND_TTEST_LEN(p, l)) goto trunc
-+
- /* Bail if "var" was not captured */
- #define ND_TCHECK(var) ND_TCHECK2(var, sizeof(var))
-
-diff --git a/print-aoe.c b/print-aoe.c
-index 97e93df2..ac097a04 100644
a/print-aoe.c
-+++ b/print-aoe.c
-@@ -325,6 +325,7 @@ aoev1_reserve_print(netdissect_options *ndo,
- goto invalid;
- /* addresses */
- for (i = 0; i < nmacs; i++) {
-+ ND_TCHECK_LEN(cp, MAC_ADDR_LEN);
- ND_PRINT((ndo, "\n\tEthernet Address %u: %s", i,
etheraddr_string(ndo, cp)));
- cp += ETHER_ADDR_LEN;
- }
---
-2.21.0
-
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [warrior 05/10] jsoncpp: add native BBCLASSEXTEND
From: Pavel Modilaynen
Extend to native builds, this is useful for unit tests.
Signed-off-by: Khem Raj
Signed-off-by: Armin Kuster
---
meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb
b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb
index 88e3320..97fc6c7 100644
--- a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb
+++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb
@@ -19,3 +19,5 @@ S = "${WORKDIR}/git"
inherit cmake
EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DJSONCPP_WITH_TESTS=OFF"
+
+BBCLASSEXTEND = "native"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [warrior 04/10] python3-twofish: Fix missing return statements in module stubs
From: Martin Jansa
* fixes build with -Werror=return-type
twofish.c: In function 'init_twofish':
twofish.c:45:1: error: control reaches end of non-void function
[-Werror=return-type]
45 | PyMODINIT_FUNC init_twofish(void) { }
| ^~
twofish.c: In function 'PyInit__twofish':
twofish.c:46:1: error: control reaches end of non-void function
[-Werror=return-type]
46 | PyMODINIT_FUNC PyInit__twofish(void) { }
| ^~
cc1: some warnings being treated as errors
Signed-off-by: Martin Jansa
Signed-off-by: Armin Kuster
---
...missing-return-statements-in-module-stubs.patch | 38 ++
.../python/python3-twofish_0.3.0.bb| 2 ++
2 files changed, 40 insertions(+)
create mode 100644
meta-python/recipes-devtools/python/python3-twofish/0001-Fix-missing-return-statements-in-module-stubs.patch
diff --git
a/meta-python/recipes-devtools/python/python3-twofish/0001-Fix-missing-return-statements-in-module-stubs.patch
b/meta-python/recipes-devtools/python/python3-twofish/0001-Fix-missing-return-statements-in-module-stubs.patch
new file mode 100644
index 000..c25b245
--- /dev/null
+++
b/meta-python/recipes-devtools/python/python3-twofish/0001-Fix-missing-return-statements-in-module-stubs.patch
@@ -0,0 +1,38 @@
+From 5704610f4b3aed5210e9c5b7c05ff8b5b2364c9c Mon Sep 17 00:00:00 2001
+From: Martin Jansa
+Date: Mon, 12 Aug 2019 08:18:21 +
+Subject: [PATCH] Fix missing return statements in module stubs
+
+* fixes build with -Werror=return-type
+ twofish.c: In function 'init_twofish':
+ twofish.c:45:1: error: control reaches end of non-void function
[-Werror=return-type]
+ 45 | PyMODINIT_FUNC init_twofish(void) { }
+| ^~
+ twofish.c: In function 'PyInit__twofish':
+ twofish.c:46:1: error: control reaches end of non-void function
[-Werror=return-type]
+ 46 | PyMODINIT_FUNC PyInit__twofish(void) { }
+| ^~
+ cc1: some warnings being treated as errors
+
+Signed-off-by: Martin Jansa
+
+Upstream-Status: Submitted [https://github.com/keybase/python-twofish/pull/6]
+---
+ twofish.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/twofish.c b/twofish.c
+index e324c34..d4487d8 100644
+--- a/twofish.c
b/twofish.c
+@@ -42,5 +42,5 @@ DL_EXPORT(void) exp_Twofish_decrypt(Twofish_key * xkey,
uint8_t c[16], uint8_t p
+ We need a stub init_twofish function so the module will link as a proper
module.
+ Do not import _twofish from python; it will not work since _twofish is not a
*real* module
+ */
+-PyMODINIT_FUNC init_twofish(void) { }
+-PyMODINIT_FUNC PyInit__twofish(void) { }
++PyMODINIT_FUNC init_twofish(void) { return NULL; }
++PyMODINIT_FUNC PyInit__twofish(void) { return NULL; }
+--
+2.17.1
+
diff --git a/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb
b/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb
index e593f6f..7b8eb2e 100644
--- a/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb
+++ b/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb
@@ -1,2 +1,4 @@
require python-twofish.inc
inherit setuptools3
+
+SRC_URI += "file://0001-Fix-missing-return-statements-in-module-stubs.patch"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [warrior 01/10] xfce4-panel: Draw icons/background properly when compositing is disabled
From: Andreas Müller
A similar patch was sent for master [1] but that was superseded by upgrade of
xfce4-panel 4.14.0 -> 4.14.1 [2]
[1]
http://lists.openembedded.org/pipermail/openembedded-devel/2019-September/201966.html
[2]
http://lists.openembedded.org/pipermail/openembedded-devel/2019-September/201986.html
Signed-off-by: Andreas Müller
Acked-by: Kai Kang
Signed-off-by: Armin Kuster
---
...y-Fix-icons-without-compositing-Bug-14577.patch | 80 ++
.../recipes-xfce/xfce4-panel/xfce4-panel_4.13.4.bb | 1 +
2 files changed, 81 insertions(+)
create mode 100644
meta-xfce/recipes-xfce/xfce4-panel/files/0002-systray-Fix-icons-without-compositing-Bug-14577.patch
diff --git
a/meta-xfce/recipes-xfce/xfce4-panel/files/0002-systray-Fix-icons-without-compositing-Bug-14577.patch
b/meta-xfce/recipes-xfce/xfce4-panel/files/0002-systray-Fix-icons-without-compositing-Bug-14577.patch
new file mode 100644
index 000..8fac5ad
--- /dev/null
+++
b/meta-xfce/recipes-xfce/xfce4-panel/files/0002-systray-Fix-icons-without-compositing-Bug-14577.patch
@@ -0,0 +1,80 @@
+From f6f70cce417fd2982c2ce6f01016ed01deb6a9ae Mon Sep 17 00:00:00 2001
+From: "Ivan A. Melnikov"
+Date: Mon, 23 Sep 2019 16:18:10 +0400
+Subject: [PATCH] systray: Fix icons without compositing (Bug #14577)
+
+Wrapper window uses RGBA visual when it's available;
+systray manager should try to do the same for
+the transparent or parent-relative background to work.
+
+That means that the manager and icons will work with
+RGBA visual even if the screen is not compositing; so
+we should always force-redraw the icons.
+
+Upstream-Status: Accepted [1]
+
+[1]
https://git.xfce.org/xfce/xfce4-panel/commit?id=f6f70cce417fd2982c2ce6f01016ed01deb6a9ae
+
+Refs: https://bugzilla.xfce.org/show_bug.cgi?id=14577
+Signed-off-by: Ivan A. Melnikov
+---
+ plugins/systray/systray-manager.c | 10 ++
+ plugins/systray/systray.c | 10 --
+ 2 files changed, 6 insertions(+), 14 deletions(-)
+
+diff --git a/plugins/systray/systray-manager.c
b/plugins/systray/systray-manager.c
+index 68836554..4915649c 100644
+--- a/plugins/systray/systray-manager.c
b/plugins/systray/systray-manager.c
+@@ -751,6 +751,7 @@ static void
+ systray_manager_set_visual (SystrayManager *manager)
+ {
+ GdkDisplay *display;
++ GdkVisual *visual;
+ Visual *xvisual;
+ Atom visual_atom;
+ gulong data[1];
+@@ -768,11 +769,12 @@ systray_manager_set_visual (SystrayManager *manager)
+ visual_atom = gdk_x11_get_xatom_by_name_for_display (display,
+ "_NET_SYSTEM_TRAY_VISUAL");
+
+- if (gdk_screen_is_composited (gtk_widget_get_screen (manager->invisible))
+- && (gdk_screen_get_rgba_visual (screen) != NULL))
++ visual = gdk_screen_get_rgba_visual (screen);
++ panel_debug (PANEL_DEBUG_SYSTRAY, "rgba visual is %p", visual);
++ if (visual != NULL)
+ {
+- /* get the rgba visual */
+- xvisual = GDK_VISUAL_XVISUAL (gdk_screen_get_rgba_visual (screen));
++ /* use the rgba visual */
++ xvisual = GDK_VISUAL_XVISUAL (visual);
+ }
+ else
+ {
+diff --git a/plugins/systray/systray.c b/plugins/systray/systray.c
+index 3fb9520c..beae1973 100644
+--- a/plugins/systray/systray.c
b/plugins/systray/systray.c
+@@ -728,19 +728,9 @@ systray_plugin_box_draw (GtkWidget *box,
+ gpointer user_data)
+ {
+ SystrayPlugin *plugin = XFCE_SYSTRAY_PLUGIN (user_data);
+- GdkScreen *screen;
+-
+ panel_return_if_fail (XFCE_IS_SYSTRAY_PLUGIN (plugin));
+ panel_return_if_fail (cr != NULL);
+
+- screen = gtk_widget_get_screen (GTK_WIDGET (plugin));
+-
+- if (G_LIKELY (screen != NULL))
+-{
+- if (!gdk_screen_is_composited (screen))
+-return;
+-}
+-
+ /* separately draw all the composed tray icons after gtk
+* handled the draw event */
+ gtk_container_foreach (GTK_CONTAINER (box),
+--
+2.21.0
+
diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.4.bb
b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.4.bb
index 18e054c..ecae873 100644
--- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.4.bb
+++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.4.bb
@@ -12,6 +12,7 @@ SRC_URI[md5sum] = "c0f132fed2110d37f351aadc9e80a034"
SRC_URI[sha256sum] =
"36ffd26ef7f5867c01ba310475b4358ff0e588cfd5599a266f0037a6c20052a1"
SRC_URI += " \
file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \
+file://0002-systray-Fix-icons-without-compositing-Bug-14577.patch \
"
python populate_packages_prepend() {
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [warrior 00/10] Patch review
Please review this series. Most of these where backport requests.
Aplogies for delay in processing, had build server issues.
The following changes since commit f4ccdf2bc3fe4f00778629088baab840c868e36b:
mariadb: update SRC_URI to use archive.mariadb.org (2019-10-09 11:26:58 -0700)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib stable/warrior-next
http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/warrior-next
Andreas Müller (3):
xfce4-panel: Draw icons/background properly when compositing is
disabled
polkit-group-rules: Fix error in do_rootfs for rpm package-manager
vlc: rework qt PACKAGECONFIG
Khem Raj (1):
xorg-fonts-100dpi: Change License Custom -> MIT
Martin Jansa (1):
python3-twofish: Fix missing return statements in module stubs
Pavel Modilaynen (1):
jsoncpp: add native BBCLASSEXTEND
Peiran Hong (2):
tcpdump: upgrade 4.9.2 -> 4.9.3
tcpdump: Delete unused patch
Peter Kjellerstedt (1):
kconfig-frontends: Retrieve the Git repository from GitLab
qi.c...@windriver.com (1):
protobuf-c: fix race condition
meta-multimedia/recipes-multimedia/vlc/vlc.inc | 24 ---
...2017-16808-AoE-Add-a-missing-bounds-check.patch | 61 -
.../tcpdump/tcpdump/add-ptest.patch| 9 +--
...-absolute-path-when-searching-for-libdlpi.patch | 19 ++---
.../recipes-support/tcpdump/tcpdump/run-ptest | 4 +-
.../tcpdump/unnecessary-to-check-libpcap.patch | 15 ++--
.../tcpdump/{tcpdump_4.9.2.bb => tcpdump_4.9.3.bb} | 12 +++-
meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb | 2 +
.../kconfig-frontends_4.11.0.1.bb | 4 +-
.../protobuf-c/0001-avoid-race-condition.patch | 36 ++
.../recipes-devtools/protobuf/protobuf-c_1.3.1.bb | 3 +-
.../recipes-extended/polkit/polkit-group-rule.inc | 2 +-
.../xorg-font/xorg-fonts-100dpi.bb | 2 +-
...missing-return-statements-in-module-stubs.patch | 38 ++
.../python/python3-twofish_0.3.0.bb| 2 +
...y-Fix-icons-without-compositing-Bug-14577.patch | 80 ++
.../recipes-xfce/xfce4-panel/xfce4-panel_4.13.4.bb | 1 +
17 files changed, 214 insertions(+), 100 deletions(-)
delete mode 100644
meta-networking/recipes-support/tcpdump/tcpdump/0001-CVE-2017-16808-AoE-Add-a-missing-bounds-check.patch
rename meta-networking/recipes-support/tcpdump/{tcpdump_4.9.2.bb =>
tcpdump_4.9.3.bb} (74%)
create mode 100644
meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
create mode 100644
meta-python/recipes-devtools/python/python3-twofish/0001-Fix-missing-return-statements-in-module-stubs.patch
create mode 100644
meta-xfce/recipes-xfce/xfce4-panel/files/0002-systray-Fix-icons-without-compositing-Bug-14577.patch
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [warrior 03/10] vlc: rework qt PACKAGECONFIG
From: Andreas Müller
* qt4 support is gone -> move to qt5
* while at it remove noop libtool copy
Signed-off-by: Andreas Müller
Signed-off-by: Khem Raj
(cherry picked from commit a086334bce809327a9ca6fe1006ae63861116349)
Signed-off-by: Armin Kuster
---
meta-multimedia/recipes-multimedia/vlc/vlc.inc | 24 +++-
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index e5102a3..0bedc5d 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -36,12 +36,17 @@ EXTRA_OECONF = "\
--enable-realrtsp \
--disable-libtar \
--enable-avcodec \
-ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
-ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \
-ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
+ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \
+ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/rcc \
+ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/uic \
"
-PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread
png ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+PACKAGECONFIG ?= " \
+live555 dc1394 dv1394 notify fontconfig freetype dvdread png \
+${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+"
+
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)}
PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
@@ -54,7 +59,7 @@ PACKAGECONFIG[opencv] =
"--enable-opencv,--disable-opencv,opencv"
PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex"
PACKAGECONFIG[gstreamer] =
"--enable-gst-decode,--disable-gst-decode,gstreamer1.0
gstreamer1.0-plugins-base gst-plugins-bad"
PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx"
-PACKAGECONFIG[qt4] = "--enable-qt,--disable-qt, qt4-x11-free"
+PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras
qtsvg"
PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp"
PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi"
PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba"
@@ -76,12 +81,13 @@ PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x
--disable-xcb, xcb-util
PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau"
-do_configure_prepend() {
-cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
-}
-
do_configure_append() {
sed -i -e
s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g
${B}/doltlibtool
+
+# moc needs support: precreate build paths
+for qtpath in adapters components/epg components/playlist components/sout
dialogs managers styles util/buttons; do
+mkdir -p "${B}/modules/gui/qt/$qtpath"
+done
}
# This recipe packages vlc as a library as well, so qt4 dependencies
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [warrior 02/10] polkit-group-rules: Fix error in do_rootfs for rpm package-manager
From: Andreas Müller
* An issue in meta-mortsgna was reported. Discussion is found at [1]
* We do similar in meta-gnome's gvfs for same reason [2]
* This is a bugfix which should apply and work for many release-branches
Fixes:
| Error: Transaction check error:
| file /etc/polkit-1/rules.d conflicts between attempted installs of
polkit-group-rule-datetime-1.0-r0.cortexa7t2hf_neon_vfpv4 and
polkit-0.115-r0.cortexa7t2hf_neon_vfpv4
[1] https://github.com/schnitzeltony/meta-mortsgna/issues/11
[2]
https://github.com/openembedded/meta-openembedded/blob/fd1a0c9210b162ccb147e933984c755d32899efc/meta-gnome/recipes-gnome/gvfs/gvfs_1.41.2.bb#L72
Signed-off-by: Andreas Müller
Signed-off-by: Khem Raj
(cherry picked from commit a47d38561249411449cc62ba878eb7c36916fe55)
Signed-off-by: Armin Kuster
---
meta-oe/recipes-extended/polkit/polkit-group-rule.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule.inc
b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc
index 06ab106..8ced8ab 100644
--- a/meta-oe/recipes-extended/polkit/polkit-group-rule.inc
+++ b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc
@@ -8,6 +8,6 @@ inherit useradd
do_install_prepend() {
install -m 700 -d ${D}${sysconfdir}/polkit-1/rules.d
-chown polkitd:polkitd ${D}${sysconfdir}/polkit-1/rules.d
+chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d
}
USERADD_PARAM_${PN}_prepend = "--system --no-create-home --user-group
--home-dir ${sysconfdir}/polkit-1 polkitd;"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [warrior 07/10] protobuf-c: fix race condition
From: "qi.c...@windriver.com"
Signed-off-by: Chen Qi
Signed-off-by: Khem Raj
Signed-off-by: Sinan Kaya
(cherry picked from commit 489d3b4b932ee8016d792341f8ea5836a9522cd4)
Signed-off-by: Martin Jansa
Signed-off-by: Armin Kuster
---
.../protobuf-c/0001-avoid-race-condition.patch | 36 ++
.../recipes-devtools/protobuf/protobuf-c_1.3.1.bb | 3 +-
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644
meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
diff --git
a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
new file mode 100644
index 000..4fc7703
--- /dev/null
+++
b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
@@ -0,0 +1,36 @@
+From 216e31260b618ec73862f9f5336597f391444dac Mon Sep 17 00:00:00 2001
+From: Chen Qi
+Date: Sun, 29 Sep 2019 17:20:42 +0800
+Subject: [PATCH] avoid race condition
+
+It's possible that the cxx-generate-packed-data.cc is compiled
+while the t/test-full.pb.h is being generated. This will result
+the following error.
+
+ DEBUG: ./t/test-full.pb.h:4:0: error: unterminated #ifndef
+ ./t/test-full.pb.h:4:0: error: unterminated #ifndef
+
+Add a dependency to avoid such problem.
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi
+---
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index b0cb065..1608ae0 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -156,6 +156,7 @@ noinst_PROGRAMS += \
+ t_generated_code2_cxx_generate_packed_data_SOURCES = \
+ t/generated-code2/cxx-generate-packed-data.cc \
+ t/test-full.pb.cc
++t/generated-code2/cxx-generate-packed-data.cc: t/test-full.pb.h
+ $(t_generated_code2_cxx_generate_packed_data_OBJECTS): t/test-full.pb.h
+ t_generated_code2_cxx_generate_packed_data_CXXFLAGS = \
+ $(AM_CXXFLAGS) \
+--
+2.17.1
+
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb
b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb
index 7ef0300..17f92f0 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb
@@ -15,7 +15,8 @@ DEPENDS = "protobuf-native protobuf"
PV .= "+git${SRCPV}"
SRCREV = "269771b4b45d3aba04e59569f5363db8d9ff"
-SRC_URI = "git://github.com/protobuf-c/protobuf-c.git"
+SRC_URI = "git://github.com/protobuf-c/protobuf-c.git \
+ file://0001-avoid-race-condition.patch"
S = "${WORKDIR}/git"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [warrior 08/10] xorg-fonts-100dpi: Change License Custom -> MIT
From: Khem Raj This is a meta package which collects a bunch of 100dpi font packages together which all are also under MIT license, Custom is not a known type moreover MIT is well suited for this recipe for compatibility Signed-off-by: Khem Raj (cherry picked from commit c95c94d689f3b4972db72f511a60bcef52b8080d) Signed-off-by: Armin Kuster --- meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb b/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb index 45e3f7b..ae97040 100644 --- a/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb +++ b/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb @@ -1,5 +1,5 @@ SUMMARY = "Xorg 100 DPI font set" -LICENSE = "Custom" +LICENSE = "MIT" inherit packagegroup distro_features_check # rdepends on font recipes with this restriction -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [warrior 06/10] kconfig-frontends: Retrieve the Git repository from GitLab
From: Peter Kjellerstedt
The ymorin.is-a-geek.org site has been down since September and there
is no indication of when, if ever, it will be back. Retrieve the
repository from GitLab instead, recommended by the maintainer, Yann E
Morin.
Signed-off-by: Peter Kjellerstedt
Signed-off-by: Khem Raj
Signed-off-by: Armin Kuster
---
.../recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb
b/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb
index de9a6eb..fae80a7 100644
--- a/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb
+++ b/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb
@@ -7,13 +7,13 @@ the effort of keeping an up-to-date, out-of-tree, packaging
of the \
kconfig infrastructure, ready for use by third-party projects. \
The kconfig-frontends package provides the kconfig parser, as well as all \
the frontends"
-HOMEPAGE = "http://ymorin.is-a-geek.org/projects/kconfig-frontends";
+HOMEPAGE = "https://gitlab.com/ymorin/kconfig-frontends";
LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=9b8cf60ff39767ff04b671fca8302408"
SECTION = "devel"
DEPENDS += "ncurses flex bison gperf-native bison-native"
RDEPENDS_${PN} += "python3 bash"
-SRC_URI = "git://ymorin.is-a-geek.org/kconfig-frontends;branch=4.11.x \
+SRC_URI =
"git://gitlab.com/ymorin/kconfig-frontends.git;protocol=https;branch=4.11.x \
file://0001-Makefile-ensure-frontends-exits-before-writing-into-.patch \
file://0001-Switch-utils-kconfig-diff-to-use-Python-3.patch"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] protobuf-c: fix race condition
On 10/22/19 2:37 PM, Martin Jansa wrote:
> On Fri, Oct 18, 2019 at 09:06:54PM +0200, Martin Jansa wrote:
>> One more data point is that it might be fixed completely with 1.3.2 version
>> used in zeus/master and failing less often then without this patch in 1.3.1
>> used in thud/warrior.
>>
>> I was rebuilding it 300 times in thud/warrior/zeus and got 5-6 failures in
>> thud/warrior but none in zeus.
>>
>> I've started another for loop to rebuilt it 1000 time with zeus and if it
>> works then I'll retest warrior and thud with 1.3.2 upgrade backported to
>> them - if it works then we can either backport whole upgrade or check the
>> 1.3.1 1.3.2 diff to find out what else we need to backport from there.
> 1000 times in zeus = 0 failures
> 100 times in thud with 1.3.2 backported ~ 10 failures
> 1000 times in thud with 1.3.2 as well as protobuf-native 3.9.2 = 0 failures
>
> The protobuf-c upgrade isn't need to be backported to thud, there aren't
> many changes:
> https://github.com/protobuf-c/protobuf-c/compare/269771b4b45d3aba04e59569f5363db8d9ff...1390409f4ee4e26d0635310995b516eb702c3f9e
>
> protobuf on the other hand was upgraded from 3.6.1 to 3.9.2 in zeus and
> the diff is big (1028 commits):
> https://github.com/protocolbuffers/protobuf/compare/48cb18e5c419ddd23d9badcfe4e9df7bde1979b2...52b2447247f535663ac1c292e088b4b27d2910ef
>
> quick grep in git log didn't reveal what might be causing the race
> condition, upgrading whole protobuf in warrior and thud isn't an option
> as well.
>
> Anyone interested in digging a bit deeper?
>
> I don't want to block this change, because it seems to completely fix it
> for zeus/master and partially improve it also for warrior and thud.
>
> We don't use protobuf much, so for our builds I think I'll just backport
> whole protobuf upgrade to thud once protobuf-c fix is in thud.
So is https://patchwork.openembedded.org/patch/165905/ still a go for
warrior?
- armin
> Regards,
>
>> On Fri, Oct 18, 2019 at 11:07 AM Khem Raj wrote:
>>
>>> Yes I have seen same build failures on master even after this fix on
>>> machine with more cpus so the fix while seems to address the problem is not
>>> fixing is completely when I get a chance I will look into the logic myself
>>> too but I think we have to delve into it a bit More
>>>
>>> On Fri, Oct 18, 2019 at 3:41 AM Martin Jansa
>>> wrote:
>>>
Hmm I spoke too soon, at least rebuilding protobuf-c-native with this
change backported to thud still failed once with:
../git/t/generated-code2/cxx-generate-packed-data.cc:28:17: error: ‘foo’
is
not a namespace-name
using namespace foo;
^~~
../git/t/generated-code2/cxx-generate-packed-data.cc:28:20: error:
expected
namespace-name before ‘;’ token
using namespace foo;
^
../git/t/generated-code2/cxx-generate-packed-data.cc:31:36: error:
‘TestEnumSmall’ does not name a type
#define TEST_ENUM_SMALL_TYPE_NAME TestEnumSmall
^
../git/t/generated-code2/common-test-arrays.h:44:1: note: in expansion of
macro ‘TEST_ENUM_SMALL_TYPE_NAME’
TEST_ENUM_SMALL_TYPE_NAME enum_small_0[] = { TEST_ENUM_SMALL(VALUE) };
^
../git/t/generated-code2/cxx-generate-packed-data.cc:31:36: error:
‘TestEnumSmall’ does not name a type
#define TEST_ENUM_SMALL_TYPE_NAME TestEnumSmall
^
../git/t/generated-code2/common-test-arrays.h:45:1: note: in expansion of
macro ‘TEST_ENUM_SMALL_TYPE_NAME’
TEST_ENUM_SMALL_TYPE_NAME enum_small_1[] = { TEST_ENUM_SMALL(OTHER_VALUE)
};
^
../git/t/generated-code2/cxx-generate-packed-data.cc:31:36: error:
‘TestEnumSmall’ does not name a type
#define TEST_ENUM_SMALL_TYPE_NAME TestEnumSmall
^
../git/t/generated-code2/common-test-arrays.h:47:1: note: in expansion of
macro ‘TEST_ENUM_SMALL_TYPE_NAME’
TEST_ENUM_SMALL_TYPE_NAME enum_small_random[] =
{T(0),T(1),T(1),T(0),T(0),T(1),T(1),T(1),T(0),T(0),T(0),T(0),T(0),T(1),T(1),T(1),T(1),T(1),T(1),T(0),T(1),T(1),T(0),T(1),T(1),T(0)
};
^
...
so it probably doesn't fix the issue completely.
On Thu, Oct 17, 2019 at 10:44 PM Martin Jansa
wrote:
> On Sun, Sep 29, 2019 at 05:29:56PM +0800, Chen Qi wrote:
>> Signed-off-by: Chen Qi
>> ---
>> .../0001-avoid-race-condition.patch | 36
+++
>> .../protobuf/protobuf-c_1.3.2.bb | 1 +
>> 2 files changed, 37 insertions(+)
>> create mode 100644
meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
>> diff --git
a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-avoid-race-condition.patch
b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-av
[oe] [meta-oe][PATCH 08/10] libvpx: Clarify BSD license variant
The License of libvpx is BSD-3-Clause. Signed-off-by: Christophe Priouzeau --- meta-oe/recipes-multimedia/webm/libvpx_1.8.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.8.1.bb b/meta-oe/recipes-multimedia/webm/libvpx_1.8.1.bb index 70278ecca..006e73af4 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx_1.8.1.bb +++ b/meta-oe/recipes-multimedia/webm/libvpx_1.8.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The BSD-licensed libvpx reference implementation provides en- and HOMEPAGE = "http://www.webmproject.org/code/"; BUGTRACKER = "http://code.google.com/p/webm/issues/list"; SECTION = "libs/multimedia" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 10/10] testfloat: Clarify BSD license variant
The License of testfloat is BSD-3-Clause.
Signed-off-by: Christophe Priouzeau
---
meta-oe/recipes-test/testfloat/testfloat_3a.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-test/testfloat/testfloat_3a.bb
b/meta-oe/recipes-test/testfloat/testfloat_3a.bb
index 28e967762..ace376ef2 100644
--- a/meta-oe/recipes-test/testfloat/testfloat_3a.bb
+++ b/meta-oe/recipes-test/testfloat/testfloat_3a.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Berkeley TestFloat is a small collection of
programs for \
HOMEPAGE = "http://www.jhauser.us/arithmetic/TestFloat.html";
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM =
"file://TestFloat-${PV}/COPYING.txt;md5=e45c175a323b572fb6bd4b26eafc"
SRC_URI = "\
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 09/10] passwdqc: Clarify BSD license variant
The License of passwdqc is BSD-1-Clause.
---
meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb
b/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb
index 8fc0b3591..ed90352fc 100644
--- a/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb
+++ b/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb
@@ -24,7 +24,7 @@ DEPENDS += "libpam"
inherit distro_features_check
REQUIRED_DISTRO_FEATURES = "pam"
-LICENSE = "BSD"
+LICENSE = "BSD-1-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1b4af6f3d4ee079a38107366e93b334d"
SRC_URI = "http://www.openwall.com/${BPN}/${BP}.tar.gz \
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 07/10] wavpack: Clarify BSD license variant
The License of wavpack is BSD-3-Clause.
Signed-off-by: Christophe Priouzeau
---
meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb
b/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb
index cc5b84489..021496bd4 100644
--- a/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb
+++ b/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "WavPack is a completely open audio compression format providing
lossless, high-quality lossy, and a unique hybrid compression mode."
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://license.txt;md5=f596650807588c61fcab60bec8242df8"
SRC_URI = "http://wavpack.com/wavpack-${PV}.tar.bz2";
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 04/10] scsirastools: Clarify BSD license variant
The License of scsirastools is BSD-3-Clause. Signed-off-by: Christophe Priouzeau --- meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb b/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb index b922bb1f1..2b7571e23 100644 --- a/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb +++ b/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb @@ -5,7 +5,7 @@ DESCRIPTION = "scsirastools were designed to add to the Serviceability of \ maintenance or service functions. It handles SCSI, \ Linux SW RAID, SAS, SATA, and USB devices via SCSI emulation." HOMEPAGE = "http://scsirastools.sourceforge.net/"; -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=687ea108478d26152ae46eb29d9d1545" DEPENDS += "groff-native" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 05/10] libopus: Clarify BSD license variant
The License of libopus is BSD-3-Clause.
Signed-off-by: Christophe Priouzeau
---
meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb
b/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb
index 19ec12c88..29ef2fa44 100644
--- a/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb
+++ b/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb
@@ -5,7 +5,7 @@ designed by the IETF Codec Working Group and incorporates \
technology from Skype's SILK codec and Xiph.Org's CELT codec."
HOMEPAGE = "http://www.opus-codec.org/";
SECTION = "libs/multimedia"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=e304cdf74c2a1b0a33a5084c128a23a3"
SRC_URI = "http://downloads.xiph.org/releases/opus/opus-${PV}.tar.gz";
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 06/10] opus-tools: Clarify BSD license variant
The License of opus-tools is BSD-2-Clause.
Signed-off-by: Christophe Priouzeau
---
meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb
b/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb
index ff6311147..a84f2bf07 100644
--- a/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb
+++ b/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb
@@ -1,7 +1,7 @@
SUMMARY = "Opus Audio Tools"
HOMEPAGE = "http://www.opus-codec.org/";
-LICENSE = "BSD"
+LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=843a066da9f1facfcc6ea6f616ffecb1"
SRC_URI = "http://downloads.xiph.org/releases/opus/opus-tools-${PV}.tar.gz";
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 01/10] openwsman: Clarify BSD license variant
The License of openwsman is BSD-3-Clause.
Signed-off-by: Christophe Priouzeau
---
meta-oe/recipes-extended/openwsman/openwsman_2.6.9.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.6.9.bb
b/meta-oe/recipes-extended/openwsman/openwsman_2.6.9.bb
index e5bb0765f..f9292790c 100644
--- a/meta-oe/recipes-extended/openwsman/openwsman_2.6.9.bb
+++ b/meta-oe/recipes-extended/openwsman/openwsman_2.6.9.bb
@@ -26,7 +26,7 @@ SRC_URI = "git://github.com/Openwsman/openwsman.git \
S = "${WORKDIR}/git"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=d4f53d4c6cf73b9d43186ce3be6dd0ba"
inherit systemd cmake pkgconfig python3native perlnative
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 07/10] yasm: Clarify BSD license variant
The License of yasm is MIT. Signed-off-by: Christophe Priouzeau --- meta-oe/recipes-devtools/yasm/yasm_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/yasm/yasm_git.bb b/meta-oe/recipes-devtools/yasm/yasm_git.bb index b20d4c05c..dc4fbf7f5 100644 --- a/meta-oe/recipes-devtools/yasm/yasm_git.bb +++ b/meta-oe/recipes-devtools/yasm/yasm_git.bb @@ -1,5 +1,5 @@ SUMMARY = "x86 (SSE) assembler supporting NASM and GAS-syntaxes" -LICENSE = "BSD" +LICENSE = "MIT" HOMEPAGE = "http://www.tortall.net/projects/yasm/"; LIC_FILES_CHKSUM = "file://COPYING;md5=a12d8903508fb6bfd49d8d82c6170dd9" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 02/10] pmdk: Clarify BSD license variant
The License of pmdk is BSD-3-Clause. Signed-off-by: Christophe Priouzeau --- meta-oe/recipes-extended/pmdk/pmdk_1.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/pmdk/pmdk_1.7.bb b/meta-oe/recipes-extended/pmdk/pmdk_1.7.bb index 96da266e6..f5066da0d 100644 --- a/meta-oe/recipes-extended/pmdk/pmdk_1.7.bb +++ b/meta-oe/recipes-extended/pmdk/pmdk_1.7.bb @@ -2,7 +2,7 @@ SUMMARY = "Persistent Memory Development Kit" DESCRIPTION = "Persistent Memory Development Kit" HOMEPAGE = "http://pmem.io"; SECTION = "libs" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=7db1106255a1baa80391fd2e21eebab7" DEPENDS = "ndctl" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 10/10] liblogging: Clarify BSD license variant
The License of liblogging is BSD-2-Clause.
Signed-off-by: Christophe Priouzeau
---
meta-oe/recipes-extended/liblogging/liblogging_1.0.6.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/liblogging/liblogging_1.0.6.bb
b/meta-oe/recipes-extended/liblogging/liblogging_1.0.6.bb
index bb5984519..5c1c15159 100644
--- a/meta-oe/recipes-extended/liblogging/liblogging_1.0.6.bb
+++ b/meta-oe/recipes-extended/liblogging/liblogging_1.0.6.bb
@@ -8,7 +8,7 @@ sophisticated "behind the scenes" with better support for
multiple threads \
and flexibility for different log destinations (e.g. syslog and systemd \
journal)."
SECTION = "libs"
-LICENSE = "BSD"
+LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=63fe03535d83726f5655072502bef1bc"
SRC_URI = "http://download.rsyslog.com/${BPN}/${BPN}-${PV}.tar.gz";
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 08/10] cmpi binding: Clarify BSD license variant
The License of cmpi binding is BSD-3-Clause. Signed-off-by: Christophe Priouzeau --- meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb index 987c09fe5..251c5d0f5 100644 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb @@ -1,7 +1,7 @@ SUMMARY = "Adapter to write and run CMPI-type CIM providers" DESCRIPTION = "CMPI-compliant provider interface for various languages via SWIG" HOMEPAGE = "http://github.com/kkaempf/cmpi-bindings"; -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=b19ee058d2d5f69af45da98051d91064" SECTION = "Development/Libraries" DEPENDS = "swig-native python3 sblim-cmpi-devel" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 09/10] hwloc: Clarify BSD license variant
The License of hwloc is BSD-3-Clause.
Signed-off-by: Christophe Priouzeau
---
meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb
b/meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb
index 7231484fe..2b0dfe4ea 100644
--- a/meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb
+++ b/meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "The Portable Hardware Locality (hwloc) software
package \
architectures."
HOMEPAGE = "https://www.open-mpi.org/software/hwloc/";
SECTION = "base"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=3282e20dc3cec311deda3c6d4b1f990b"
SRC_URI =
"https://www.open-mpi.org/software/${BPN}/v1.11/downloads/${BP}.tar.bz2";
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 03/10] redis: Clarify BSD license variant
The License of redis is BSD-3-Clause. Signed-off-by: Christophe Priouzeau --- meta-oe/recipes-extended/redis/redis_4.0.14.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/redis/redis_4.0.14.bb b/meta-oe/recipes-extended/redis/redis_4.0.14.bb index 45ea29b70..7dc6f9711 100644 --- a/meta-oe/recipes-extended/redis/redis_4.0.14.bb +++ b/meta-oe/recipes-extended/redis/redis_4.0.14.bb @@ -2,7 +2,7 @@ SUMMARY = "Redis key-value store" DESCRIPTION = "Redis is an open source, advanced key-value store." HOMEPAGE = "http://redis.io"; SECTION = "libs" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=3c01b49fed4df1a79843688fa3f7b9d6" DEPENDS = "readline lua ncurses" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 06/10] mcpp: Clarify BSD license variant
The License of mcpp is BSD-2-Clause.
Signed-off-by: Christophe Priouzeau
---
meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb
b/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb
index a7163a35a..b5ca49566 100644
--- a/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb
+++ b/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb
@@ -1,6 +1,6 @@
SUMMARY = "MCPP is a portable C/C++ preprocessor"
HOMEPAGE = "http://mcpp.sourceforge.net/";
-LICENSE = "BSD"
+LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=5ca370b75ec890321888a00cea9bc1d5"
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 02/10] libnet: Clarify BSD license variant
The License of libnet is BSD-2-Clause. Signed-off-by: Christophe Priouzeau --- meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb b/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb index c9913444d..785abf66d 100644 --- a/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb +++ b/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb @@ -2,7 +2,7 @@ SUMMARY = "A packet dissection and creation library" # libnet at packetfactory.net is dead HOMEPAGE = "https://github.com/sam-github/libnet"; SECTION = "libs" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://doc/COPYING;md5=3ec839e00408b484d33b472a86b7c266" DEPENDS = "libpcap" # There are major API changes beween libnet v1.0 and libnet v1.1 -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 05/10] cscope: Clarify BSD license variant
The License of cscope is BSD-3-Clause. Signed-off-by: Christophe Priouzeau --- meta-oe/recipes-devtools/cscope/cscope_15.8b.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/cscope/cscope_15.8b.bb b/meta-oe/recipes-devtools/cscope/cscope_15.8b.bb index 8aa5947d0..199c31e15 100644 --- a/meta-oe/recipes-devtools/cscope/cscope_15.8b.bb +++ b/meta-oe/recipes-devtools/cscope/cscope_15.8b.bb @@ -11,7 +11,7 @@ DESCRIPTION = "Cscope is a developer's tool for browsing source code. \ HOMEPAGE = "http://cscope.sourceforge.net/"; -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=d4667b67b483823043fcffa489ea343b" inherit autotools -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 03/10] rfkill: Clarify BSD license variant
The License of rfkill is BSD-0-Clause.
Signed-off-by: Christophe Priouzeau
---
meta-oe/recipes-connectivity/rfkill/rfkill_0.5.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-connectivity/rfkill/rfkill_0.5.bb
b/meta-oe/recipes-connectivity/rfkill/rfkill_0.5.bb
index 3e644760c..5c19e65b0 100644
--- a/meta-oe/recipes-connectivity/rfkill/rfkill_0.5.bb
+++ b/meta-oe/recipes-connectivity/rfkill/rfkill_0.5.bb
@@ -1,7 +1,7 @@
SUMMARY = "Radio enable/disable command line utility"
HOMEPAGE = "http://linuxwireless.org/en/users/Documentation/rfkill";
SECTION = "base"
-LICENSE = "BSD"
+LICENSE = "BSD-0-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=c6036d0eb7edbfced28c4160e5d3fa94"
SRC_URI = "http://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.bz2 \
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 04/10] postgresql: Clarify BSD license variant
The License of postgresql is BSD-0-Clause. Signed-off-by: Christophe Priouzeau --- meta-oe/recipes-dbs/postgresql/postgresql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc index 0fe5d58e1..91d0275b3 100644 --- a/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-oe/recipes-dbs/postgresql/postgresql.inc @@ -18,7 +18,7 @@ DESCRIPTION = "\ this package if you're installing the postgresql-server package. \ " HOMEPAGE = "http://www.postgresql.com"; -LICENSE = "BSD" +LICENSE = "BSD-0-Clause" DEPENDS = "libnsl2 zlib readline tzcode-native" ARM_INSTRUCTION_SET = "arm" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 01/10] iperf3: Clarify BSD license variant
The License of iperf3 is BSD-3-Clause. Signed-off-by: Christophe Priouzeau --- meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb b/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb index d5296d733..98d2faabf 100644 --- a/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb +++ b/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://software.es.net/iperf/"; SECTION = "console/network" BUGTRACKER = "https://github.com/esnet/iperf/issues"; AUTHOR = "ESNET , Lawrence Berkeley National Laboratory " -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f9088fe7ffdccd042f7645f1012d7f70" DEPENDS = "openssl" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] open-vm-tools: Upgrade to 11.0.1
Drop backported patch available in 11.0 release
--disable-grabbitmqproxy is no longer a supported option
Signed-off-by: Khem Raj
---
...1-configure.ac-don-t-use-dnet-config.patch |8 +-
.../0009-Rename-poll.h-to-vm_poll.h.patch | 699 -
...c-Do-not-print-NULL-string-into-logs.patch | 10 +-
.../0014-Fix-new-warnings-from-gcc9.patch | 1281 -
...ools_10.3.5.bb => open-vm-tools_11.0.1.bb} |6 +-
5 files changed, 671 insertions(+), 1333 deletions(-)
delete mode 100644
meta-oe/recipes-support/open-vm-tools/open-vm-tools/0014-Fix-new-warnings-from-gcc9.patch
rename meta-oe/recipes-support/open-vm-tools/{open-vm-tools_10.3.5.bb =>
open-vm-tools_11.0.1.bb} (95%)
diff --git
a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch
b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch
index 0736572b3e..a711f5e5d2 100644
---
a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch
+++
b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch
@@ -14,11 +14,9 @@ Signed-off-by: Martin Kelly
open-vm-tools/configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
-index 325a39f5..713ea683 100644
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
-@@ -949,7 +949,7 @@ if test "$with_dnet" = "yes"; then
+@@ -937,7 +937,7 @@ if test "$with_dnet" = "yes"; then
AC_VMW_CHECK_LIB([dnet],
[DNET],
[],
@@ -27,11 +25,11 @@ index 325a39f5..713ea683 100644
[],
[dnet.h],
[intf_open],
-@@ -959,7 +959,7 @@ if test "$with_dnet" = "yes"; then
+@@ -947,7 +947,7 @@ if test "$with_dnet" = "yes"; then
if test $have_dnet = "no"; then
AC_MSG_ERROR(
-- [dnet-config was not found on your PATH. Please configure
without dnet (using --without-dnet) or install dnet -
http://libdnet.sourceforge.net])
+- [dnet-config was not found on your PATH. Please configure
without dnet or install dnet - http://libdnet.sourceforge.net])
+ [dnet was not found. Please configure without dnet (using
--without-dnet) or install dnet - http://libdnet.sourceforge.net])
fi
fi
diff --git
a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Rename-poll.h-to-vm_poll.h.patch
b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Rename-poll.h-to-vm_poll.h.patch
index 5c1aa7c40f..9cf54f6f44 100644
---
a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Rename-poll.h-to-vm_poll.h.patch
+++
b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Rename-poll.h-to-vm_poll.h.patch
@@ -19,8 +19,6 @@ Signed-off-by: Khem Raj
7 files changed, 7 insertions(+), 7 deletions(-)
rename open-vm-tools/lib/include/{poll.h => vm_poll.h} (99%)
-diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c
b/open-vm-tools/lib/asyncsocket/asyncsocket.c
-index b41aa29d..8691309d 100644
--- a/open-vm-tools/lib/asyncsocket/asyncsocket.c
+++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c
@@ -86,7 +86,7 @@
@@ -32,8 +30,6 @@ index b41aa29d..8691309d 100644
#include "log.h"
#include "err.h"
#include "hostinfo.h"
-diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c
b/open-vm-tools/lib/hgfsServer/hgfsServer.c
-index 7ea3b7f4..740c4fed 100644
--- a/open-vm-tools/lib/hgfsServer/hgfsServer.c
+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c
@@ -48,7 +48,7 @@
@@ -45,8 +41,6 @@ index 7ea3b7f4..740c4fed 100644
#include "mutexRankLib.h"
#include "vm_basic_asm.h"
#include "unicodeOperations.h"
-diff --git a/open-vm-tools/lib/include/asyncsocket.h
b/open-vm-tools/lib/include/asyncsocket.h
-index ec9b45aa..dc91e738 100644
--- a/open-vm-tools/lib/include/asyncsocket.h
+++ b/open-vm-tools/lib/include/asyncsocket.h
@@ -164,7 +164,7 @@ typedef struct AsyncSocket AsyncSocket;
@@ -58,8 +52,6 @@ index ec9b45aa..dc91e738 100644
struct IVmdbPoll;
typedef struct AsyncSocketPollParams {
int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */
-diff --git a/open-vm-tools/lib/include/pollImpl.h
b/open-vm-tools/lib/include/pollImpl.h
-index 46442e55..8bc66997 100644
--- a/open-vm-tools/lib/include/pollImpl.h
+++ b/open-vm-tools/lib/include/pollImpl.h
@@ -44,7 +44,7 @@
@@ -71,24 +63,672 @@ index 46442e55..8bc66997 100644
#include "vm_basic_asm.h"
#if defined(__cplusplus)
-diff --git a/open-vm-tools/lib/include/poll.h
b/open-vm-tools/lib/include/vm_poll.h
-similarity index 99%
-rename from open-vm-tools/lib/include/poll.h
-rename to open-vm-tools/lib/include/vm_poll.h
-index 6acd4f35..fbc88494 100644
--- a/open-vm-tools/lib/include/poll.h
-+++ b/open-vm-tools/lib/include/vm_poll.h
-@@ -60,7 +60,7 @@ exter
[oe] [meta-oe][PATCH] byacc: upgrade 20180510 -> 20190617
1) Update 0001-byacc-do-not-reorder-CC-and-CFLAGS.patch for new version.
2) Update LIC_FILES_CHKSUM for date has been changed from '2004-2017,2018' to
'2004-2018,2019'.
Signed-off-by: Zheng Ruoqin
---
.../0001-byacc-do-not-reorder-CC-and-CFLAGS.patch | 151 +++--
.../byacc/{byacc_20180510.bb => byacc_20190617.bb} | 6 +-
2 files changed, 139 insertions(+), 18 deletions(-)
rename meta-oe/recipes-extended/byacc/{byacc_20180510.bb => byacc_20190617.bb}
(58%)
diff --git
a/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch
b/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch
index 3bc0db9..24864ea 100644
---
a/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch
+++
b/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch
@@ -10,16 +10,18 @@ Upstream-Status: Inappropriate [OE Specific]
Signed-off-by: Chen Qi
+Update for 20190617.
+Signed-off-by: Zheng Ruoqin
---
aclocal.m4 | 1 -
- configure | 140 -
- 2 files changed, 141 deletions(-)
+ configure | 259 -
+ 2 files changed, 260 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
-index 0d14f26..0cefa08 100644
+index 338465f..3311057 100644
--- a/aclocal.m4
+++ b/aclocal.m4
-@@ -1038,7 +1038,6 @@ CF_GCC_VERSION
+@@ -1231,7 +1231,6 @@ CF_GCC_VERSION
CF_ACVERSION_CHECK(2.52,
[AC_PROG_CC_STDC],
[CF_ANSI_CC_REQD])
@@ -28,21 +30,140 @@ index 0d14f26..0cefa08 100644
dnl
---
dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19
diff --git a/configure b/configure
-index d27ae31..077c648 100755
+index ebb1f0f..a56cb17 100755
--- a/configure
+++ b/configure
-@@ -1946,146 +1946,6 @@ esac
+@@ -1957,265 +1957,6 @@ esac
# This should have been defined by AC_PROG_CC
: ${CC:=cc}
--echo "$as_me:1949: checking \$CC variable" >&5
+-echo "$as_me:1960: checking \$CFLAGS variable" >&5
+-echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+-case "x$CFLAGS" in
+-(*-[IUD]*)
+- echo "$as_me:1964: result: broken" >&5
+-echo "${ECHO_T}broken" >&6
+- { echo "$as_me:1966: WARNING: your environment uses the CFLAGS variable
to hold CPPFLAGS options" >&5
+-echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold
CPPFLAGS options" >&2;}
+- cf_flags="$CFLAGS"
+- CFLAGS=
+- for cf_arg in $cf_flags
+- do
+-
+-cf_fix_cppflags=no
+-cf_new_cflags=
+-cf_new_cppflags=
+-cf_new_extra_cppflags=
+-
+-for cf_add_cflags in $cf_arg
+-do
+-case $cf_fix_cppflags in
+-(no)
+- case $cf_add_cflags in
+- (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+- case $cf_add_cflags in
+- (-D*)
+- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e
's/^-D[^=]*='\''\"[^"]*//'`
+-
+- test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+- && test -z "${cf_tst_cflags}" \
+- && cf_fix_cppflags=yes
+-
+- if test $cf_fix_cppflags = yes ; then
+-
+- test -n "$cf_new_extra_cppflags" &&
cf_new_extra_cppflags="$cf_new_extra_cppflags "
+- cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+-
+- continue
+- elif test "${cf_tst_cflags}" = "\"'" ; then
+-
+- test -n "$cf_new_extra_cppflags" &&
cf_new_extra_cppflags="$cf_new_extra_cppflags "
+- cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+-
+- continue
+- fi
+- ;;
+- esac
+- case "$CPPFLAGS" in
+- (*$cf_add_cflags)
+- ;;
+- (*)
+- case $cf_add_cflags in
+- (-D*)
+- cf_tst_cppflags=`echo "x$cf_add_cflags" | sed
-e 's/^...//' -e 's/=.*//'`
+-
+-CPPFLAGS=`echo "$CPPFLAGS" | \
+- sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^]*\)\?[ ]/ /g' \
+- -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^]*\)\?$//g'`
+-
+- ;;
+- esac
+-
+- test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+- cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+-
+- ;;
+- esac
+- ;;
+- (*)
+-
+- test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+- cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+-
+- ;;
+- esac
+- ;;
+-(yes)
+-
+- test -n "$cf_new_extra_cppflags" &&
cf_new_extra_cppflags="$cf_new_extra_cppflags "
+- cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+-
+- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e
[oe] [meta-python][PATCH] python3-pyconnman: fix import issues with python3
release 0.1.0 of pyconnman is not using relative import so it
crashes when you try to load it with python3.
Add patch from upstream to make it work.
Signed-off-by: Nicola Lunghi
---
...ules-by-relative-path-for-python3-su.patch | 74 +++
.../python3-pyconnman_0.1.0.bb| 4 +
2 files changed, 78 insertions(+)
create mode 100644
meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman/0001-Import-local-modules-by-relative-path-for-python3-su.patch
diff --git
a/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman/0001-Import-local-modules-by-relative-path-for-python3-su.patch
b/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman/0001-Import-local-modules-by-relative-path-for-python3-su.patch
new file mode 100644
index 0..977b4aacd
--- /dev/null
+++
b/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman/0001-Import-local-modules-by-relative-path-for-python3-su.patch
@@ -0,0 +1,74 @@
+From 2e84adb042bfb742eb328220b97f79ddb28db44b Mon Sep 17 00:00:00 2001
+From: Haris Okanovic
+Date: Tue, 23 Oct 2018 21:39:56 +
+Subject: [PATCH] Import local modules by relative path for python3 support
+
+Upstream-Status: Submitted
+---
+ pyconnman/agent.py | 2 +-
+ pyconnman/interface.py | 2 +-
+ pyconnman/manager.py| 2 +-
+ pyconnman/service.py| 2 +-
+ pyconnman/technology.py | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/pyconnman/agent.py b/pyconnman/agent.py
+index f72de8d..453d783 100644
+--- a/pyconnman/agent.py
b/pyconnman/agent.py
+@@ -1,5 +1,5 @@
+ from __future__ import unicode_literals
+-from exceptions import ConnCanceledException
++from .exceptions import ConnCanceledException
+
+ import dbus.service
+
+diff --git a/pyconnman/interface.py b/pyconnman/interface.py
+index 7d82e04..d540c81 100644
+--- a/pyconnman/interface.py
b/pyconnman/interface.py
+@@ -4,7 +4,7 @@ import dbus
+ import types
+ import pprint
+
+-from exceptions import ConnSignalNameNotRecognisedException
++from .exceptions import ConnSignalNameNotRecognisedException
+
+
+ def translate_to_dbus_type(typeof, value):
+diff --git a/pyconnman/manager.py b/pyconnman/manager.py
+index f6f40a8..03244cc 100644
+--- a/pyconnman/manager.py
b/pyconnman/manager.py
+@@ -1,6 +1,6 @@
+ from __future__ import unicode_literals
+
+-from interface import ConnInterface
++from .interface import ConnInterface
+
+
+ class ConnManager(ConnInterface):
+diff --git a/pyconnman/service.py b/pyconnman/service.py
+index bbccced..c6b9241 100644
+--- a/pyconnman/service.py
b/pyconnman/service.py
+@@ -1,6 +1,6 @@
+ from __future__ import unicode_literals
+
+-from interface import ConnInterface
++from .interface import ConnInterface
+
+
+ class ConnService(ConnInterface):
+diff --git a/pyconnman/technology.py b/pyconnman/technology.py
+index 4777229..d25bad6 100644
+--- a/pyconnman/technology.py
b/pyconnman/technology.py
+@@ -1,6 +1,6 @@
+ from __future__ import unicode_literals
+
+-from interface import ConnInterface
++from .interface import ConnInterface
+
+
+ class ConnTechnology(ConnInterface):
diff --git
a/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.1.0.bb
b/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.1.0.bb
index e0f3fdd75..32bbe8b80 100644
---
a/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.1.0.bb
+++
b/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.1.0.bb
@@ -2,4 +2,8 @@ require python-pyconnman.inc
inherit setuptools3
+SRC_URI_append = " \
+file://0001-Import-local-modules-by-relative-path-for-python3-su.patch \
+"
+
RDEPENDS_${PN} += "python3-dbus python3-pprint"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
