[OE-core] [PATCH] fix various, innocuous typos

2020-02-15 Thread Robert P. J. Day
Corrections:

  - environment
  - variable
  - accommodate
  - conversion
  - compatible

Signed-off-by: Robert P. J. Day 

---

diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 75f0f2c3e3..359f240b0b 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -243,7 +243,7 @@ def testimage_main(d):
 if d.getVar("TEST_TARGET") == "qemu":
 fstypes = [fs for fs in fstypes if fs in supported_fstypes]
 if not fstypes:
-bb.fatal('Unsupported image type built. Add a comptible image to '
+bb.fatal('Unsupported image type built. Add a compatible image to '
  'IMAGE_FSTYPES. Supported types: %s' %
  ', '.join(supported_fstypes))
 qfstype = fstypes[0]
diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
index 1c586a3bc6..751424d1b6 100644
--- a/meta/conf/licenses.conf
+++ b/meta/conf/licenses.conf
@@ -1,7 +1,7 @@
 # Standards are great! Everyone has their own. In an effort to standardize 
licensing
 # names, common-licenses will use the SPDX standard license names. In order to 
not
 # break the non-standardized license names that we find in LICENSE, we'll set
-# up a bunch of VarFlags to accomodate non-SPDX license names.
+# up a bunch of VarFlags to accommodate non-SPDX license names.
 #
 # We should really discuss standardizing this field, but that's a longer term 
goal.
 # For now, we can do this and it should grab the most common LICENSE naming 
variations.
diff --git a/meta/lib/oeqa/manual/eclipse-plugin.json 
b/meta/lib/oeqa/manual/eclipse-plugin.json
index 9869150dcf..d77d0e673b 100644
--- a/meta/lib/oeqa/manual/eclipse-plugin.json
+++ b/meta/lib/oeqa/manual/eclipse-plugin.json
@@ -82,7 +82,7 @@
 ],
 "execution": {
 "1": {
-"action": "Launch a QEMU of target enviroment.(Reference 
to case \"ADT - Launch qemu by eclipse\") ",
+"action": "Launch a QEMU of target environment.(Reference 
to case \"ADT - Launch qemu by eclipse\") ",
 "expected_results": ""
 },
 "2": {
@@ -164,7 +164,7 @@
 ],
 "execution": {
 "1": {
-"action": "Launch a QEMU of target enviroment.(Reference 
to case \"ADT - Launch qemu by eclipse\") ",
+"action": "Launch a QEMU of target environment.(Reference 
to case \"ADT - Launch qemu by eclipse\") ",
 "expected_results": ""
 },
 "2": {
@@ -319,4 +319,4 @@
 "summary": "Eclipse_Poky_installation_and_setup"
 }
 }
-]
\ No newline at end of file
+]
diff --git a/meta/lib/oeqa/sdk/context.py b/meta/lib/oeqa/sdk/context.py
index 09e77c19fe..01c38c24e6 100644
--- a/meta/lib/oeqa/sdk/context.py
+++ b/meta/lib/oeqa/sdk/context.py
@@ -136,7 +136,7 @@ class OESDKTestContextExecutor(OETestContextExecutor):
 sdk_envs = OESDKTestContextExecutor._get_sdk_environs(args.sdk_dir)
 if not sdk_envs:
 raise argparse_oe.ArgumentUsageError("No available SDK "\
-   "enviroments found at %s" % args.sdk_dir, self.name)
+   "environments found at %s" % args.sdk_dir, self.name)

 if args.list_sdk_env:
 self._display_sdk_envs(logger.info, args, sdk_envs)
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py 
b/meta/lib/oeqa/selftest/cases/devtool.py
index e2f91bcb6c..5886862d6c 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -1741,7 +1741,7 @@ class DevtoolUpgradeTests(DevtoolBase):
  when building the kernel.
  """
 kernel_provider = get_bb_var('PREFERRED_PROVIDER_virtual/kernel')
-# Clean up the enviroment
+# Clean up the environment
 bitbake('%s -c clean' % kernel_provider)
 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
 tempdir_cfg = tempfile.mkdtemp(prefix='config_qa')
diff --git a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py 
b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
index 6d80827652..d4664bd0df 100644
--- a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
+++ b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
@@ -45,7 +45,7 @@ class TestBlobParsing(OESelftestTestCase):

 def test_blob_to_dict(self):
 """
