Date   

[meta-python] [PATCH] python3-dominate: upgrade 2.6.0 -> 2.7.0

zhengruoqin
 

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@...>
---
.../{python3-dominate_2.6.0.bb => python3-dominate_2.7.0.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta-python/recipes-devtools/python/{python3-dominate_2.6.0.bb => python3-dominate_2.7.0.bb} (78%)

diff --git a/meta-python/recipes-devtools/python/python3-dominate_2.6.0.bb b/meta-python/recipes-devtools/python/python3-dominate_2.7.0.bb
similarity index 78%
rename from meta-python/recipes-devtools/python/python3-dominate_2.6.0.bb
rename to meta-python/recipes-devtools/python/python3-dominate_2.7.0.bb
index 8e17438262..bee89ed754 100644
--- a/meta-python/recipes-devtools/python/python3-dominate_2.6.0.bb
+++ b/meta-python/recipes-devtools/python/python3-dominate_2.7.0.bb
@@ -2,8 +2,7 @@ SUMMARY = "Dominate is a Python library for creating and manipulating HTML docum
LICENSE = "LGPL-3.0-only"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b52f2d57d10c4f7ee67a7eb9615d5d24"

-SRC_URI[md5sum] = "9f714324ca99eee98bb3c3cdbe838de6"
-SRC_URI[sha256sum] = "76ec2cde23700a6fc4fee098168b9dee43b99c2f1dd0ca6a711f683e8eb7e1e4"
+SRC_URI[sha256sum] = "520101360892ebf9d0553f67d37e359ff92403d8a1e33814030503088a05da49"

inherit pypi setuptools3 ptest

--
2.25.1


Re: [OE-core] Introducing yb - a new tool for Yocto environment setup/management

Chris Laplante
 

The bitbake-layers command is needed only to generate the layer config file
(in json format) out of an already existing yocto setup. It does not perform
the actual layer fetch/setup from the json. That's the feature I like the most
in my proposal: none of the other tools bootstrap the config file in this way,
you need to always write it by hand.

The actual layer setup (using the json) is performed by an independent, self-
contained python script (copied from a template in oe-core), which you can
place anywhere you want (e.g. in a product layer repo, or in a 'config stream
repo'), and which does not require an active yocto environment or a poky
checkout. The equivalant of 'yb sync' would be to pull that repo to get latest
revisions of the script and the json, then run the script pointing to an existing
checkout - it will sync everything to the revisions in json.
Ah, I misunderstood your approach then. That all makes sense and sounds very nice.

Chris


Re: [OE-core] Introducing yb - a new tool for Yocto environment setup/management

Alexander Kanavin
 

On Wed, 3 Aug 2022 at 23:02, Chris Laplante via lists.openembedded.org
<chris.laplante=agilent.com@...> wrote:
But IMHO bundling the layer setup tool inside bitbake itself feels a bit like the chicken-and-egg problem. I'd like my spec file (or JSON file, kas configuration file, whatever) to be a complete manifest of things to download. But with bitbake-layers, first I need to > know the right version of poky and where to get it. Also, I think it would be hard to implement 'yb sync'-like functionality there, specifically if we wanted to be able to change between poky branches.

Overall the thing I like about yb is that it is independent of Yocto/BitBake and easier to setup. Like an IDE, I can install it once and use it across multiple projects.
The bitbake-layers command is needed only to generate the layer config
file (in json format) out of an already existing yocto setup. It does
not perform the actual layer fetch/setup from the json. That's the
feature I like the most in my proposal: none of the other tools
bootstrap the config file in this way, you need to always write it by
hand.

The actual layer setup (using the json) is performed by an
independent, self-contained python script (copied from a template in
oe-core), which you can place anywhere you want (e.g. in a product
layer repo, or in a 'config stream repo'), and which does not require
an active yocto environment or a poky checkout. The equivalant of 'yb
sync' would be to pull that repo to get latest revisions of the script
and the json, then run the script pointing to an existing checkout -
it will sync everything to the revisions in json.

Alex


Re: [OE-core] Introducing yb - a new tool for Yocto environment setup/management

Chris Laplante
 

Hi Alex,

do you think any of these pieces could be moved to 'official yocto',
specifically as bitbake-layers subcommands? I read through the README, and
it seems that things like 'status' and 'run' would fit very well there.
I would agree that 'status' and 'run' would be useful additions, though I can't say I'll have time to volunteer to do it :(.

Also note that there's a proposal for a json schema and layer tooling that
would be provided directly in oe-core:
https://nam12.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.y
octoproject.org%2Fpoky-contrib%2Flog%2F%3Fh%3Dakanavin%2Fsetup-
layers&amp;data=05%7C01%7Cchris.laplante%40agilent.com%7C533ad5afc07
54a885d7808da75907dff%7Ca9c0bc098b46420693512ba12fb4a5c0%7C0%7C0
%7C637951560728773611%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjA
wMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C
%7C&amp;sdata=hN7QRlYqAPxigCSQfNlaCM7nWZ4vvSLv5IWzckYWAFU%3D
&amp;reserved=0
I saw that a few weeks ago and it is certainly good work :). (as are the other existing solutions, like kas, whisk, etc.)

But IMHO bundling the layer setup tool inside bitbake itself feels a bit like the chicken-and-egg problem. I'd like my spec file (or JSON file, kas configuration file, whatever) to be a complete manifest of things to download. But with bitbake-layers, first I need to know the right version of poky and where to get it. Also, I think it would be hard to implement 'yb sync'-like functionality there, specifically if we wanted to be able to change between poky branches.

Overall the thing I like about yb is that it is independent of Yocto/BitBake and easier to setup. Like an IDE, I can install it once and use it across multiple projects.

I can't help but say that there's a certain bit of irony in referring to
https://nam12.safelinks.protection.outlook.com/?url=https%3A%2F%2Fxkcd
.com%2F1987%2F&amp;data=05%7C01%7Cchris.laplante%40agilent.com%7C
533ad5afc0754a885d7808da75907dff%7Ca9c0bc098b46420693512ba12fb4a5c0
%7C0%7C0%7C637951560728773611%7CUnknown%7CTWFpbGZsb3d8eyJWIj
oiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3
000%7C%7C%7C&amp;sdata=uTq3p2HeA0Xfe3DMZ1fxkAxlHfOJNXM4za2XIC
v5OcA%3D&amp;reserved=0 - when introducing yet another external tool
for yocto layer management :-)
The irony is not lost on me :), especially given the layer setup tool conversation last month.

