[OE-core] [PATCH] e2fsprogs: upgrade 1.46.4 -> 1.46.5

2022-01-02 Thread wangmy
Remove 0001-tests-u_direct_io-expect-correct-expected-output.patch
since it is included in 1.46.5

Changelog:
=
UI and Features
---
When resizing a file system and the inode count exceeds the 2**32 maximum, if
resize2fs can successfully perform the resize by dropping the last block group,
resize2fs will do that in order to allow the file system grow operation to
succeed. For example, using the default inode ratio size of 16k, this will
allow a successful resize to 64TB - 128MB when the storage device is 64TB.

Fixes
--
Avoid a potential infinite loop in resize2fs -P when the file system is
corrupted (introduced in e2fsprogs 1.45.5).
(Addresses github issue https://github.com/tytso/e2fsprogs/issues/94)

E2fsck now updates the bg_checksum after fixing problems in the block group
descriptor, which eliminates some unnecessary messages printed or asked of the
system administrator.

Fixed some potential deadlock problems in the unix_io handler in the case of I/O
errors. The fix should also improve the performance of parallel bitmap loading.

Fixed e2fsck's fast commit handling which could result it in crashing when
trying to merge extents when there were none available to be merged.

Fix e2fsck's support of quota limit data, which could sometimes get dropped when
the quota data needs to be regenerated, or when processing the orphan list.

Fix tune2fs to correctly transfer the quota limits when converting quota files
to the internal quota inodes. Also add support for tune2fs to properly handle
the older version 0 quota files.

Fix debugfs's get_quota and list_quota commands so that the header of the report
printed by these commands correctly reflect that the units of used space is in
bytes instead of blocks.

Performance, Internal Implementation, Development Support etc.
Add some additional packages to the setup-schroot script to account for the fact
that the script can be run on older Debian distributions and so the build
dependencies might omit some packages needed to build e2fsprogs on unstable
version of Debian.

Reduce resize2fs's CPU overhead when counting the number of blocks in use which
can reduce the wall clock time for very large file systems by substantial amount

Teach libuuid to use getrandom() or getentropy() if available in favor of
reading from /dev/[u]random.

Teach libss to use libreadline.so.8 if it is available.

Update some test expect files to fix some regression tests that were broken in
e2fsprogs 1.46.4.

If the PRINT_FAILED environment variable is set, failed tests will display the
diff output to make it easier to debug test failures on autobuilders.

Fix various compiler warnings.

Update tst_getsize to use ext2fs_get_size2() to support testing devices which
are larger than 2**32 sectors.

Fixed spelling mistakes in the mke2fs.conf man page.

Update Chinese, Malay, Serbian, Spanish, Swedish, and Ukrainian translations.

Signed-off-by: Wang Mingyu 
---
 ...ct_io-expect-correct-expected-output.patch | 69 ---
 ...2fsprogs_1.46.4.bb => e2fsprogs_1.46.5.bb} |  3 +-
 2 files changed, 1 insertion(+), 71 deletions(-)
 delete mode 100644 
meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-tests-u_direct_io-expect-correct-expected-output.patch
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.46.4.bb => 
e2fsprogs_1.46.5.bb} (97%)

diff --git 
a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-tests-u_direct_io-expect-correct-expected-output.patch
 