-Test convertion of git blobs to dictionary
+Test conversion of git blobs to dictionary
 """
 from oe.buildhistory_analysis import blob_to_dict
 valuesmap = { "foo" : "1", "bar" : "2" }
diff --git a/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch 
b/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch
index a09e2a257e..1823dfee3f 100644
--- a/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch
+++ b/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch
@@ -985,7 +985,7 @@ 

[OE-core] [PATCH] pulseaudio: remove unnecessary libltdl copying

2020-02-15 Thread Tanu Kaskinen
This was added in 5df6deaa32e4f6d0a8985403970a137270491991. I don't know
what problem it solved at that time (2009-04-21), but it seems that
nowadays PulseAudio builds fine without copying the libltdl stuff.

Signed-off-by: Tanu Kaskinen 
---
 meta/recipes-multimedia/pulseaudio/pulseaudio_13.0.bb | 5 -
 1 file changed, 5 deletions(-)

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_13.0.bb 
b/meta/recipes-multimedia/pulseaudio/pulseaudio_13.0.bb
index 7f8ebc2090..1bd4d9083e 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_13.0.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_13.0.bb
@@ -7,8 +7,3 @@ SRC_URI = 
"http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \
"
 SRC_URI[md5sum] = "e41d606f90254ed45c90520faf83d95c"
 SRC_URI[sha256sum] = 
"961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057"
-
-do_compile_prepend() {
-mkdir -p ${S}/libltdl
-cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl
-}
-- 
2.20.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] python3-pycairo: upgrade 1.18.2 -> 1.19.0

2020-02-15 Thread Peter Kjellerstedt
> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org  boun...@lists.openembedded.org> On Behalf Of Wang Mingyu
> Sent: den 15 februari 2020 00:44
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH] python3-pycairo: upgrade 1.18.2 -> 1.19.0
> 
> -License-Update: "PDX-License-Identifier: LGPL-2.1-only OR MPL-1.1"
> is added

If the SPDX-License-Identifier is "LGPL-2.1-only OR MPL-1.1", why is 
the LICENSE set to "LGPLv2.1 & MPLv1.1"? Shouldn't it be "LGPLv2.1 | MPLv1.1"?

//Peter

> Signed-off-by: Wang Mingyu 
> ---
>  ...{python3-pycairo_1.18.2.bb => python3-pycairo_1.19.0.bb} | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>  rename meta/recipes-devtools/python/{python3-pycairo_1.18.2.bb => 
> python3-pycairo_1.19.0.bb} (77%)
> 
> diff --git a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb 
> b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb
> similarity index 77%
> rename from meta/recipes-devtools/python/python3-pycairo_1.18.2.bb
> rename to meta/recipes-devtools/python/python3-pycairo_1.19.0.bb
> index 3aedf3d142..8f60834c17 100644
> --- a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb
> +++ b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb
> @@ -3,7 +3,7 @@ HOMEPAGE = "http://cairographics.org/pycairo;
>  BUGTRACKER = "http://bugs.freedesktop.org;
>  SECTION = "python-devel"
>  LICENSE = "LGPLv2.1 & MPLv1.1"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \
> +LIC_FILES_CHKSUM = "file://COPYING;md5=f3713ca2c28d9312ad718520b6dc3eee \
>  
> file://COPYING-LGPL-2.1;md5=fad9b3332be894bab9bc501572864b29 \
>  
> file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325"
> 
> @@ -13,8 +13,8 @@ DEPENDS = "cairo python3"
>  SRC_URI = 
> "https://github.com/pygobject/pycairo/releases/download/v${PV}/pycairo-${PV}.tar.gz;
>  UPSTREAM_CHECK_URI = "https://github.com/pygobject/pycairo/releases/;
> 
> -SRC_URI[md5sum] = "be2ba51f234270dec340f28f1695a95e"
> -SRC_URI[sha256sum] = 
> "dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531"
> +SRC_URI[md5sum] = "38b84416021640b01250c8f8ec4c52d4"
> +SRC_URI[sha256sum] = 
> "4f5ba9374a46c98729dd3727d993f5e17ed0286fd6738ed464fe4efa0612d19c"
> 
>  S = "${WORKDIR}/pycairo-${PV}"
> 
> --
> 2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] insane.bbclass: Correct typo inhert->inherit

2020-02-15 Thread Khem Raj
Signed-off-by: Khem Raj 
---
 meta/classes/insane.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 7425b8cbd5..478240fa57 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -194,7 +194,7 @@ def package_qa_check_mime(path, name, d, elf, messages):
 """
 
 if d.getVar("datadir") + "/mime/packages" in path and 