Chris


Re: [OE-core] Introducing yb - a new tool for Yocto environment setup/management

Alexander Kanavin
 

Hello Chris,

do you think any of these pieces could be moved to 'official yocto',
specifically as bitbake-layers subcommands? I read through the README,
and it seems that things like 'status' and 'run' would fit very well
there.

Also note that there's a proposal for a json schema and layer tooling
that would be provided directly in oe-core:
https://git.yoctoproject.org/poky-contrib/log/?h=akanavin/setup-layers

I can't help but say that there's a certain bit of irony in referring
to https://xkcd.com/1987/ - when introducing yet another external tool
for yocto layer management :-)

Alex

On Wed, 3 Aug 2022 at 22:21, Chris Laplante via lists.openembedded.org
<chris.laplante=agilent.com@...> wrote:

Hi all,



Today I’m excited to publish a tool I’ve been developing internally for about a year now. It is called ‘yb’, and you can think of it like a cross between kas, Google’s repo, and myrepos (mr).



Project page: https://github.com/Agilent/yb

Download it here: https://github.com/Agilent/yb/releases/tag/0.0.11



The tool is written in Rust. It is statically linked, so all you need to do is download the binary and put it somewhere in PATH.



The primary contribution I believe this tool makes is the ability to not only setup Yocto environments, but keep them in sync with the rest of your team as your product(s) evolve. This is realized via the ‘stream’ mechanism - a git repo that holds your specs (basically like kas’ configuration files). Most operations in yb automatically fetch updates to the active stream before doing anything. If you need to add or remove a layer from your build, just do it in the stream. Anyone using that stream will automatically get the update and be informed to update their environment.



I am also very proud of the ‘status’ command. It works even with vanilla Yocto environments (i.e. what you’re using today) as long as the tool can find “bitbake” on PATH. The “status” command will automatically do a ‘git fetch’ on each layer. When used along with streams/specs, it will also first check for updates to the stream.



I hope you can give it a try and let me know what you find useful/broken. It is still in relatively early development (in particular the ‘yb sync’ command) but it is already helpful for my teams’ day-to-day work.



(P.S. Please forgive the multi-mailing list post)



Thanks,

Chris




Introducing yb - a new tool for Yocto environment setup/management

Chris Laplante
 

Hi all,

 

Today I’m excited to publish a tool I’ve been developing internally for about a year now. It is called ‘yb’, and you can think of it like a cross between kas, Google’s repo, and myrepos (mr).

 

Project page: https://github.com/Agilent/yb

Download it here: https://github.com/Agilent/yb/releases/tag/0.0.11

 

The tool is written in Rust. It is statically linked, so all you need to do is download the binary and put it somewhere in PATH.

 

The primary contribution I believe this tool makes is the ability to not only setup Yocto environments, but keep them in sync with the rest of your team as your product(s) evolve. This is realized via the ‘stream’ mechanism - a git repo that holds your specs (basically like kas’ configuration files). Most operations in yb automatically fetch updates to the active stream before doing anything. If you need to add or remove a layer from your build, just do it in the stream. Anyone using that stream will automatically get the update and be informed to update their environment.

 

I am also very proud of the ‘status’ command. It works even with vanilla Yocto environments (i.e. what you’re using today) as long as the tool can find “bitbake” on PATH. The “status” command will automatically do a ‘git fetch’ on each layer. When used along with streams/specs, it will also first check for updates to the stream.

 

I hope you can give it a try and let me know what you find useful/broken. It is still in relatively early development (in particular the ‘yb sync’ command) but it is already helpful for my teams’ day-to-day work.

 

(P.S. Please forgive the multi-mailing list post)

 

Thanks,

Chris


[meta-python][PATCH 3/3] python3-matplotlib: bump to 3.5.2

Bartosz Golaszewski
 

There's a bug in 3.5.1 that makes importing matplotlib impossible in
some environments:

import matplotlib
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "/usr/lib/python3.10/site-packages/matplotlib/__init__.py", line 895, in <module>
defaultParams = rcsetup.defaultParams = {
File "/usr/lib/python3.10/site-packages/matplotlib/__init__.py", line 898, in <dictcomp>
rcParamsDefault[key]),
File "/usr/lib/python3.10/site-packages/matplotlib/__init__.py", line 674, in __getitem__
return dict.__getitem__(self, key)
KeyError: 'webagg.port'

This is fixed in 3.5.2.

Signed-off-by: Bartosz Golaszewski <brgl@...>
---
...{python3-matplotlib_3.5.1.bb => python3-matplotlib_3.5.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-matplotlib_3.5.1.bb => python3-matplotlib_3.5.2.bb} (96%)

diff --git a/meta-python/recipes-devtools/python/python3-matplotlib_3.5.1.bb b/meta-python/recipes-devtools/python/python3-matplotlib_3.5.2.bb
similarity index 96%
rename from meta-python/recipes-devtools/python/python3-matplotlib_3.5.1.bb
rename to meta-python/recipes-devtools/python/python3-matplotlib_3.5.2.bb
index e3e5d85eb..eaa144719 100644
--- a/meta-python/recipes-devtools/python/python3-matplotlib_3.5.1.bb
+++ b/meta-python/recipes-devtools/python/python3-matplotlib_3.5.2.bb
@@ -21,7 +21,7 @@ DEPENDS = "\
python3-certifi-native \
"