b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-tests-u_direct_io-expect-correct-expected-output.patch
deleted file mode 100644
index f198df83eb..00
--- 
a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-tests-u_direct_io-expect-correct-expected-output.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From ea5adf259e01c790f9ba69d6fe88d691de410b6f Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin 
-Date: Sun, 22 Aug 2021 14:37:32 +0200
-Subject: [PATCH] tests/u_direct_io/expect: correct expected output
-
-This is likely the right fix, but upstream needs to confirm.
-
-Upstream-Status: Inappropriate [issue reported 
https://github.com/tytso/e2fsprogs/issues/80]
-Signed-off-by: Alexander Kanavin 

- tests/u_direct_io/expect | 16 +---
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/tests/u_direct_io/expect b/tests/u_direct_io/expect
-index b0cdc730..830cbd75 100644
 a/tests/u_direct_io/expect
-+++ b/tests/u_direct_io/expect
-@@ -19,8 +19,8 @@ Filesystem OS type:   Linux
- Inode count:  32768
- Block count:  32768
- Reserved block count: 1638
--Overhead clusters:5131
--Free blocks:  27631
-+Overhead clusters:6155
-+Free blocks:  26607
- Free inodes:  32757
- First block:  0
- Block size:   4096
-@@ -29,27 +29,29 @@ Reserved GDT blocks:  7
- Blocks per group: 32768
- Fragments per group:  32768
- Inodes per group: 32768
--Inode blocks per group:   

[OE-core] [PATCH] resolvconf: upgrade 1.87 -> 1.90

2022-01-02 Thread wangmy
Remove fix-path-for-busybox.patch
since it is included in 1.90

Changelog:
=
 * Add basic support for ifupdown2 multiple address families
(Closes: #993270).
  * Move the normalisation script into a separate file.
  * Add a build-time test to verify interface order list is correct.
  * Synchronise the interface order lists.
  * Make the usage notice more useful.
  * Embed the version number during the package build process.
  * Add --version command.
  * Add --help/-h.
  * Remove a pointless use of which(1), since we know where ifquery lives.
  * Update copyright years.

Signed-off-by: Wang Mingyu 
---
 .../resolvconf/fix-path-for-busybox.patch | 20 ---
 ...{resolvconf_1.87.bb => resolvconf_1.90.bb} |  3 +--
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 
meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch
 rename meta/recipes-connectivity/resolvconf/{resolvconf_1.87.bb => 
resolvconf_1.90.bb} (96%)

diff --git 
a/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch 
b/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch
deleted file mode 100644
index 1aead07869..00
--- a/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-
-busybox installs readlink into /usr/bin, so ensure /usr/bin
-is in the path.
-
-Upstream-Status: Submitted
-Signed-off-by: Saul Wold 
-
-Index: resolvconf-1.76/etc/resolvconf/update.d/libc
-===
 resolvconf-1.76.orig/etc/resolvconf/update.d/libc
-+++ resolvconf-1.76/etc/resolvconf/update.d/libc
-@@ -16,7 +16,7 @@
- #
- 
- set -e
--PATH=/sbin:/bin
-+PATH=/sbin:/bin:/usr/bin
- 
- [ -x /lib/resolvconf/list-records ] || exit 1
- 
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.87.bb 
b/meta/recipes-connectivity/resolvconf/resolvconf_1.90.bb
similarity index 96%
rename from meta/recipes-connectivity/resolvconf/resolvconf_1.87.bb
rename to meta/recipes-connectivity/resolvconf/resolvconf_1.90.bb
index f57abe3619..54d114d7b6 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf_1.87.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.90.bb
@@ -12,11 +12,10 @@ HOMEPAGE = "http://packages.debian.org/resolvconf;
 RDEPENDS:${PN} = "bash"
 
 SRC_URI = 
"git://salsa.debian.org/debian/resolvconf.git;protocol=https;branch=unstable \
-   file://fix-path-for-busybox.patch \
file://99_resolvconf \
"
 
-SRCREV = "1dda36d8465e335c60190c41e7185d782da1bd7b"
+SRCREV = "0a06ef77f4022f8cea2edb7c3013af5a7ddc983d"
 
 S = "${WORKDIR}/git"
 
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160111): 
https://lists.openembedded.org/g/openembedded-core/message/160111
Mute This Topic: https://lists.openembedded.org/mt/88108049/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[OE-core] [PATCH] python3-attrs: upgrade 21.2.0 -> 21.4.0

2022-01-02 Thread wangmy
Changelog:
=
Bugs fixed for this release (https://github.com/python-attrs/attrs/pull/)
Fixed the test suite on PyPy3.8 where cloudpickle does not work. #892
Fixed coverage report for projects that use attrs and don't set a --source. 
#895, #896

Signed-off-by: Wang Mingyu 
---
 .../python/{python3-attrs_21.2.0.bb => python3-attrs_21.4.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-attrs_21.2.0.bb => 
python3-attrs_21.4.0.bb} (82%)

diff --git a/meta/recipes-devtools/python/python3-attrs_21.2.0.bb 
b/meta/recipes-devtools/python/python3-attrs_21.4.0.bb
similarity index 82%
rename from meta/recipes-devtools/python/python3-attrs_21.2.0.bb
rename to meta/recipes-devtools/python/python3-attrs_21.4.0.bb
index d52237f267..d1dde29d37 100644
--- a/meta/recipes-devtools/python/python3-attrs_21.2.0.bb
+++ b/meta/recipes-devtools/python/python3-attrs_21.4.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.attrs.org/;
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d4ab25949a73fe7d4fdee93bcbdbf8ff"
 
-SRC_URI[sha256sum] = 
"ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"
+SRC_URI[sha256sum] = 
"626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"
 
 inherit pypi setuptools3
 
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160110): 
https://lists.openembedded.org/g/openembedded-core/message/160110
Mute This Topic: https://lists.openembedded.org/mt/88107937/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[OE-core] [PATCH] python3-setuptools: upgrade 59.5.0 -> 60.2.0

2022-01-02 Thread wangmy
refresh 0001-conditionally-do-not-fetch-code-by-easy_install.patch

Changes
--
 #2974: Setuptools now relies on the Python logging infrastructure to log
 messages. Instead of using distutils.log.*, use logging.getLogger(name).*.
 #2987: Sync with pypa/distutils@2def21c5d74fdd2fe7996ee4030ac145a9d751bd,
 including fix for missing get_versions attribute (#2969), more reliance
 on sysconfig from stdlib.

Misc
--
 #2962: Avoid attempting to use local distutils when the presiding version of
 Setuptools on the path doesn't have one.
 #2983: Restore 'add_shim' as the way to invoke the hook. Avoids compatibility
 issues between different versions of Setuptools with the distutils local
 implementation.

Signed-off-by: Wang Mingyu 
---
 ...01-conditionally-do-not-fetch-code-by-easy_install.patch | 6 +++---
 ...n3-setuptools_59.5.0.bb => python3-setuptools_60.2.0.bb} | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/python/{python3-setuptools_59.5.0.bb => 
python3-setuptools_60.2.0.bb} (94%)

diff --git 
a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
 
b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
index 5e2ee454da..6efef9b36c 100644
--- 
a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
+++ 
b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
@@ -1,4 +1,4 @@
-From da88c57fe03e4474ba20325edacf519e80c1d7a8 Mon Sep 17 00:00:00 2001
+From 8d9a601b5a5d572fef512d3addf8c4d7c50d012c Mon Sep 17 00:00:00 2001
 From: Hongxu Jia 
 Date: Tue, 17 Jul 2018 10:13:38 +0800
 Subject: [PATCH] conditionally do not fetch code by easy_install
@@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia 
  1 file changed, 5 insertions(+)
 
 diff --git a/setuptools/command/easy_install.py 
b/setuptools/command/easy_install.py
-index fc848d0..c04a5de 100644
+index fb34d10..217fce1 100644
 --- a/setuptools/command/easy_install.py
 +++ b/setuptools/command/easy_install.py
-@@ -642,6 +642,11 @@ class easy_install(Command):
+@@ -649,6 +649,11 @@ class easy_install(Command):
  os.path.exists(tmpdir) and rmtree(tmpdir)
  
  def easy_install(self, spec, deps=False):
diff --git a/meta/recipes-devtools/python/python3-setuptools_59.5.0.bb 
b/meta/recipes-devtools/python/python3-setuptools_60.2.0.bb
similarity index 94%
rename from meta/recipes-devtools/python/python3-setuptools_59.5.0.bb
rename to meta/recipes-devtools/python/python3-setuptools_60.2.0.bb
index 878fa08404..8748f91388 100644
--- a/meta/recipes-devtools/python/python3-setuptools_59.5.0.bb
+++ b/meta/recipes-devtools/python/python3-setuptools_60.2.0.bb
@@ -13,7 +13,7 @@ SRC_URI += "\
 file://0001-_distutils-sysconfig-append-STAGING_LIBDIR-python-sy.patch \
 "
 
-SRC_URI[sha256sum] = 
"d144f85102f999444d06f9c0e8c737fd0194f10f2f7e5fdb77573f6e2fa4fad0"
+SRC_URI[sha256sum] = 
"675fcebecb43c32eb930481abf907619137547f4336206e4d673180242e1a278"
 
 DEPENDS += "${PYTHON_PN}"
 
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160109): 
https://lists.openembedded.org/g/openembedded-core/message/160109
Mute This Topic: https://lists.openembedded.org/mt/88107936/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[OE-core] [PATCH] python3-zipp: upgrade 3.6.0 -> 3.7.0