path.endswith('.xml') and not bb.data.inherits_class("mime", d):
-package_qa_add_message(messages, "mime", "package contains mime types 
but does not inhert mime: %s path '%s'" % \
+package_qa_add_message(messages, "mime", "package contains mime types 
but does not inherit mime: %s path '%s'" % \
  (name, package_qa_clean_path(path,d)))
 
 QAPATHTEST[mime-xdg] = "package_qa_check_mime_xdg"
-- 
2.25.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [OE-Core][PATCH v4 1/2] meson.bbclass: Parameterise meson.cross

2020-02-15 Thread Khem Raj
On Sat, Feb 15, 2020 at 1:39 PM Alex Kiernan  wrote:
>
> On Sat, Feb 15, 2020 at 9:18 PM Khem Raj  wrote:
> >
> > On 2/15/20 1:44 AM, Alex Kiernan wrote:
> > > Add MESON_CROSS_BINARIES, MESON_CROSS_PROPERTIES as a colon separated
> > > list of meson properties which are exported into meson.cross.
> > >
> >
> > I am seeing errors
> >
> > 13:14:54   File
> > "/mnt/jenkins/workspace/yocto-world-glibc/sources/openembedded-core/meta/classes/meson.bbclass",
> > line 130
> > 13:14:54 echo "[properties]" > ${WORKDIR}/meson-tracker.cross
> > 13:14:54   ^
> > 13:14:54 SyntaxError: invalid syntax
> >
>
> Is that tracker from meta-gnome?

yes.

>
>
> --
> Alex Kiernan
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [OE-Core][PATCH v4 1/2] meson.bbclass: Parameterise meson.cross

2020-02-15 Thread Alex Kiernan
On Sat, Feb 15, 2020 at 9:18 PM Khem Raj  wrote:
>
> On 2/15/20 1:44 AM, Alex Kiernan wrote:
> > Add MESON_CROSS_BINARIES, MESON_CROSS_PROPERTIES as a colon separated
> > list of meson properties which are exported into meson.cross.
> >
>
> I am seeing errors
>
> 13:14:54   File
> "/mnt/jenkins/workspace/yocto-world-glibc/sources/openembedded-core/meta/classes/meson.bbclass",
> line 130
> 13:14:54 echo "[properties]" > ${WORKDIR}/meson-tracker.cross
> 13:14:54   ^
> 13:14:54 SyntaxError: invalid syntax
>

Is that tracker from meta-gnome?


-- 
Alex Kiernan
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [OE-Core][PATCH v4 1/2] meson.bbclass: Parameterise meson.cross

2020-02-15 Thread Khem Raj

On 2/15/20 1:44 AM, Alex Kiernan wrote:

Add MESON_CROSS_BINARIES, MESON_CROSS_PROPERTIES as a colon separated
list of meson properties which are exported into meson.cross.



I am seeing errors

13:14:54   File 
"/mnt/jenkins/workspace/yocto-world-glibc/sources/openembedded-core/meta/classes/meson.bbclass", 
line 130

13:14:54 echo "[properties]" > ${WORKDIR}/meson-tracker.cross
13:14:54   ^
13:14:54 SyntaxError: invalid syntax



Signed-off-by: Alex Kiernan 
---

Changes in v4: None
Changes in v3:
- new

Changes in v2: None

  meta/classes/meson.bbclass | 161 -
  1 file changed, 86 insertions(+), 75 deletions(-)

diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
index 06034e8b4731..e778e37d7f69 100644
--- a/meta/classes/meson.bbclass
+++ b/meta/classes/meson.bbclass
@@ -34,88 +34,99 @@ MESON_CROSS_FILE = ""
  MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross"
  MESON_CROSS_FILE_class-nativesdk = "--cross-file ${WORKDIR}/meson.cross"
  
-def meson_array(var, d):

-items = d.getVar(var).split()
-return repr(items[0] if len(items) == 1 else items)
-
-# Map our ARCH values to what Meson expects:
-# http://mesonbuild.com/Reference-tables.html#cpu-families
-def meson_cpu_family(var, d):
-import re
-arch = d.getVar(var)
-if arch == 'powerpc':
-return 'ppc'
-elif arch == 'powerpc64' or arch == 'powerpc64le':
-return 'ppc64'
-elif arch == 'armeb':
-return 'arm'
-elif arch == 'aarch64_be':
-return 'aarch64'
-elif arch == 'mipsel':
-return 'mips'
-elif arch == 'mips64el':
-return 'mips64'
-elif re.match(r"i[3-6]86", arch):
-return "x86"
-elif arch == "microblazeel":
-return "microblaze"
-else:
-return arch
-
-# Map our OS values to what Meson expects:
-# https://mesonbuild.com/Reference-tables.html#operating-system-names
-def meson_operating_system(var, d):
-os = d.getVar(var)
-if "mingw" in os:
-return "windows"
-else:
-return os
-
-def meson_endian(prefix, d):
-arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS")
-sitedata = siteinfo_data_for_machine(arch, os, d)
-if "endian-little" in sitedata:
-return "little"
-elif "endian-big" in sitedata:
-return "big"
-else:
-bb.fatal("Cannot determine endianism for %s-%s" % (arch, os))
+MESON_CROSS_BINARIES ??= "c:CC \
+  cpp:CXX \
+  ar:AR \
+  nm:NM \
+  strip:STRIP \
+  readelf:READELF"
+
+MESON_CROSS_PROPERTIES ??= "c_args:CFLAGS \
+c_link_args:LDFLAGS \
+cpp_args:CXXFLAGS \
+cpp_link_args:LDFLAGS"
  
  addtask write_config before do_configure

-do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS CXXFLAGS 
LDFLAGS"
-do_write_config() {
-# This needs to be Py to split the args into single-element lists
-cat >${WORKDIR}/meson.cross 

[OE-core] ✗ patchtest: failure for resulttool/resultutils: Fix unicode error handling

2020-02-15 Thread Patchwork
== Series Details ==

Series: resulttool/resultutils: Fix unicode error handling
Revision: 1
URL   : https://patchwork.openembedded.org/series/22680/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue Series does not apply on top of target branch 
[test_series_merge_on_head] 
  Suggested fixRebase your series on top of targeted branch
  Targeted branch  master (currently at 3aa0d0fd0b)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines: 
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] resulttool/resultutils: Fix unicode error handling

2020-02-15 Thread Richard Purdie
This error handling didn't work as expected since upon failure it would
inject bytestreams back into the code leading to tracebacks.

Instead, ignore the decode errors. Fixes:

Traceback (most recent call last):
  File "/home/pokybuild/yocto-worker/a-full/build/scripts/resulttool", line 78, 
in 
sys.exit(main())
  File "/home/pokybuild/yocto-worker/a-full/build/scripts/resulttool", line 72, 
in main
ret = args.func(args, logger)
  File 
"/home/pokybuild/yocto-worker/a-full/build/scripts/lib/resulttool/store.py", 
line 70, in store
resultutils.save_resultsdata(results, tempdir, ptestlogs=True)
  File 
"/home/pokybuild/yocto-worker/a-full/build/scripts/lib/resulttool/resultutils.py",
 line 178, in save_resultsdata
f.write(sectionlog)
TypeError: write() argument must be str, not bytes

Signed-off-by: Richard Purdie 
---
 scripts/lib/resulttool/resultutils.py | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/scripts/lib/resulttool/resultutils.py 
b/scripts/lib/resulttool/resultutils.py
index f0ae8ec1c5c..5fec01f6f34 100644
--- a/scripts/lib/resulttool/resultutils.py
+++ b/scripts/lib/resulttool/resultutils.py
@@ -127,10 +127,7 @@ def decode_log(logdata):
 data = logdata.get("compressed")
 data = base64.b64decode(data.encode("utf-8"))
 data = zlib.decompress(data)
-try:
-return data.decode("utf-8")
-except UnicodeDecodeError:
-return data
+return data.decode("utf-8", errors='ignore')
 return None
 
 def ptestresult_get_log(results, section):
-- 
2.20.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] icu: upgrade 64.2 -> 65.1