-SRC_URI[sha256sum] = "b2e9810e09c3a47b73ce9cab5a72243a1258f61e7900969097a817232246ce1c"
+SRC_URI[sha256sum] = "48cf850ce14fa18067f2d9e0d646763681948487a8080ec0af2686468b4607a2"

inherit pypi setuptools3 pkgconfig

--
2.34.1


[meta-python][PATCH 2/3] python3-matplotlib: add packaging to RDEPENDS

Bartosz Golaszewski
 

matplotlib needs python3-packaging at runtime. Add it to the package's
RDEPENDS.

Signed-off-by: Bartosz Golaszewski <brgl@...>
---
meta-python/recipes-devtools/python/python3-matplotlib_3.5.1.bb | 1 +
1 file changed, 1 insertion(+)

diff --git a/meta-python/recipes-devtools/python/python3-matplotlib_3.5.1.bb b/meta-python/recipes-devtools/python/python3-matplotlib_3.5.1.bb
index 7dfe46f3c..e3e5d85eb 100644
--- a/meta-python/recipes-devtools/python/python3-matplotlib_3.5.1.bb
+++ b/meta-python/recipes-devtools/python/python3-matplotlib_3.5.1.bb
@@ -51,6 +51,7 @@ RDEPENDS:${PN} = "\
python3-kiwisolver \
python3-pytz \
python3-pillow \
+ python3-packaging \
"

ENABLELTO:toolchain-clang:riscv64 = "echo enable_lto = False >> ${S}/mplsetup.cfg"
--
2.34.1


[meta-python][PATCH 1/3] python3-matplotlib: don't use PYTHON_PN

Bartosz Golaszewski
 

We only support python3 so using PYTHON_PN is redundant.

Signed-off-by: Bartosz Golaszewski <brgl@...>
---
.../python/python3-matplotlib_3.5.1.bb | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/meta-python/recipes-devtools/python/python3-matplotlib_3.5.1.bb b/meta-python/recipes-devtools/python/python3-matplotlib_3.5.1.bb
index cd05b455d..7dfe46f3c 100644
--- a/meta-python/recipes-devtools/python/python3-matplotlib_3.5.1.bb
+++ b/meta-python/recipes-devtools/python/python3-matplotlib_3.5.1.bb
@@ -14,11 +14,11 @@ LIC_FILES_CHKSUM = "\
DEPENDS = "\
freetype \
libpng \
- ${PYTHON_PN}-numpy-native \
- ${PYTHON_PN}-pip-native \
- ${PYTHON_PN}-dateutil-native \
- ${PYTHON_PN}-pytz-native \
- ${PYTHON_PN}-certifi-native \
+ python3-numpy-native \
+ python3-pip-native \
+ python3-dateutil-native \
+ python3-pytz-native \
+ python3-certifi-native \
"

SRC_URI[sha256sum] = "b2e9810e09c3a47b73ce9cab5a72243a1258f61e7900969097a817232246ce1c"
@@ -44,13 +44,13 @@ LDFLAGS:remove:toolchain-clang:mips = "-fuse-ld=lld"
RDEPENDS:${PN} = "\
freetype \
libpng \
- ${PYTHON_PN}-numpy \
- ${PYTHON_PN}-pyparsing \
- ${PYTHON_PN}-cycler \
- ${PYTHON_PN}-dateutil \
- ${PYTHON_PN}-kiwisolver \
- ${PYTHON_PN}-pytz \
- ${PYTHON_PN}-pillow \
+ python3-numpy \
+ python3-pyparsing \
+ python3-cycler \
+ python3-dateutil \
+ python3-kiwisolver \
+ python3-pytz \
+ python3-pillow \
"

ENABLELTO:toolchain-clang:riscv64 = "echo enable_lto = False >> ${S}/mplsetup.cfg"
--
2.34.1


[meta-networking][PATCH] freeradius: Fix buildpaths issue

Yu, Mingli
 

From: Mingli Yu <mingli.yu@...>

Fixes:
WARNING: freeradius-3.0.21-r0 do_package_qa: QA Issue: File /usr/bin/radeapclient in package freeradius-utils contains reference to TMPDIR [buildpaths]
WARNING: freeradius-3.0.21-r0 do_package_qa: QA Issue: File /usr/lib/libfreeradius-server.so.0.0.0 in package freeradius contains reference to TMPDIR [buildpaths]

Signed-off-by: Mingli Yu <mingli.yu@...>
---
...01-version.c-don-t-print-build-flags.patch | 41 +++++++++++++++++++
.../freeradius/freeradius_3.0.21.bb | 1 +
2 files changed, 42 insertions(+)
create mode 100644 meta-networking/recipes-connectivity/freeradius/files/0001-version.c-don-t-print-build-flags.patch

diff --git a/meta-networking/recipes-connectivity/freeradius/files/0001-version.c-don-t-print-build-flags.patch b/meta-networking/recipes-connectivity/freeradius/files/0001-version.c-don-t-print-build-flags.patch
new file mode 100644
index 000000000..697205efe
--- /dev/null
+++ b/meta-networking/recipes-connectivity/freeradius/files/0001-version.c-don-t-print-build-flags.patch
@@ -0,0 +1,41 @@
+From cbc64dcf6aa2a1be63f45ea6dd7d2c49b70a0bee Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@...>
+Date: Wed, 3 Aug 2022 16:44:29 +0800
+Subject: [PATCH] version.c: don't print build flags
+
+Don't print the build flags to avoid collecting the build environment info.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Mingli Yu <mingli.yu@...>
+---
+ src/main/version.c | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/src/main/version.c b/src/main/version.c
+index 62972d9f53..cf81de72c9 100644
+--- a/src/main/version.c
++++ b/src/main/version.c
+@@ -589,19 +589,6 @@ void version_print(void)
+ DEBUG2(" unknown");
+ #endif
+
+- DEBUG2("Compilation flags:");
+-#ifdef BUILT_WITH_CPPFLAGS
+- DEBUG2(" cppflags : " BUILT_WITH_CPPFLAGS);
+-#endif
+-#ifdef BUILT_WITH_CFLAGS
+- DEBUG2(" cflags : " BUILT_WITH_CFLAGS);
+-#endif
+-#ifdef BUILT_WITH_LDFLAGS
+- DEBUG2(" ldflags : " BUILT_WITH_LDFLAGS);
+-#endif
+-#ifdef BUILT_WITH_LIBS
+- DEBUG2(" libs : " BUILT_WITH_LIBS);
+-#endif
+ DEBUG2(" ");
+ }
+ INFO("FreeRADIUS Version " RADIUSD_VERSION_STRING);
+--
+2.25.1
+
diff --git a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb b/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb
index d6477e340..1407b798b 100644
--- a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb
+++ b/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb
@@ -32,6 +32,7 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x;lfs=0
file://radiusd.service \
file://radiusd-volatiles.conf \
file://check-openssl-cmds-in-script-bootstrap.patch \
+ file://0001-version.c-don-t-print-build-flags.patch \
"