2022-01-02 Thread wangmy
Signed-off-by: Wang Mingyu 
---
 .../python/{python3-zipp_3.6.0.bb => python3-zipp_3.7.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-zipp_3.6.0.bb => 
python3-zipp_3.7.0.bb} (84%)

diff --git a/meta/recipes-devtools/python/python3-zipp_3.6.0.bb 
b/meta/recipes-devtools/python/python3-zipp_3.7.0.bb
similarity index 84%
rename from meta/recipes-devtools/python/python3-zipp_3.6.0.bb
rename to meta/recipes-devtools/python/python3-zipp_3.7.0.bb
index c98bc7a3a4..9ce987c870 100644
--- a/meta/recipes-devtools/python/python3-zipp_3.6.0.bb
+++ b/meta/recipes-devtools/python/python3-zipp_3.7.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/jaraco/zipp;
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6"
 
-SRC_URI[sha256sum] = 
"71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832"
+SRC_URI[sha256sum] = 
"9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d"
 
 DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
 
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160108): 
https://lists.openembedded.org/g/openembedded-core/message/160108
Mute This Topic: https://lists.openembedded.org/mt/88107935/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [OE-core] [PATCH 4/6] go-runtime.inc: do not make installation set dependent on host

2022-01-02 Thread Alexander Kanavin
Thanks, I have dropped the patch.