2020-02-15 Thread Alexander Kanavin
On Sat, 15 Feb 2020 at 11:19, Richard Purdie <
richard.pur...@linuxfoundation.org> wrote:

>
> This breaks webkitgtk:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/1548
> https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/272
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1563
> https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1567
>

This should be addressed by the webkit update Khem just posted.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] webkitgtk: Upgrade to 2.26.4 minor release

2020-02-15 Thread Khem Raj
Signed-off-by: Khem Raj 
---
 .../webkit/{webkitgtk_2.26.2.bb => webkitgtk_2.26.4.bb}  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-sato/webkit/{webkitgtk_2.26.2.bb => webkitgtk_2.26.4.bb} 
(97%)

diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb 
b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
similarity index 97%
rename from meta/recipes-sato/webkit/webkitgtk_2.26.2.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
index a184d833c4..c7f0d5e983 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
@@ -21,9 +21,8 @@ SRC_URI = 
"https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
file://0001-Fix-build-with-musl.patch \
file://include_array.patch \
"
-
-SRC_URI[md5sum] = "65e06fe73ee166447894aaea95038e3b"
-SRC_URI[sha256sum] = 
"6b80f0637a80818559ac8fd50db3b394f41cb61904fb9b3ed65fa51635806512"
+SRC_URI[md5sum] = "60f881729f3b71244b7f6e58790073e0"
+SRC_URI[sha256sum] = 
"4386900713dfadf9741177210b32623cab22562a79ffd0d446b66569934b113f"
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check 
upstream-version-is-even gtk-doc
 
-- 
2.25.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [OE-Core][PATCH] openssh: Upgrade 8.1p1 -> 8.2p1

2020-02-15 Thread Alex Kiernan
Drop backports from upstream:

  0001-Manually-applied-upstream-fix-for-openssh-test.patch
  0001-seccomp-Allow-clock_gettime64-in-sandbox.patch
  openssh-8.1p1-seccomp-nanosleep.patch

Signed-off-by: Alex Kiernan 
---

 ...pplied-upstream-fix-for-openssh-test.patch | 60 ---
 ...omp-Allow-clock_gettime64-in-sandbox.patch | 31 --
 .../openssh-8.1p1-seccomp-nanosleep.patch | 27 -
 .../{openssh_8.1p1.bb => openssh_8.2p1.bb}|  7 +--
 4 files changed, 2 insertions(+), 123 deletions(-)
 delete mode 100644 
meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch
 delete mode 100644 
meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch
 delete mode 100644 
meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch
 rename meta/recipes-connectivity/openssh/{openssh_8.1p1.bb => 
openssh_8.2p1.bb} (95%)

diff --git 
a/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch
 
b/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch
deleted file mode 100644
index 7171ec0834e8..
--- 
a/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 0a68d6cfe255f8bcdd5f9db0d008a8f0a60b237a Mon Sep 17 00:00:00 2001
-From: "Mingde (Matthew) Zeng" 
-Date: Wed, 15 Jan 2020 15:51:42 -0500
-Subject: [PATCH] Manually applied upstream fix for openssh test
-
-Upstream Status: Backport:
-
https://github.com/openssh/openssh-portable/commit/ff31f15773ee173502eec4d7861ec56f26bba381
-
-Signed-off-by: Mingde (Matthew) Zeng

- regress/cert-hostkey.sh | 4 ++--
- regress/cert-userkey.sh | 5 ++---
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh
-index 86ea6250..60e3ec02 100644
 a/regress/cert-hostkey.sh