raddbdir="${sysconfdir}/${MLPREFIX}raddb"
--
2.25.1


[meta-oe][PATCH] imagemagick: add PACKAGECONFIG for C++ bindings

Bartosz Golaszewski
 

Add a new PACKAGECONFIG switch for building C++ bindings for
imagemagick.

Signed-off-by: Bartosz Golaszewski <brgl@...>
---
meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb | 1 +
1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb
index b8167f5a7..010288b0d 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb
@@ -24,6 +24,7 @@ EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --disable

CACHED_CONFIGUREVARS = "ac_cv_sys_file_offset_bits=yes"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+PACKAGECONFIG[cxx] = "--with-magick-plus-plus,--without-magick-plus-plus"
PACKAGECONFIG[graphviz] = "--with-gvc,--without-gvc,graphviz"
PACKAGECONFIG[jp2] = "--with-jp2,,jasper"
PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz"
--
2.34.1


Re: [meta-python][PATCH v2] python3-pystemd: Upgrade 0.8.0 -> 0.10.0:

Khem Raj
 


We usually do not do major version upgrade in release branches I will let Armin chime in as well

On Wed, Aug 3, 2022 at 8:01 AM SCHNEIDER Johannes <johannes.schneider@...> wrote:
Hi,


and thanks for merging my patch into meta-openembedded:master (-:

since I observed these issues while running a kirkstone based system - and others will likely run into them as well - could you also put these changes on the kirkstone branch?


thanks and regards

From: openembedded-devel@... <openembedded-devel@...> on behalf of Johannes Schneider via lists.openembedded.org <johannes.schneider=leica-geosystems.com@...>
Sent: Thursday, July 28, 2022 05:56
To: openembedded-devel@... <openembedded-devel@...>
Cc: SCHNEIDER Johannes <johannes.schneider@...>
Subject: [oe] [meta-python][PATCH v2] python3-pystemd: Upgrade 0.8.0 -> 0.10.0:
 
This email is not from Hexagon’s Office 365 instance. Please be careful while clicking links, opening attachments, or replying to this email.


most important fix: version 0.8.0 errors out on dbus-lib interaction,
which is fixed with the most recent commit

505e2b5 (tag: v.0.10.0) add interactive_authorization options for buses
2d90700 pystemd: add copyright boilerplate to typing stubs
5b95888 pystemd: update branch name in github workflow
16817d2 Add type stub for pystemd.run
410fd77 (tag: v.0.9.0) update changelog for 0.9.0
71aae43 GetProcesses() - info about systemd version (#59)
fcafd08 Also include .pxd and .pxi in the source distribution
475cd2f also support 3.9
ea98275 some formatting options and start pystemd 0.9 development
eb7d225 pystemd: update install instructions in README
6fdf2c8 Daily `arc lint --take BLACK`
50e61b7 add a LIBSYSTEMD_VERSION macro for gating new functions (#58)

Signed-off-by: Johannes Schneider <johannes.schneider@...>
---
 .../{python3-pystemd_0.8.0.bb => python3-pystemd_0.10.0.bb}  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta-python/recipes-devtools/python/{python3-pystemd_0.8.0.bb => python3-pystemd_0.10.0.bb} (62%)

diff --git a/meta-python/recipes-devtools/python/python3-pystemd_0.8.0.bb b/meta-python/recipes-devtools/python/python3-pystemd_0.10.0.bb
similarity index 62%
rename from meta-python/recipes-devtools/python/python3-pystemd_0.8.0.bb
rename to meta-python/recipes-devtools/python/python3-pystemd_0.10.0.bb
index 0056a794f..da263fe94 100644
--- a/meta-python/recipes-devtools/python/python3-pystemd_0.8.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pystemd_0.10.0.bb
@@ -2,13 +2,12 @@ SUMMARY = "Python bindings for interacting with systemd over DBus"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c"

-SRC_URI[md5sum] = "f993739eca645749f18d4ccfd4a0fbf3"
-SRC_URI[sha256sum] = "cac2e42043ab28d43adf33dab493c6a3cf8a99794f824ae8af6d9cd6458b9972"
+SRC_URI[sha256sum] = "d74a814bfda01085db1a8ad90be3cb27daf23a51ab6b03e7e29ec811fa2ae859"

 DEPENDS = "systemd"
 RDEPENDS:${PN} += "python3-xml python3-pprint"
 REQUIRED_DISTRO_FEATURES = "systemd"

-inherit pypi setuptools3 features_check
+inherit pypi setuptools3 features_check pkgconfig

 BBCLASSEXTEND = "native"
--
2.25.1


[meta-networking][PATCH] openipmi: Fix buildpaths issue

Yu, Mingli
 

From: Mingli Yu <mingli.yu@...>

Fixes:
WARNING: openipmi-2.0.32-r0 do_package_qa: QA Issue: File /usr/src/debug/openipmi/2.0.32-r0/OpenIPMI-2.0.32/swig/perl/OpenIPMI_wrap.c in package openipmi-src contains reference to TMPDIR [buildpaths]

Signed-off-by: Mingli Yu <mingli.yu@...>
---
meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb b/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb
index c61303b81..8625afaa7 100644
--- a/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb
+++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb
@@ -85,6 +85,10 @@ do_configure () {
done
}

+do_compile:append () {
+ sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' ${S}/swig/perl/OpenIPMI_wrap.c
+}
+
do_install:append () {
echo "SAL: D = $D"
echo "SAL: libdir = $libdir"
--
2.25.1


Re: [meta-python][PATCH v2] python3-pystemd: Upgrade 0.8.0 -> 0.10.0:

Johannes Schneider
 

Hi,


and thanks for merging my patch into meta-openembedded:master (-:

since I observed these issues while running a kirkstone based system - and others will likely run into them as well - could you also put these changes on the kirkstone branch?


thanks and regards

From: openembedded-devel@... <openembedded-devel@...> on behalf of Johannes Schneider via lists.openembedded.org <johannes.schneider=leica-geosystems.com@...>
Sent: Thursday, July 28, 2022 05:56
To: openembedded-devel@... <openembedded-devel@...>
Cc: SCHNEIDER Johannes <johannes.schneider@...>
Subject: [oe] [meta-python][PATCH v2] python3-pystemd: Upgrade 0.8.0 -> 0.10.0:
 
This email is not from Hexagon’s Office 365 instance. Please be careful while clicking links, opening attachments, or replying to this email.


most important fix: version 0.8.0 errors out on dbus-lib interaction,
which is fixed with the most recent commit

505e2b5 (tag: v.0.10.0) add interactive_authorization options for buses
2d90700 pystemd: add copyright boilerplate to typing stubs
5b95888 pystemd: update branch name in github workflow
16817d2 Add type stub for pystemd.run
410fd77 (tag: v.0.9.0) update changelog for 0.9.0
71aae43 GetProcesses() - info about systemd version (#59)
fcafd08 Also include .pxd and .pxi in the source distribution
475cd2f also support 3.9
ea98275 some formatting options and start pystemd 0.9 development
eb7d225 pystemd: update install instructions in README
6fdf2c8 Daily `arc lint --take BLACK`
50e61b7 add a LIBSYSTEMD_VERSION macro for gating new functions (#58)

Signed-off-by: Johannes Schneider <johannes.schneider@...>
---
 .../{python3-pystemd_0.8.0.bb => python3-pystemd_0.10.0.bb}  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta-python/recipes-devtools/python/{python3-pystemd_0.8.0.bb => python3-pystemd_0.10.0.bb} (62%)

diff --git a/meta-python/recipes-devtools/python/python3-pystemd_0.8.0.bb b/meta-python/recipes-devtools/python/python3-pystemd_0.10.0.bb
similarity index 62%
rename from meta-python/recipes-devtools/python/python3-pystemd_0.8.0.bb
rename to meta-python/recipes-devtools/python/python3-pystemd_0.10.0.bb
index 0056a794f..da263fe94 100644
--- a/meta-python/recipes-devtools/python/python3-pystemd_0.8.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pystemd_0.10.0.bb
@@ -2,13 +2,12 @@ SUMMARY = "Python bindings for interacting with systemd over DBus"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c"

-SRC_URI[md5sum] = "f993739eca645749f18d4ccfd4a0fbf3"
-SRC_URI[sha256sum] = "cac2e42043ab28d43adf33dab493c6a3cf8a99794f824ae8af6d9cd6458b9972"
+SRC_URI[sha256sum] = "d74a814bfda01085db1a8ad90be3cb27daf23a51ab6b03e7e29ec811fa2ae859"

 DEPENDS = "systemd"
 RDEPENDS:${PN} += "python3-xml python3-pprint"
 REQUIRED_DISTRO_FEATURES = "systemd"

-inherit pypi setuptools3 features_check
+inherit pypi setuptools3 features_check pkgconfig

 BBCLASSEXTEND = "native"
--
2.25.1


[meta-webserver][PATCH] apache2: Fix the buildpaths issue

Yu, Mingli
 

From: Mingli Yu <mingli.yu@...>

Fixes:
WARNING: apache2-2.4.54-r0 do_package_qa: QA Issue: File /usr/src/debug/apache2/2.4.54-r0/build/server/exports.c in package apache2-src contains reference to TMPDIR [buildpaths]

Before the patch:
# cat ./build/server/exports.c
[snip]
#include "mpm_fdqueue.h"

const void *ap_ugly_hack = NULL;

/*
* /buildarea/build/tmp-glibc/work/core2-32-wrs-linux/apache2/2.4.54-r0/httpd-2.4.54/include/ap_expr.h
*/
const void *ap_hack_ap_expr_exec = (const void *)ap_expr_exec;
[snip]

After the patch:
# cat ./build/server/exports.c
[snip]
#include "mpm_fdqueue.h"

const void *ap_ugly_hack = NULL;

/*
* ap_expr.h
*/
const void *ap_hack_ap_expr_exec = (const void *)ap_expr_exec;
[snip]

Signed-off-by: Mingli Yu <mingli.yu@...>
---
...make_exports.awk-not-expose-the-path.patch | 32 +++++++++++++++++++
.../recipes-httpd/apache2/apache2_2.4.54.bb | 1 +
2 files changed, 33 insertions(+)
create mode 100644 meta-webserver/recipes-httpd/apache2/apache2/0001-make_exports.awk-not-expose-the-path.patch

diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0001-make_exports.awk-not-expose-the-path.patch b/meta-webserver/recipes-httpd/apache2/apache2/0001-make_exports.awk-not-expose-the-path.patch
new file mode 100644
index 000000000..78f23f0f2
--- /dev/null
+++ b/meta-webserver/recipes-httpd/apache2/apache2/0001-make_exports.awk-not-expose-the-path.patch
@@ -0,0 +1,32 @@
+From 5b5eae9cdf3bae91756c717349f2f33a31888f24 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@...>
+Date: Wed, 3 Aug 2022 12:35:16 +0800
+Subject: [PATCH] make_exports.awk: not expose the path
+
+Don't print the full path in the comment line.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Mingli Yu <mingli.yu@...>
+---
+ build/make_exports.awk | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/build/make_exports.awk b/build/make_exports.awk
+index 1cf0568..44d93c5 100644
+--- a/build/make_exports.awk
++++ b/build/make_exports.awk
+@@ -47,7 +47,9 @@ function push(line) {
+
+ function do_output() {
+ printf("/*\n")
+- printf(" * %s\n", FILENAME)
++ file = FILENAME
++ sub("([^/]*[/])*", "", file)
++ printf(" * %s\n", file)
+ printf(" */\n")
+
+ for (i = 0; i < stackptr; i++) {
+--
+2.25.1
+
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb
index c5f014b3c..4f30eca59 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb
@@ -15,6 +15,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \
file://0007-apache2-allow-to-disable-selinux-support.patch \
file://0008-Fix-perl-install-directory-to-usr-bin.patch \
file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \
+ file://0001-make_exports.awk-not-expose-the-path.patch \
"

SRC_URI:append:class-target = " \
--
2.25.1


[master][PATCH] qemu: CVE-2022-35414 can perform an uninitialized read on the translate_fail path, leading to an io_readx or io_writex crash

Hitendra Prajapati
 

Upstream-Status: Backport [https://github.com/qemu/qemu/commit/418ade7849ce7641c0f7333718caf5091a02fd4c]
CVE: CVE-2022-35414
Signed-off-by: Hitendra Prajapati <hprajapati@...>
---
meta/recipes-devtools/qemu/qemu.inc | 1 +
.../qemu/qemu/CVE-2022-35414.patch | 53 +++++++++++++++++++
2 files changed, 54 insertions(+)
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2022-35414.patch

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index c9e48f4a5a..0db6701735 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -27,6 +27,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://0008-tests-meson.build-use-relative-path-to-refer-to-file.patch \
file://0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \
file://0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch \
+ file://CVE-2022-35414.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"

diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2022-35414.patch b/meta/recipes-devtools/qemu/qemu/CVE-2022-35414.patch
new file mode 100644
index 0000000000..fe79a749ae
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2022-35414.patch
@@ -0,0 +1,53 @@
+From a10c33942dc8cb31b3762b9dd4adde4c490eed9c Mon Sep 17 00:00:00 2001
+From: Hitendra Prajapati <hprajapati@...>
+Date: Wed, 3 Aug 2022 10:11:11 +0530
+Subject: [PATCH] CVE-2022-35414
+
+Upstream-Status: Backport [https://github.com/qemu/qemu/commit/418ade7849ce7641c0f7333718caf5091a02fd4c]
+CVE: CVE-2022-35414
+Signed-off-by: Hitendra Prajapati <hprajapati@...>
+---
+ softmmu/physmem.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/softmmu/physmem.c b/softmmu/physmem.c
+index 4e1b27a20..ad8a90dec 100644
+--- a/softmmu/physmem.c
++++ b/softmmu/physmem.c
+@@ -669,7 +669,7 @@ void tcg_iommu_init_notifier_list(CPUState *cpu)
+
+ /* Called from RCU critical section */
+ MemoryRegionSection *
+-address_space_translate_for_iotlb(CPUState *cpu, int asidx, hwaddr addr,
++address_space_translate_for_iotlb(CPUState *cpu, int asidx, hwaddr orig_addr,
+ hwaddr *xlat, hwaddr *plen,
+ MemTxAttrs attrs, int *prot)
+ {
+@@ -678,6 +678,7 @@ address_space_translate_for_iotlb(CPUState *cpu, int asidx, hwaddr addr,
+ IOMMUMemoryRegionClass *imrc;
+ IOMMUTLBEntry iotlb;
+ int iommu_idx;
++ hwaddr addr = orig_addr;
+ AddressSpaceDispatch *d =
+ qatomic_rcu_read(&cpu->cpu_ases[asidx].memory_dispatch);
+
+@@ -722,6 +723,16 @@ address_space_translate_for_iotlb(CPUState *cpu, int asidx, hwaddr addr,
+ return section;
+
+ translate_fail:
++ /*
++ * We should be given a page-aligned address -- certainly
++ * tlb_set_page_with_attrs() does so. The page offset of xlat
++ * is used to index sections[], and PHYS_SECTION_UNASSIGNED = 0.
++ * The page portion of xlat will be logged by memory_region_access_valid()
++ * when this memory access is rejected, so use the original untranslated
++ * physical address.
++ */
++ assert((orig_addr & ~TARGET_PAGE_MASK) == 0);
++ *xlat = orig_addr;
+ return &d->map.sections[PHYS_SECTION_UNASSIGNED];
+ }
+
+--
+2.25.1
+
--
2.25.1


Re: [meta-networking] [PATCH] strongswan: upgrade 5.9.6 -> 5.9.7

Yi Zhao
 

Hi Mingyu,


There are some strongswan startup failures for this patch. I have sent V2.


//Yi

On 8/2/22 21:44, wangmy wrote:
0001-enum-Fix-compiler-warning.patch
removed since it's included in 5.9.7.

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../0001-enum-Fix-compiler-warning.patch | 31 -------------------
...trongswan_5.9.6.bb => strongswan_5.9.7.bb} | 6 ++--
2 files changed, 2 insertions(+), 35 deletions(-)
delete mode 100644 meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch
rename meta-networking/recipes-support/strongswan/{strongswan_5.9.6.bb => strongswan_5.9.7.bb} (98%)

diff --git a/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch b/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch
deleted file mode 100644
index e730fe1cd0..0000000000
--- a/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d23c0ea81e630af3cfda89aeeb52146c0c84c960 Mon Sep 17 00:00:00 2001
-From: Tobias Brunner <tobias@...>
-Date: Mon, 2 May 2022 09:31:49 +0200
-Subject: [PATCH] enum: Fix compiler warning
-
-Closes strongswan/strongswan#1025
-
-Upstream-Status: Backport
-[https://github.com/strongswan/strongswan/commit/d23c0ea81e630af3cfda89aeeb52146c0c84c960]
-
-Signed-off-by: Yi Zhao <yi.zhao@...>
----
- src/libstrongswan/utils/enum.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libstrongswan/utils/enum.c b/src/libstrongswan/utils/enum.c
-index 79da450f0c..1e77489f6f 100644
---- a/src/libstrongswan/utils/enum.c
-+++ b/src/libstrongswan/utils/enum.c
-@@ -97,7 +97,7 @@ char *enum_flags_to_string(enum_name_t *e, u_int val, char *buf, size_t len)
- return buf;
- }
-
-- if (snprintf(buf, len, e->names[0]) >= len)
-+ if (snprintf(buf, len, "%s", e->names[0]) >= len)
- {
- return NULL;
- }
---
-2.25.1
-
diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb b/meta-networking/recipes-support/strongswan/strongswan_5.9.7.bb
similarity index 98%
rename from meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb
rename to meta-networking/recipes-support/strongswan/strongswan_5.9.7.bb
index 1b82dceac2..67ab7c4110 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_5.9.7.bb
@@ -8,11 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
DEPENDS = "flex-native flex bison-native"
DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss', '', d)}"
-SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \
- file://0001-enum-Fix-compiler-warning.patch \
- "
+SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2"
-SRC_URI[sha256sum] = "91d0978ac448912759b85452d8ff0d578aafd4507aaf4f1c1719f9d0c7318ab7"
+SRC_URI[sha256sum] = "9e64a2ba62efeac81abff1d962522404ebc6ed6c0d352a23ab7c0b2c639e3fcf"
UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar"


[meta-networking][PATCH V2] strongswan: upgrade 5.9.6 -> 5.9.7

Yi Zhao
 

ChangeLog:
https://github.com/strongswan/strongswan/releases/tag/5.9.7

* Drop backport patch 0001-enum-Fix-compiler-warning.patch.
* Update RDEPENDS to fix strongswan startup failures:
plugin 'mgf1': failed to load - mgf1_plugin_create not found and no plugin file available
plugin 'fips-prf': failed to load - fips_prf_plugin_create not found and no plugin file available
plugin 'kdf': failed to load - kdf_plugin_create not found and no plugin file available
plugin 'drbg': failed to load - drbg_plugin_create not found and no plugin file available

Signed-off-by: Yi Zhao <yi.zhao@...>
---
.../0001-enum-Fix-compiler-warning.patch | 31 -------------------
...trongswan_5.9.6.bb => strongswan_5.9.7.bb} | 7 +++--
2 files changed, 5 insertions(+), 33 deletions(-)
delete mode 100644 meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch
rename meta-networking/recipes-support/strongswan/{strongswan_5.9.6.bb => strongswan_5.9.7.bb} (97%)

diff --git a/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch b/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch
deleted file mode 100644
index e730fe1cd..000000000
--- a/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d23c0ea81e630af3cfda89aeeb52146c0c84c960 Mon Sep 17 00:00:00 2001
-From: Tobias Brunner <tobias@...>
-Date: Mon, 2 May 2022 09:31:49 +0200
-Subject: [PATCH] enum: Fix compiler warning
-
-Closes strongswan/strongswan#1025
-
-Upstream-Status: Backport
-[https://github.com/strongswan/strongswan/commit/d23c0ea81e630af3cfda89aeeb52146c0c84c960]
-
-Signed-off-by: Yi Zhao <yi.zhao@...>
----
- src/libstrongswan/utils/enum.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libstrongswan/utils/enum.c b/src/libstrongswan/utils/enum.c
-index 79da450f0c..1e77489f6f 100644
---- a/src/libstrongswan/utils/enum.c
-+++ b/src/libstrongswan/utils/enum.c
-@@ -97,7 +97,7 @@ char *enum_flags_to_string(enum_name_t *e, u_int val, char *buf, size_t len)
- return buf;
- }
-
-- if (snprintf(buf, len, e->names[0]) >= len)
-+ if (snprintf(buf, len, "%s", e->names[0]) >= len)
- {
- return NULL;
- }
---
-2.25.1
-
diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb b/meta-networking/recipes-support/strongswan/strongswan_5.9.7.bb
similarity index 97%
rename from meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb
rename to meta-networking/recipes-support/strongswan/strongswan_5.9.7.bb
index 1b82dceac..71ffb7ba4 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_5.9.7.bb
@@ -9,10 +9,9 @@ DEPENDS = "flex-native flex bison-native"
DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss', '', d)}"

SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \
- file://0001-enum-Fix-compiler-warning.patch \
"

-SRC_URI[sha256sum] = "91d0978ac448912759b85452d8ff0d578aafd4507aaf4f1c1719f9d0c7318ab7"
+SRC_URI[sha256sum] = "9e64a2ba62efeac81abff1d962522404ebc6ed6c0d352a23ab7c0b2c639e3fcf"

UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar"

@@ -147,9 +146,13 @@ RDEPENDS:${PN} += "\
${PN}-plugin-constraints \
${PN}-plugin-des \
${PN}-plugin-dnskey \
+ ${PN}-plugin-drbg \
+ ${PN}-plugin-fips-prf \
${PN}-plugin-hmac \
+ ${PN}-plugin-kdf \
${PN}-plugin-kernel-netlink \
${PN}-plugin-md5 \
+ ${PN}-plugin-mgf1 \
${PN}-plugin-nonce \
${PN}-plugin-pem \
${PN}-plugin-pgp \
--
2.25.1


[meta-oe][PATCH] Add python-requests-unixsocket recipe

edtanous@...
 

From: Ed Tanous <edtanous@...>

From the pypi description:
Use requests to talk HTTP via a UNIX domain socket

Signed-off-by: Ed Tanous <edtanous@...>
---
.../python/python3-requests-unixsocket_0.3.0.bb | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 meta-python/recipes-devtools/python/python3-requests-unixsocket_0.3.0.bb

diff --git a/meta-python/recipes-devtools/python/python3-requests-unixsocket_0.3.0.bb b/meta-python/recipes-devtools/python/python3-requests-unixsocket_0.3.0.bb
new file mode 100644
index 000000000..330ab7c06
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-requests-unixsocket_0.3.0.bb
@@ -0,0 +1,14 @@
+SUMMARY = "Use requests to talk HTTP via a UNIX domain socket"
+HOMEPAGE = "https://pypi.org/project/requests-unixsocket/"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
+
+SRC_URI[sha256sum] = "28304283ea9357d45fff58ad5b11e47708cfbf5806817aa59b2a363228ee971e"
+
+PYPI_PACKAGE = "requests-unixsocket"
+
+inherit pypi
+inherit setuptools3
+
+DEPENDS += "python3-pbr-native"
+RDEPENDS_${PN} = "python3-requests python3-urllib3"
--
2.37.1.559.g78731f0fdb-goog


[meta-oe][dunfell][PATCH] meta-oe: Add leading whitespace for append operator

Armin Kuster
 

From: Khem Raj <raj.khem@...>

Signed-off-by: Khem Raj <raj.khem@...>
(cherry picked from commit 92441f9d6a958c245a03f89ec44ef2c17dd6b0ee)
Signed-off-by: Armin Kuster <akuster808@...>
---
meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb | 2 +-
meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb | 2 +-
meta-oe/recipes-devtools/lua/lua_5.3.6.bb | 2 +-
meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb | 2 +-
meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb | 2 +-
meta-oe/recipes-support/anthy/anthy_9100h.bb | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb
index db7a8d7933..d1b7134b83 100644
--- a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb
+++ b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb
@@ -7,7 +7,7 @@ SRC_URI = "git://github.com/ubinux/dnf-plugin-tui.git;branch=master;protocol=htt
SRCREV = "c5416adeb210154dc4ccc4c3e1c5297d83ebd41e"
PV = "1.1"

-SRC_URI_append_class-target = "file://oe-remote.repo.sample"
+SRC_URI_append_class-target = " file://oe-remote.repo.sample"

inherit distutils3-base

diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb b/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb
index fa20941dfc..8a055412f2 100644
--- a/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb
+++ b/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb
@@ -63,6 +63,6 @@ do_configure_prepend_toolchain-clang_x86() {

BBCLASSEXTEND = "native nativesdk"

-SYSROOT_DIRS_BLACKLIST_append_class-target = "${baselib}/cmake/grpc"
+SYSROOT_DIRS_BLACKLIST_append_class-target = " ${baselib}/cmake/grpc"

FILES_${PN}-dev += "${bindir}"
diff --git a/meta-oe/recipes-devtools/lua/lua_5.3.6.bb b/meta-oe/recipes-devtools/lua/lua_5.3.6.bb
index 0137cc3c5b..d46d402aa3 100644
--- a/meta-oe/recipes-devtools/lua/lua_5.3.6.bb
+++ b/meta-oe/recipes-devtools/lua/lua_5.3.6.bb
@@ -32,7 +32,7 @@ PACKAGECONFIG ??= "readline"
PACKAGECONFIG[readline] = ",,readline"

UCLIBC_PATCHES += "file://uclibc-pthread.patch"
-SRC_URI_append_libc-uclibc = "${UCLIBC_PATCHES}"
+SRC_URI_append_libc-uclibc = " ${UCLIBC_PATCHES}"

TARGET_CC_ARCH += " -fPIC ${LDFLAGS}"
EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -fPIC' MYLDFLAGS='${LDFLAGS}'"
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb b/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb
index 926d8851d2..b2c41756e5 100644
--- a/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb
@@ -32,7 +32,7 @@ BBCLASSEXTEND = "native"
DEPENDS_class-native = "readline-native"
PACKAGECONFIG_class-native = ""

-SRC_URI_append_class-native = "file://0001-reduce-build-to-conversion-tools-for-native-build.patch"
+SRC_URI_append_class-native = " file://0001-reduce-build-to-conversion-tools-for-native-build.patch"

do_install_class-native() {
install -d ${D}${bindir}
diff --git a/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb b/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb
index a081cb17a8..27fe0e2c40 100644
--- a/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb
+++ b/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb
@@ -31,4 +31,4 @@ FILES_statgrab-dbg = "${bindir}/.debug/statgrab"
FILES_saidar = "${bindir}/saidar"
FILES_saidar-dbg = "${bindir}/.debug/saidar"
FILES_${PN}-mrtg = "${bindir}/statgrab-make-mrtg-config ${bindir}/statgrab-make-mrtg-index"
-RDEPENDS_${PN}-mrtg_append = "perl statgrab"
+RDEPENDS_${PN}-mrtg_append = " perl statgrab"
diff --git a/meta-oe/recipes-support/anthy/anthy_9100h.bb b/meta-oe/recipes-support/anthy/anthy_9100h.bb
index a65d324eae..b464c00003 100644
--- a/meta-oe/recipes-support/anthy/anthy_9100h.bb
+++ b/meta-oe/recipes-support/anthy/anthy_9100h.bb
@@ -10,8 +10,8 @@ SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz \
file://2ch_t.patch \
"

-SRC_URI_append_class-target = "file://target-helpers.patch"
-SRC_URI_append_class-native = "file://native-helpers.patch"
+SRC_URI_append_class-target = " file://target-helpers.patch"
+SRC_URI_append_class-native = " file://native-helpers.patch"

SRC_URI[md5sum] = "1f558ff7ed296787b55bb1c6cf131108"
SRC_URI[sha256sum] = "d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547"
--
2.25.1

1721 - 1740 of 99837