Alex

On Sun, 2 Jan 2022 at 17:30, Alexander Kanavin via lists.openembedded.org
 wrote:

> Right, I'll take a closer look at this.
>
> Alex
>
> On Sun, 2 Jan 2022 at 13:40, Matt Madison  wrote:
>
>> On Sat, Jan 1, 2022 at 3:30 AM Alexander Kanavin 
>> wrote:
>> >
>> > This cannot be right: what we install for the target should not
>> > depend on what host it's being built on. If this was fixing
>> > some problem, there needs to be a different solution.
>>
>> IIRC, I added this because the go toolchain doesn't really do
>> host/target separation like gcc does. The runtime packages for both
>> host and target get populated during the compilation, and if the
>> target architecture matches the build host's architecture, you'd get
>> just one copy in the tree. And back then, at least, the go-runtime
>> package needed those files, so the check was there to make sure they
>> didn't get deleted just because the two architectures were the same.
>>
>> That's the way things were 5 years ago, though, and the toolchain has
>> changed a lot since then. It might not be needed any more.
>>
>> -Matt
>>
>> >
>> > Signed-off-by: Alexander Kanavin 
>> > ---
>> >  meta/recipes-devtools/go/go-runtime.inc | 6 ++
>> >  1 file changed, 2 insertions(+), 4 deletions(-)
>> >
>> > diff --git a/meta/recipes-devtools/go/go-runtime.inc
>> b/meta/recipes-devtools/go/go-runtime.inc
>> > index a08d44dd3a..106017bd89 100644
>> > --- a/meta/recipes-devtools/go/go-runtime.inc
>> > +++ b/meta/recipes-devtools/go/go-runtime.inc
>> > @@ -43,10 +43,8 @@ do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin
>> ${B}/pkg"
>> >  do_install() {
>> > install -d ${D}${libdir}/go/src
>> > cp --preserve=mode,timestamps -R ${B}/pkg ${D}${libdir}/go/
>> > -   if [ "${BUILD_GOTUPLE}" != "${TARGET_GOTUPLE}" ]; then
>> > -   rm -rf ${D}${libdir}/go/pkg/${BUILD_GOTUPLE}
>> > -   rm -rf ${D}${libdir}/go/pkg/obj/${BUILD_GOTUPLE}
>> > -   fi
>> > +   rm -rf ${D}${libdir}/go/pkg/${BUILD_GOTUPLE}
>> > +   rm -rf ${D}${libdir}/go/pkg/obj/${BUILD_GOTUPLE}
>> > rm -rf ${D}${libdir}/go/pkg/tool
>> > rm -rf ${D}${libdir}/go/pkg/obj
>> > rm -rf ${D}${libdir}/go/pkg/bootstrap
>> > --
>> > 2.20.1
>> >
>> >
>> >
>> >
>>
>
> 
>
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160107): 
https://lists.openembedded.org/g/openembedded-core/message/160107
Mute This Topic: https://lists.openembedded.org/mt/88071321/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[OE-core] How to put meta-openAmp in using imx7d-pico with Hardknott