-+++ b/regress/cert-hostkey.sh
-@@ -1,4 +1,4 @@
--# $OpenBSD: cert-hostkey.sh,v 1.18 2019/07/25 08:28:15 dtucker Exp $
-+# $OpenBSD: cert-hostkey.sh,v 1.23 2020/01/03 03:02:26 djm Exp $
- # Placed in the Public Domain.
-
- tid="certified host keys"
-@@ -252,7 +252,7 @@ test_one() {
- test_one "user-certificate"   failure "-n $HOSTS"
- test_one "empty principals"   success "-h"
- test_one "wrong principals"   failure "-h -n foo"
--test_one "cert not yet valid" failure "-h -V20200101:20300101"
-+test_one "cert not yet valid" failure "-h -V20300101:20320101"
- test_one "cert expired"   failure "-h -V19800101:19900101"
- test_one "cert valid interval"success "-h -V-1w:+2w"
- test_one "cert has constraints"   failure "-h -Oforce-command=false"
-diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh
-index 38c14a69..f0e30945 100644
 a/regress/cert-userkey.sh
-+++ b/regress/cert-userkey.sh
-@@ -1,4 +1,4 @@
--# $OpenBSD: cert-userkey.sh,v 1.21 2019/07/25 08:28:15 dtucker Exp $
-+# $OpenBSD: cert-userkey.sh,v 1.25 2020/01/03 03:02:26 djm Exp $
- # Placed in the Public Domain.
-
- tid="certified user keys"
-@@ -338,7 +338,7 @@ test_one() {
- test_one "correct principal"  success "-n ${USER}"
- test_one "host-certificate"   failure "-n ${USER} -h"
- test_one "wrong principals"   failure "-n foo"
--test_one "cert not yet valid" failure "-n ${USER} -V20200101:20300101"
-+test_one "cert not yet valid" failure "-n ${USER} -V20300101:20320101"
- test_one "cert expired"   failure "-n ${USER} -V19800101:19900101"
- test_one "cert valid interval"success "-n ${USER} -V-1w:+2w"
- test_one "wrong source-address"   failure "-n ${USER} 
-Osource-address=10.0.0.0/8"
-@@ -399,4 +399,3 @@ done
-
- rm -f $OBJ/authorized_keys_$USER $OBJ/user_ca_key* $OBJ/cert_user_key*
- rm -f $OBJ/authorized_principals_$USER
--
---
-2.24.1
-
diff --git 
a/meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch
 
b/meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch
deleted file mode 100644
index 78c493de8663..
--- 
a/meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From eae3e85322fa7c869f5822db4eda6348f2beb09e Mon Sep 17 00:00:00 2001
-From: Khem Raj 
-Date: Tue, 7 Jan 2020 16:26:45 -0800
-Subject: [PATCH] seccomp: Allow clock_gettime64() in sandbox.
-
-This helps sshd accept connections on mips platforms with
-upcoming glibc ( 2.31 )
-
-Upstream-Status: Accepted 
[https://github.com/openssh/openssh-portable/pull/161]
-Signed-off-by: Khem Raj 

- sandbox-seccomp-filter.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
-index 3ef30c9..999c46c 100644
 a/sandbox-seccomp-filter.c
-+++ b/sandbox-seccomp-filter.c
-@@ -248,6 +248,9 @@ static const struct sock_filter 

[OE-core] [PATCH] selftest: wic: Add APPEND to the optional variables list

2020-02-15 Thread Kevin Hao
The APPEND is an optional variable, so add it to the optional variables
list to make the wic selftest happy.

Signed-off-by: Kevin Hao 
---
 meta/lib/oeqa/selftest/cases/wic.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/cases/wic.py 
b/meta/lib/oeqa/selftest/cases/wic.py
index 46cd98b1934d..626a217e69fa 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -537,7 +537,8 @@ class Wic2(WicTestCase):
 # filter out optional variables
 wicvars = wicvars.difference(('DEPLOY_DIR_IMAGE', 'IMAGE_BOOT_FILES',
   'INITRD', 'INITRD_LIVE', 
'ISODIR','INITRAMFS_IMAGE',
-  'INITRAMFS_IMAGE_BUNDLE', 
'INITRAMFS_LINK_NAME'))
+  'INITRAMFS_IMAGE_BUNDLE', 
'INITRAMFS_LINK_NAME',
+  'APPEND'))
 with open(path) as envfile:
 content = dict(line.split("=", 1) for line in envfile)
 # test if variables used by wic present in the .env file
-- 
2.25.0.389.gbfdd66e72fff

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] wic: Honor APPEND

2020-02-15 Thread Kevin Hao
On Sat, Feb 15, 2020 at 08:07:34AM +, Richard Purdie wrote:
> On Thu, 2020-02-13 at 10:31 +0800, Kevin Hao wrote:
> > APPEND is used to add additional parameters to kernel by features,
> > such
> > as read-only-rootfs. So we should honor this variable when we compose
> > the kernel parameter in wic. I know we also can resolve this kind of
> > issue by using the .wks.in template introduced by commit 42e870c5ed4b
> > ("image_types.bbclass: support template .wks.in files for wic"), but
> > the
> > APPEND is needed by all the wks, it would seems pretty ridiculous to
> > me
> > to change all the .wks to .wks.in and then foist the APPEND into
> > them.
> > So the APPEND is definitely deserved to export to the wic directly.
> > 
> > [Yocto #12809]
> > 
> > Signed-off-by: Kevin Hao 
> > ---
> >  meta/classes/image_types_wic.bbclass | 2 +-
> >  scripts/lib/wic/ksparser.py  | 5 +
> >  2 files changed, 6 insertions(+), 1 deletion(-)
> 
> This seems to cause a selftest failure:
> 
> https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/688
> 
> oe-selftest -r wic.Wic2.test_image_env

The APPEND is optional, so I should add it in the optional variables list
in wic.Wic2.test_image_env. The fix is coming soon.

Thanks,
Kevin

> 
> Cheers,
> 
> Richard
> 


signature.asc
Description: PGP signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH 0/4] oeqa: Run diffoscop on saved output