2022-01-02 Thread Neuber Sousa

Hi,


I stay trying RPMsng in Yocto. In my case, I have imx7d-pico with 
hardknott now.



I need your help to do pingpong aplication in RPMsng with or without 
meta-openAmp.



https://github.com/OpenAMP/meta-openamp/issues/15




-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160106): 
https://lists.openembedded.org/g/openembedded-core/message/160106
Mute This Topic: https://lists.openembedded.org/mt/88095456/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [OE-core] [PATCH 4/6] go-runtime.inc: do not make installation set dependent on host

2022-01-02 Thread Alexander Kanavin
Right, I'll take a closer look at this.

Alex

On Sun, 2 Jan 2022 at 13:40, Matt Madison  wrote:

> On Sat, Jan 1, 2022 at 3:30 AM Alexander Kanavin 
> wrote:
> >
> > This cannot be right: what we install for the target should not
> > depend on what host it's being built on. If this was fixing
> > some problem, there needs to be a different solution.
>
> IIRC, I added this because the go toolchain doesn't really do
> host/target separation like gcc does. The runtime packages for both
> host and target get populated during the compilation, and if the
> target architecture matches the build host's architecture, you'd get
> just one copy in the tree. And back then, at least, the go-runtime
> package needed those files, so the check was there to make sure they
> didn't get deleted just because the two architectures were the same.
>
> That's the way things were 5 years ago, though, and the toolchain has
> changed a lot since then. It might not be needed any more.
>
> -Matt
>
> >
> > Signed-off-by: Alexander Kanavin 
> > ---
> >  meta/recipes-devtools/go/go-runtime.inc | 6 ++
> >  1 file changed, 2 insertions(+), 4 deletions(-)
> >
> > diff --git a/meta/recipes-devtools/go/go-runtime.inc
> b/meta/recipes-devtools/go/go-runtime.inc
> > index a08d44dd3a..106017bd89 100644
> > --- a/meta/recipes-devtools/go/go-runtime.inc
> > +++ b/meta/recipes-devtools/go/go-runtime.inc
> > @@ -43,10 +43,8 @@ do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin
> ${B}/pkg"
> >  do_install() {
> > install -d ${D}${libdir}/go/src
> > cp --preserve=mode,timestamps -R ${B}/pkg ${D}${libdir}/go/
> > -   if [ "${BUILD_GOTUPLE}" != "${TARGET_GOTUPLE}" ]; then
> > -   rm -rf ${D}${libdir}/go/pkg/${BUILD_GOTUPLE}
> > -   rm -rf ${D}${libdir}/go/pkg/obj/${BUILD_GOTUPLE}
> > -   fi
> > +   rm -rf ${D}${libdir}/go/pkg/${BUILD_GOTUPLE}
> > +   rm -rf ${D}${libdir}/go/pkg/obj/${BUILD_GOTUPLE}
> > rm -rf ${D}${libdir}/go/pkg/tool
> > rm -rf ${D}${libdir}/go/pkg/obj
> > rm -rf ${D}${libdir}/go/pkg/bootstrap
> > --
> > 2.20.1
> >
> >
> > 
> >
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160105): 
https://lists.openembedded.org/g/openembedded-core/message/160105
Mute This Topic: https://lists.openembedded.org/mt/88071321/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[OE-core] OE-core CVE metrics for honister on Sun 02 Jan 2022 05:30:01 AM HST