2020-02-15 Thread Richard Purdie
On Tue, 2020-02-11 at 21:14 -0600, Joshua Watt wrote:
> Adds recipes to build the diffoscope tool and run it when the OEQA
> reproducible build test saves output to a local path. This should
> make
> it much easier to debug reproducible build issues from the
> autobuilder,
> since the published output can be easily viewed on the website.
> 
> Joshua Watt (4):
>   python: Add libarchive-c recipe
>   python: Add magic recipe
>   recipes-support: Add diffoscope recipe
>   oeqa: reproducible: Run diffoscope on saved output

Thanks!

The first production use:

https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20200215-t1s21q9r/packages/diff-html/

:)

I am a bit puzzled/concerned about how this hasn't been removed from
the system yet as it should have been, unless its the hashequiv problem
with timestamps continuing to cause problems. Need to fix my patch...

Cheers,

Richard

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] ✗ patchtest: failure for populate_sdk_ext: We now require python3, not python

2020-02-15 Thread Patchwork
== Series Details ==

Series: populate_sdk_ext: We now require python3, not python
Revision: 1
URL   : https://patchwork.openembedded.org/series/22674/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue Series does not apply on top of target branch 
[test_series_merge_on_head] 
  Suggested fixRebase your series on top of targeted branch
  Targeted branch  master (currently at 946ce21b10)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines: 
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] populate_sdk_ext: We now require python3, not python

2020-02-15 Thread Richard Purdie
We no longer expect a "python" binary in PATH so update the eSDK's
expectations to match. This was the only failure on autobuilder test
systems with python missing.

Signed-off-by: Richard Purdie 
---
 meta/classes/populate_sdk_ext.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/populate_sdk_ext.bbclass 
b/meta/classes/populate_sdk_ext.bbclass
index 9511e553f56..57fd29b1bbd 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -613,8 +613,8 @@ sdk_ext_preinst() {
exit 1
fi
# The relocation script used by buildtools installer requires python
-   if ! command -v python > /dev/null; then
-   echo "ERROR: The installer requires python, please install it 
first"
+   if ! command -v python3 > /dev/null; then
+   echo "ERROR: The installer requires python3, please install it 
first"
exit 1
fi
missing_utils=""
-- 
2.20.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] icu: upgrade 64.2 -> 65.1

2020-02-15 Thread Richard Purdie
On Fri, 2020-02-14 at 15:44 -0800, Wang Mingyu wrote:
> Signed-off-by: Wang Mingyu 
> ---
>  meta/recipes-support/icu/{icu_64.2.bb => icu_65.1.bb} | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>  rename meta/recipes-support/icu/{icu_64.2.bb => icu_65.1.bb} (88%)
> 
> diff --git a/meta/recipes-support/icu/icu_64.2.bb 
> b/meta/recipes-support/icu/icu_65.1.bb
> similarity index 88%
> rename from meta/recipes-support/icu/icu_64.2.bb
> rename to meta/recipes-support/icu/icu_65.1.bb
> index 44caa43..bd932d7 100644
> --- a/meta/recipes-support/icu/icu_64.2.bb
> +++ b/meta/recipes-support/icu/icu_65.1.bb
> @@ -28,8 +28,8 @@ SRC_URI = "${BASE_SRC_URI} \
>  SRC_URI_append_class-target = "\
> file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
>"
> -SRC_URI[md5sum] = "a3d18213beec454e3cdec9a3116d6b05"
> -SRC_URI[sha256sum] = 
> "627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c"
> +SRC_URI[md5sum] = "d1ff436e26cabcb28e6cb383d32d1339"
> +SRC_URI[sha256sum] = 
> "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948"
>  
>  UPSTREAM_CHECK_REGEX = "icu4c-(?P\d+(_\d+)+)-src"
>  UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases;

This breaks webkitgtk:

https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/1548
https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/272

https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1563
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1567

Cheers,

Richard

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] curious about proper use of "REALPV" re: versioning pre-release recipes

2020-02-15 Thread Robert P. J. Day
On Sat, 15 Feb 2020, Robert P. J. Day wrote:

... snip ...

>   second, the only example of that feature in all of oe-core is
> cdrtools-native_3.01.bb, which contains:
>
>   PV = "3.01a31+really3.01"
>   REALPV = "3.01"
>
> but that doesn't seem to match what is in the YP manual, as the recipe
> filename version contains just "3.01", so this doesn't seem like a
> situation where that feature is necessary. indeed, it seems like
> cdrtools-3.01 has been out since 2015:
>
>   https://sourceforge.net/projects/cdrtools/files/
>
> so it's unclear why this recipe doesn't just use 3.01.

  ack, should have mentioned that if one really wanted to update
cdrtools, there *is* a cdrtools-3.0.2a09.tar.gz, which really *would*
be a decent (instructional) example of that feature.

https://sourceforge.net/projects/cdrtools/files/alpha/cdrtools-3.02a09.tar.gz

rday
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] curious about proper use of "REALPV" re: versioning pre-release recipes

2020-02-15 Thread Robert P. J. Day


  digging through YP dev tasks manual, section 3.3.18, "Properly
Versioning Pre-Release Recipes", and the admittedly minimal usage of
that feature in oe-core doesn't really seem to bolster the
description.

  in YP manual, example for irssi recipe:

  REALPV = "0.8.16-rc1"
  PV = "0.8.15+${REALPV}"

first, there's nothing magic about the variable "REALPV", is there? it
could just as easily be, say, RDAY, or one could simply forego the use
of a variable entirely and write:

  PV = "0.8.15+0.8.16-rc1"

correct?

  second, the only example of that feature in all of oe-core is
cdrtools-native_3.01.bb, which contains:

  PV = "3.01a31+really3.01"
  REALPV = "3.01"

but that doesn't seem to match what is in the YP manual, as the recipe
filename version contains just "3.01", so this doesn't seem like a
situation where that feature is necessary. indeed, it seems like
cdrtools-3.01 has been out since 2015:

  https://sourceforge.net/projects/cdrtools/files/

so it's unclear why this recipe doesn't just use 3.01.

  finally, there are two recipes under meta-oe that *do* incorporate
the "-rc" qualifier in their recipe filename:

  recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb
  recipes-connectivity/libnet/libnet_1.2-rc3.bb

but, oddly, neither uses the feature described above. i'm just
pointing out that what one reads in that YP manual doesn't match its
actual usage in the current code base.

rday
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [OE-Core][PATCH v4 2/2] systemd: upgrade v244.1 -> v244.3

2020-02-15 Thread Alex Kiernan
Drop all systemd-boot patches and use MESON_CROSS_... configuration
instead to pick up EFI cc and objcopy. For EFI ld, we can use the
command line efi-ld option, but have to ensure it's something which can
be exec'd directly.

Commits from v244-stable:

  c4280c342bbf Revert "Support Plugable UD-PRO8 dock"
  bb598b56eb3c hibernate-resume-generator: wait "infinitely" for the resume 
device
  77c04ce5c270 hwdb: update to v245-rc1
  b4eb8848240c Fix typo in function name
  e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve 
callback/userdata instead of caching it
  83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages
  5926f9f1723f polkit: use structured initialization
  0697d0d972c8 polkit: on async pk requests, re-validate action/details
  2589995acdb2 polkit: reuse some common bus message appending code
  5b2442d5c3ec bus-polkit: rename return error parameter to ret_error
  0a19ff7004e4 shared: split out polkit stuff from bus-util.c → bus-polkit.c
  1325dfb5778d test: adapt to the new capsh format
  3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11
  3034855a5b62 presets: "disable" all passive targets by default
  c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a 
single value
  6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease
  0ed6cda28dff network: fix implicit type conversion warning by GCC-10
  f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf
  ddc5dca8a73b sd-boot: fix typo
  2bbbe9ae41ab test: Synchronize journal before reading from it
  072485d661d7 sd-bus: fix introspection bug in signal parameter names
  80af3cf5e36b efi: fix build.
  d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs
  e9904998213d loginctl: use /org/freedesktop/login1/session/auto when 
"lock-session" is called without argument
  82dd4caf014c Documentation update for x-systemd.{before,after}
  a60459764d9d man: fix typo in systemd.netdev Xfrm example
  fc053e2dfb3f timesyncd: log louder when we refuse a server due to root 
distance
  af0e630693fa resolved: drop DNSSEC root key that is not valid anymore
  ae59f1666ca6 journal: don't use startswith() on something that is not a 
NUL-terminated string
  536ef6d72bc6 test: add test for 
https://github.com/systemd/systemd/issues/14560
  b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to 
stdout/stderr by default
  a1561a08f2d5 pkgconf: add full generator paths
  e5f2d11489ec tree-wide: we forgot to destroy some bus errors
  ea67fd42067b mount: make checks on perpetual mount units more lax
  2f23c648bce4 core: never allow perpetual units to be masked
  9ba11dffb09a typo: "May modify to" -> "May modify"
  84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode
  4c2d72b53091 sysctl: downgrade message when we have no permission
  c001a285a3a2 Clarify journald.conf MaxLevelStore documentation
  45d52c7615fd logind: refuse overriding idle hint on tty sessions
  b1a0be45b4ee cgroup: update only siblings that got realized once
  e6d694254fe1 mount: mark an existing "mounting" unit from 
/proc/self/mountinfo as "just_mounted"
  d8fd38769c36 journalctl: Correctly handle combination of --reverse and 