2022-01-02 Thread Steve Sakoman
Branch: honister

New this week: 1 CVEs
CVE-2021-4136: vim 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-4136 *

Removed this week: 0 CVEs

Full list:  Found 21 unpatched CVEs
CVE-2016-20012: openssh 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-20012 *
CVE-2019-12067: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-12067 *
CVE-2020-18974: nasm:nasm-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-18974 *
CVE-2020-35503: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-35503 *
CVE-2021-20255: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-20255 *
CVE-2021-31879: wget 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-31879 *
CVE-2021-3507: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3507 *
CVE-2021-36976: libarchive:libarchive-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-36976 *
CVE-2021-3713: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3713 *
CVE-2021-3974: vim 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3974 *
CVE-2021-3984: vim 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3984 *
CVE-2021-4019: vim 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-4019 *
CVE-2021-4069: vim 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-4069 *
CVE-2021-4136: vim 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-4136 *
CVE-2021-42762: webkitgtk 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-42762 *
CVE-2021-43400: bluez5 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-43400 *
CVE-2021-45078: 
binutils:binutils-cross-testsuite:binutils-cross-x86_64:binutils-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-45078 *
CVE-2021-45085: epiphany 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-45085 *
CVE-2021-45086: epiphany 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-45086 *
CVE-2021-45087: epiphany 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-45087 *
CVE-2021-45088: epiphany 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-45088 *

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160104): 
https://lists.openembedded.org/g/openembedded-core/message/160104
Mute This Topic: https://lists.openembedded.org/mt/88093102/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[OE-core] OE-core CVE metrics for hardknott on Sun 02 Jan 2022 05:00:01 AM HST

2022-01-02 Thread Steve Sakoman
Branch: hardknott

New this week: 1 CVEs
CVE-2021-4136: vim 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-4136 *

Removed this week: 0 CVEs

Full list:  Found 58 unpatched CVEs
CVE-2013-0340: expat:expat-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-0340 *
CVE-2016-20012: openssh 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-20012 *
CVE-2019-12067: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-12067 *
CVE-2020-18974: nasm:nasm-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-18974 *
CVE-2020-29623: webkitgtk 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-29623 *
CVE-2020-35503: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-35503 *
CVE-2021-1765: webkitgtk 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1765 *
CVE-2021-1789: webkitgtk 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1789 *
CVE-2021-1799: webkitgtk 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1799 *
CVE-2021-1801: webkitgtk 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1801 *
CVE-2021-1870: webkitgtk 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1870 *
CVE-2021-20196: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-20196 *
CVE-2021-20255: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-20255 *
CVE-2021-22922: curl:curl-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-22922 *
CVE-2021-22923: curl:curl-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-22923 *
CVE-2021-22945: curl:curl-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-22945 *
CVE-2021-22946: curl:curl-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-22946 *
CVE-2021-22947: curl:curl-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-22947 *
CVE-2021-27645: glibc 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-27645 *
CVE-2021-31879: wget 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-31879 *
CVE-2021-33574: glibc 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-33574 *
CVE-2021-33833: connman 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-33833 *
CVE-2021-33928: libsolv 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-33928 *
CVE-2021-33929: libsolv 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-33929 *
CVE-2021-33930: libsolv 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-33930 *
CVE-2021-33938: libsolv 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-33938 *
CVE-2021-3445: libdnf 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3445 *
CVE-2021-3507: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3507 *
CVE-2021-36976: libarchive 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-36976 *
CVE-2021-3713: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3713 *
CVE-2021-38604: glibc 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-38604 *
CVE-2021-3973: vim 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3973 *
CVE-2021-3974: vim 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3974 *
CVE-2021-3984: vim 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3984 *
CVE-2021-4019: vim 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-4019 *
CVE-2021-40528: libgcrypt:libgcrypt-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-40528 *
CVE-2021-4069: vim 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-4069 *
CVE-2021-4136: vim 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-4136 *
CVE-2021-42373: busybox 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-42373 *
CVE-2021-42374: busybox 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-42374 *
CVE-2021-42375: busybox 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-42375 *
CVE-2021-42376: busybox 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-42376 *
CVE-2021-42377: busybox 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-42377 *
CVE-2021-42378: busybox 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-42378 *
CVE-2021-42379: busybox 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-42379 *
CVE-2021-42380: busybox 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-42380 *
CVE-2021-42381: busybox 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-42381 *
CVE-2021-42382: busybox 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-42382 *
CVE-2021-42383: busybox 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-42383 *
CVE-2021-42384: busybox 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-42384 *
CVE-2021-42385: busybox 

[OE-core] OE-core CVE metrics for dunfell on Sun 02 Jan 2022 04:30:01 AM HST

2022-01-02 Thread Steve Sakoman
Branch: dunfell

New this week: 1 CVEs
CVE-2021-4136: vim 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-4136 *

Removed this week: 6 CVEs
CVE-2016-20012: openssh 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-20012 *
CVE-2020-36254: dropbear 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-36254 *
CVE-2021-0129: bluez5 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-0129 *
CVE-2021-40491: inetutils 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-40491 *
CVE-2021-4069: vim 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-4069 *
CVE-2021-41617: openssh 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-41617 *

Full list:  Found 70 unpatched CVEs
CVE-2018-21232: re2c:re2c-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2018-21232 *
CVE-2019-12067: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-12067 *
CVE-2020-13253: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-13253 *
CVE-2020-13754: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-13754 *
CVE-2020-13791: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-13791 *
CVE-2020-14372: grub:grub-efi:grub-efi-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-14372 *
CVE-2020-15469: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-15469 *
CVE-2020-15705: grub:grub-efi:grub-efi-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-15705 *
CVE-2020-15859: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-15859 *
CVE-2020-15900: ghostscript-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-15900 *
CVE-2020-16590: 
binutils:binutils-cross-testsuite:binutils-cross-x86_64:binutils-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-16590 *
CVE-2020-16591: 
binutils:binutils-cross-testsuite:binutils-cross-x86_64:binutils-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-16591 *
CVE-2020-16599: 
binutils:binutils-cross-testsuite:binutils-cross-x86_64:binutils-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-16599 *
CVE-2020-17380: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-17380 *
CVE-2020-18974: nasm:nasm-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-18974 *
CVE-2020-25632: grub:grub-efi:grub-efi-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-25632 *
CVE-2020-25647: grub:grub-efi:grub-efi-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-25647 *
CVE-2020-25742: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-25742 *
CVE-2020-25743: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-25743 *
CVE-2020-27661: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-27661 *
CVE-2020-27749: grub:grub-efi:grub-efi-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-27749 *
CVE-2020-27779: grub:grub-efi:grub-efi-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-27779 *
CVE-2020-27821: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-27821 *
CVE-2020-29510: go:go-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-29510 *
CVE-2020-29623: webkitgtk 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-29623 *
CVE-2020-35503: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-35503 *
CVE-2020-35504: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-35504 *
CVE-2020-35505: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-35505 *
CVE-2020-35506: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-35506 *
CVE-2020-3810: apt 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-3810 *
CVE-2021-1765: webkitgtk 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1765 *
CVE-2021-1789: webkitgtk 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1789 *
CVE-2021-1799: webkitgtk 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1799 *
CVE-2021-1801: webkitgtk 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1801 *
CVE-2021-1870: webkitgtk 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-1870 *
CVE-2021-20225: grub:grub-efi:grub-efi-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-20225 *
CVE-2021-20233: grub:grub-efi:grub-efi-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-20233 *
CVE-2021-20255: qemu:qemu-native:qemu-system-native 