--lines (fixes #1596)
  cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with 
--until or --since and --reverse
  1320aa92dc0a core: fix re-realization of cgroup siblings
  14164ec6bc77 core: propagate service state to socket in more load states
  c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT 
FILE LOAD PATH
  26f3a534f1ab core: be more restrictive on the dependency types we allow to be 
created transiently
  377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions
  7d5060d53994 man: fix option name
  98c03090274a Support Plugable UD-PRO8 dock
  e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat
  7057fe863007 man: fix documentation of IBM VIO device naming
  f8d1df1045be man: slightly extend documentation on difference between 
ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD
  1faf5dde4d4a boot: fix osrel parser
  65d247af1786 udev: do not use exact match of file permission
  6da978f89b48 network: lower the log-level of harmless message
  5d8a614f926c hwdb: ignore keys added in kernel 5.5
  8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb
  b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths
  945f3a231f6f systemd-analyze: fixed typo in documentation
  2c8ae283b0ee test-condition: fix group check condition
  6b48479f4582 umount: show correct error message
  faba5b2ba8c9 Revert "Drop dbus activation stub service"
  3dd98f1998f9 man: add section about user manager units
  1c80a8ced006 man: add remote-*.targets to the bootup sequence
  9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW
  561923291383 [man] note which UID ranges will get user journals
  588a23ef2684 [man] fix URL
  0130a03179f6 analyze: badness if 

[OE-core] [OE-Core][PATCH v4 1/2] meson.bbclass: Parameterise meson.cross

2020-02-15 Thread Alex Kiernan
Add MESON_CROSS_BINARIES, MESON_CROSS_PROPERTIES as a colon separated
list of meson properties which are exported into meson.cross.

Signed-off-by: Alex Kiernan 
---

Changes in v4: None
Changes in v3:
- new

Changes in v2: None

 meta/classes/meson.bbclass | 161 -
 1 file changed, 86 insertions(+), 75 deletions(-)

diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
index 06034e8b4731..e778e37d7f69 100644
--- a/meta/classes/meson.bbclass
+++ b/meta/classes/meson.bbclass
@@ -34,88 +34,99 @@ MESON_CROSS_FILE = ""
 MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross"
 MESON_CROSS_FILE_class-nativesdk = "--cross-file ${WORKDIR}/meson.cross"
 
-def meson_array(var, d):
-items = d.getVar(var).split()
-return repr(items[0] if len(items) == 1 else items)
-
-# Map our ARCH values to what Meson expects:
-# http://mesonbuild.com/Reference-tables.html#cpu-families
-def meson_cpu_family(var, d):
-import re
-arch = d.getVar(var)
-if arch == 'powerpc':
-return 'ppc'
-elif arch == 'powerpc64' or arch == 'powerpc64le':
-return 'ppc64'
-elif arch == 'armeb':
-return 'arm'
-elif arch == 'aarch64_be':
-return 'aarch64'
-elif arch == 'mipsel':
-return 'mips'
-elif arch == 'mips64el':
-return 'mips64'
-elif re.match(r"i[3-6]86", arch):
-return "x86"
-elif arch == "microblazeel":
-return "microblaze"
-else:
-return arch
-
-# Map our OS values to what Meson expects:
-# https://mesonbuild.com/Reference-tables.html#operating-system-names
-def meson_operating_system(var, d):
-os = d.getVar(var)
-if "mingw" in os:
-return "windows"
-else:
-return os
-
-def meson_endian(prefix, d):
-arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS")
-sitedata = siteinfo_data_for_machine(arch, os, d)
-if "endian-little" in sitedata:
-return "little"
-elif "endian-big" in sitedata:
-return "big"
-else:
-bb.fatal("Cannot determine endianism for %s-%s" % (arch, os))
+MESON_CROSS_BINARIES ??= "c:CC \
+  cpp:CXX \
+  ar:AR \
+  nm:NM \
+  strip:STRIP \
+  readelf:READELF"
+
+MESON_CROSS_PROPERTIES ??= "c_args:CFLAGS \
+c_link_args:LDFLAGS \
+cpp_args:CXXFLAGS \
+cpp_link_args:LDFLAGS"
 
 addtask write_config before do_configure
-do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS CXXFLAGS 
LDFLAGS"
-do_write_config() {
-# This needs to be Py to split the args into single-element lists
-cat >${WORKDIR}/meson.cross 

Re: [OE-core] [PATCH] wic: Honor APPEND

2020-02-15 Thread Richard Purdie
On Thu, 2020-02-13 at 10:31 +0800, Kevin Hao wrote:
> APPEND is used to add additional parameters to kernel by features,
> such
> as read-only-rootfs. So we should honor this variable when we compose
> the kernel parameter in wic. I know we also can resolve this kind of
> issue by using the .wks.in template introduced by commit 42e870c5ed4b
> ("image_types.bbclass: support template .wks.in files for wic"), but
> the
> APPEND is needed by all the wks, it would seems pretty ridiculous to
> me
> to change all the .wks to .wks.in and then foist the APPEND into
> them.
> So the APPEND is definitely deserved to export to the wic directly.
> 
> [Yocto #12809]
> 
> Signed-off-by: Kevin Hao 
> ---
>  meta/classes/image_types_wic.bbclass | 2 +-
>  scripts/lib/wic/ksparser.py  | 5 +
>  2 files changed, 6 insertions(+), 1 deletion(-)

This seems to cause a selftest failure:

https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/688

oe-selftest -r wic.Wic2.test_image_env

Cheers,

Richard

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] libgpg-error: upgrade 1.36 -> 1.37

2020-02-15 Thread Richard Purdie
On Fri, 2020-02-14 at 15:44 -0800, Wang Mingyu wrote:
> libgpg-error-1.36-gawk5-support.patch
> Removed since it is included in 1.37.
> 
> Signed-off-by: Wang Mingyu 

Fails on x32:

https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/1547

Cheers,

Richard

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core