[OE-core] OE-core CVE metrics for master on Sun 02 Jan 2022 04:00:01 AM HST

2022-01-02 Thread Steve Sakoman
Branch: master

New this week: 1 CVEs
CVE-2021-4136: vim 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-4136 *

Removed this week: 0 CVEs

Full list:  Found 10 unpatched CVEs
CVE-2019-12067: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-12067 *
CVE-2020-18974: nasm:nasm-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-18974 *
CVE-2021-20255: qemu:qemu-native:qemu-system-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-20255 *
CVE-2021-36976: libarchive:libarchive-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-36976 *
CVE-2021-4136: vim 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-4136 *
CVE-2021-45078: 
binutils:binutils-cross-testsuite:binutils-cross-x86_64:binutils-native 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-45078 *
CVE-2021-45085: epiphany 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-45085 *
CVE-2021-45086: epiphany 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-45086 *
CVE-2021-45087: epiphany 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-45087 *
CVE-2021-45088: epiphany 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-45088 *

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160101): 
https://lists.openembedded.org/g/openembedded-core/message/160101
Mute This Topic: https://lists.openembedded.org/mt/88091413/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [OE-core] [PATCH 4/6] go-runtime.inc: do not make installation set dependent on host

2022-01-02 Thread Matt Madison
On Sat, Jan 1, 2022 at 3:30 AM Alexander Kanavin  wrote:
>
> This cannot be right: what we install for the target should not
> depend on what host it's being built on. If this was fixing
> some problem, there needs to be a different solution.

IIRC, I added this because the go toolchain doesn't really do
host/target separation like gcc does. The runtime packages for both
host and target get populated during the compilation, and if the
target architecture matches the build host's architecture, you'd get
just one copy in the tree. And back then, at least, the go-runtime
package needed those files, so the check was there to make sure they
didn't get deleted just because the two architectures were the same.

That's the way things were 5 years ago, though, and the toolchain has
changed a lot since then. It might not be needed any more.

-Matt

>
> Signed-off-by: Alexander Kanavin 
> ---
>  meta/recipes-devtools/go/go-runtime.inc | 6 ++
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-devtools/go/go-runtime.inc 
> b/meta/recipes-devtools/go/go-runtime.inc
> index a08d44dd3a..106017bd89 100644
> --- a/meta/recipes-devtools/go/go-runtime.inc
> +++ b/meta/recipes-devtools/go/go-runtime.inc
> @@ -43,10 +43,8 @@ do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin ${B}/pkg"
>  do_install() {
> install -d ${D}${libdir}/go/src
> cp --preserve=mode,timestamps -R ${B}/pkg ${D}${libdir}/go/
> -   if [ "${BUILD_GOTUPLE}" != "${TARGET_GOTUPLE}" ]; then
> -   rm -rf ${D}${libdir}/go/pkg/${BUILD_GOTUPLE}
> -   rm -rf ${D}${libdir}/go/pkg/obj/${BUILD_GOTUPLE}
> -   fi
> +   rm -rf ${D}${libdir}/go/pkg/${BUILD_GOTUPLE}
> +   rm -rf ${D}${libdir}/go/pkg/obj/${BUILD_GOTUPLE}
> rm -rf ${D}${libdir}/go/pkg/tool
> rm -rf ${D}${libdir}/go/pkg/obj
> rm -rf ${D}${libdir}/go/pkg/bootstrap
> --
> 2.20.1
>
>
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160100): 
https://lists.openembedded.org/g/openembedded-core/message/160100
Mute This Topic: https://lists.openembedded.org/mt/88071321/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-