[OE-core] [question] rpm: nss problem on arm32be
Hi All: When I use rpm on arm32be, I found a Header SHA1 digest problem as follows: # rpm -qpi test-manual-1.2.3-20181012.noarch.rpm error: test-manual-1.2.3-20181012.noarch.rpm: Header SHA1 digest: BAD (Expected f1deb7dc4a10742d88ccd1e967dbc62ae45095a5 !=4ad9d7dad6d70d6086eefec62612ad5d77f2fe81) => this value is wrong error: test-manual-1.2.3-20181012.noarch.rpm: not an rpm package (or package manifest) I found it is caused by the hash of nss, if I rebuild rpm with beecropt, this problem will be fix. diff --git a/meta-ubinux/recipes-contrib/rpm/rpm_4.14.1.bb b/meta-ubinux/recipes-contrib/rpm/rpm_4.14.1.bb EXTRA_OECONF_append = " --without-lua --enable-python" +EXTRA_OECONF_append_armeb = " --with-crypto=beecrypt" EXTRA_OECONF_append_libc-musl = " --disable-nls" but I don't know why rpm with nss can't work well on arm32be, does anyone know the reason about it? -- Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] libgcrypt: upgrade 1.8.3 -> 1.8.4
Signed-off-by: Hongxu Jia
---
.../libgcrypt/{libgcrypt_1.8.3.bb => libgcrypt_1.8.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/libgcrypt/{libgcrypt_1.8.3.bb =>
libgcrypt_1.8.4.bb} (93%)
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.8.3.bb
b/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb
similarity index 93%
rename from meta/recipes-support/libgcrypt/libgcrypt_1.8.3.bb
rename to meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb
index cefa836..fda68a2 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.8.3.bb
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb
@@ -22,8 +22,8 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \
file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \
file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \
"
-SRC_URI[md5sum] = "3139c2402e844985a67fb288a930534d"
-SRC_URI[sha256sum] =
"66ec90be036747602f2b48f98312361a9180c97c68a690a5f376fa0f67d0af7c"
+SRC_URI[md5sum] = "fbfdaebbbc6d7e5fbbf6ffdb3e139573"
+SRC_URI[sha256sum] =
"f638143a0672628fde0cad745e9b14deb85dffb175709cacc1f4fe24b93f2227"
BINCONFIG = "${bindir}/libgcrypt-config"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4] Upgrade elfutils/gnupg/libgcrypt/ncurses
The following changes since commit fc5418e7bbdecfb27bafe595084e0fd0f991a388:
meta/icecc.bbclass: Update system blacklists (2018-11-21 11:48:18 +)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib hongxu/upgrade-20181109
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=hongxu/upgrade-20181109
Hongxu Jia (4):
elfutils: 0.174 -> 0.175
gnupg: upgrade 2.2.10 -> 2.2.11
libgcrypt: upgrade 1.8.3 -> 1.8.4
ncurses: upgrade 6.1 -> 6.1+20181013
...ses_6.1+20180714.bb => ncurses_6.1+20181013.bb} | 2 +-
.../{elfutils_0.174.bb => elfutils_0.175.bb} | 24 +-
...01-arlib-Check-that-sh_entsize-isn-t-zero.patch | 36 ---
...Sanity-check-partial-core-file-data-reads.patch | 60
.../0001-size-Handle-recursive-ELF-ar-files.patch | 40 ---
.../files/0005-fix-a-stack-usage-warning.patch | 35 ---
...de-alternatives-for-glibc-assumptions-hel.patch | 14 +-
...ferences-between-mips-machine-identifiers.patch | 5 +-
.../files/debian/0001-fix-gcc7-ftbfs.patch | 57
.../debian/0001-testsuite-ignore-elflint.patch | 57
...-support-for-mips64-abis-in-mips_retval.c.patch | 5 +-
.../0003-Add-mips-n64-relocation-format-hack.patch | 41 ++-
.../{0001-arm_backend.patch => arm_backend.diff} | 342 ++---
...1-disable_werror.patch => disable_werror.patch} | 29 +-
.../{0001-hppa_backend.patch => hppa_backend.diff} | 174 +--
.../elfutils/files/debian/hurd_path.patch | 16 +
.../elfutils/files/debian/kfreebsd_path.patch | 19 ++
.../{0001-mips_backend.patch => mips_backend.diff} | 139 -
...1-mips_readelf_w.patch => mips_readelf_w.patch} | 26 +-
...c-use-a-custom-value-for-the-location-of-.patch | 4 +-
meta/recipes-support/gnupg/gnupg/relocate.patch| 2 +-
.../gnupg/{gnupg_2.2.10.bb => gnupg_2.2.11.bb} | 4 +-
.../{libgcrypt_1.8.3.bb => libgcrypt_1.8.4.bb} | 4 +-
23 files changed, 379 insertions(+), 756 deletions(-)
rename meta/recipes-core/ncurses/{ncurses_6.1+20180714.bb =>
ncurses_6.1+20181013.bb} (86%)
rename meta/recipes-devtools/elfutils/{elfutils_0.174.bb => elfutils_0.175.bb}
(76%)
delete mode 100644
meta/recipes-devtools/elfutils/files/0001-arlib-Check-that-sh_entsize-isn-t-zero.patch
delete mode 100644
meta/recipes-devtools/elfutils/files/0001-libdwfl-Sanity-check-partial-core-file-data-reads.patch
delete mode 100644
meta/recipes-devtools/elfutils/files/0001-size-Handle-recursive-ELF-ar-files.patch
delete mode 100644
meta/recipes-devtools/elfutils/files/0005-fix-a-stack-usage-warning.patch
delete mode 100644
meta/recipes-devtools/elfutils/files/debian/0001-fix-gcc7-ftbfs.patch
delete mode 100644
meta/recipes-devtools/elfutils/files/debian/0001-testsuite-ignore-elflint.patch
rename meta/recipes-devtools/elfutils/files/debian/{0001-arm_backend.patch =>
arm_backend.diff} (85%)
rename meta/recipes-devtools/elfutils/files/debian/{0001-disable_werror.patch
=> disable_werror.patch} (46%)
rename meta/recipes-devtools/elfutils/files/debian/{0001-hppa_backend.patch =>
hppa_backend.diff} (90%)
create mode 100644 meta/recipes-devtools/elfutils/files/debian/hurd_path.patch
create mode 100644
meta/recipes-devtools/elfutils/files/debian/kfreebsd_path.patch
rename meta/recipes-devtools/elfutils/files/debian/{0001-mips_backend.patch =>
mips_backend.diff} (91%)
rename meta/recipes-devtools/elfutils/files/debian/{0001-mips_readelf_w.patch
=> mips_readelf_w.patch} (48%)
rename meta/recipes-support/gnupg/{gnupg_2.2.10.bb => gnupg_2.2.11.bb} (92%)
rename meta/recipes-support/libgcrypt/{libgcrypt_1.8.3.bb =>
libgcrypt_1.8.4.bb} (93%)
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] gnupg: upgrade 2.2.10 -> 2.2.11
Signed-off-by: Hongxu Jia
---
.../0001-configure.ac-use-a-custom-value-for-the-location-of-.patch | 4 ++--
meta/recipes-support/gnupg/gnupg/relocate.patch | 2 +-
meta/recipes-support/gnupg/{gnupg_2.2.10.bb => gnupg_2.2.11.bb} | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-support/gnupg/{gnupg_2.2.10.bb => gnupg_2.2.11.bb} (92%)
diff --git
a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
index 26ac99e..ab0b6dc 100644
---
a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
+++
b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
@@ -1,4 +1,4 @@
-From e30c1d3f3bb40bfaa83f768b8651f587c9d17e6f Mon Sep 17 00:00:00 2001
+From 5f38f1276a3651c30bddc508122da2e7d2d3ca92 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin
Date: Mon, 22 Jan 2018 18:00:21 +0200
Subject: [PATCH] configure.ac: use a custom value for the location of
@@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index f77317f..749fcaa 100644
+index 8c80377..a66d393 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1841,7 +1841,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch
b/meta/recipes-support/gnupg/gnupg/relocate.patch
index 616f32a..860f7f1 100644
--- a/meta/recipes-support/gnupg/gnupg/relocate.patch
+++ b/meta/recipes-support/gnupg/gnupg/relocate.patch
@@ -1,4 +1,4 @@
-From 5a8258dde5ad17b4a53463d7184cf782a7594977 Mon Sep 17 00:00:00 2001
+From 1eaf630343cc77d8b5d41d0b0a3551fa193c5fcf Mon Sep 17 00:00:00 2001
From: Ross Burton
Date: Wed, 19 Sep 2018 14:44:40 +0100
Subject: [PATCH] Allow the environment to override where gnupg looks for its
diff --git a/meta/recipes-support/gnupg/gnupg_2.2.10.bb
b/meta/recipes-support/gnupg/gnupg_2.2.11.bb
similarity index 92%
rename from meta/recipes-support/gnupg/gnupg_2.2.10.bb
rename to meta/recipes-support/gnupg/gnupg_2.2.11.bb
index fba2fdf..d259ed5 100644
--- a/meta/recipes-support/gnupg/gnupg_2.2.10.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.2.11.bb
@@ -19,8 +19,8 @@ SRC_URI_append_class-native = "
file://0001-configure.ac-use-a-custom-value-for-
file://relocate.patch"
-SRC_URI[md5sum] = "3ae8bd6246367602e72571f7a6588bcd"
-SRC_URI[sha256sum] =
"799dd37a86a1448732e339bd20440f4f5ee6e69755f6fd7a73ee8af30840c915"
+SRC_URI[md5sum] = "e23a896d634e8b81681314780f5158a4"
+SRC_URI[sha256sum] =
"496c3e123ef53f35436ddccca58e82acaa901ca4e21174e77386c0cea0c49cd9"
EXTRA_OECONF = "--disable-ldap \
--disable-ccid-driver \
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] ncurses: upgrade 6.1 -> 6.1+20181013
Signed-off-by: Hongxu Jia
---
.../ncurses/{ncurses_6.1+20180714.bb => ncurses_6.1+20181013.bb}| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-core/ncurses/{ncurses_6.1+20180714.bb =>
ncurses_6.1+20181013.bb} (86%)
diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20180714.bb
b/meta/recipes-core/ncurses/ncurses_6.1+20181013.bb
similarity index 86%
rename from meta/recipes-core/ncurses/ncurses_6.1+20180714.bb
rename to meta/recipes-core/ncurses/ncurses_6.1+20181013.bb
index b072869..b462b14 100644
--- a/meta/recipes-core/ncurses/ncurses_6.1+20180714.bb
+++ b/meta/recipes-core/ncurses/ncurses_6.1+20181013.bb
@@ -5,7 +5,7 @@ SRC_URI += "file://0001-tic-hang.patch \
file://config.cache \
"
# commit id corresponds to the revision in package version
-SRCREV = "3740e18875f16dfe126484869882fb15c3fd1aea"
+SRCREV = "7a97a7f937762ba342d5b2fd7cd090885a809835"
S = "${WORKDIR}/git"
EXTRA_OECONF += "--with-abi-version=5"
UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] elfutils: 0.174 -> 0.175
- Drop backport CVE patches
0001-libdwfl-Sanity-check-partial-core-file-data-reads.patch
0001-size-Handle-recursive-ELF-ar-files.patch
0001-arlib-Check-that-sh_entsize-isn-t-zero.patch
- Drop patches that upstream has fixed
0005-fix-a-stack-usage-warning.patch [9a74c19 backends: ppc use define
instead of const for size of dwarf_regs array.]
- Update debian patches to 0.175
- Rebase local patch to 0.175
0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch
Signed-off-by: Hongxu Jia
---
.../{elfutils_0.174.bb => elfutils_0.175.bb} | 24 +-
...01-arlib-Check-that-sh_entsize-isn-t-zero.patch | 36 ---
...Sanity-check-partial-core-file-data-reads.patch | 60
.../0001-size-Handle-recursive-ELF-ar-files.patch | 40 ---
.../files/0005-fix-a-stack-usage-warning.patch | 35 ---
...de-alternatives-for-glibc-assumptions-hel.patch | 14 +-
...ferences-between-mips-machine-identifiers.patch | 5 +-
.../files/debian/0001-fix-gcc7-ftbfs.patch | 57
.../debian/0001-testsuite-ignore-elflint.patch | 57
...-support-for-mips64-abis-in-mips_retval.c.patch | 5 +-
.../0003-Add-mips-n64-relocation-format-hack.patch | 41 ++-
.../{0001-arm_backend.patch => arm_backend.diff} | 342 ++---
...1-disable_werror.patch => disable_werror.patch} | 29 +-
.../{0001-hppa_backend.patch => hppa_backend.diff} | 174 +--
.../elfutils/files/debian/hurd_path.patch | 16 +
.../elfutils/files/debian/kfreebsd_path.patch | 19 ++
.../{0001-mips_backend.patch => mips_backend.diff} | 139 -
...1-mips_readelf_w.patch => mips_readelf_w.patch} | 26 +-
18 files changed, 371 insertions(+), 748 deletions(-)
rename meta/recipes-devtools/elfutils/{elfutils_0.174.bb => elfutils_0.175.bb}
(76%)
delete mode 100644
meta/recipes-devtools/elfutils/files/0001-arlib-Check-that-sh_entsize-isn-t-zero.patch
delete mode 100644
meta/recipes-devtools/elfutils/files/0001-libdwfl-Sanity-check-partial-core-file-data-reads.patch
delete mode 100644
meta/recipes-devtools/elfutils/files/0001-size-Handle-recursive-ELF-ar-files.patch
delete mode 100644
meta/recipes-devtools/elfutils/files/0005-fix-a-stack-usage-warning.patch
delete mode 100644
meta/recipes-devtools/elfutils/files/debian/0001-fix-gcc7-ftbfs.patch
delete mode 100644
meta/recipes-devtools/elfutils/files/debian/0001-testsuite-ignore-elflint.patch
rename meta/recipes-devtools/elfutils/files/debian/{0001-arm_backend.patch =>
arm_backend.diff} (85%)
rename meta/recipes-devtools/elfutils/files/debian/{0001-disable_werror.patch
=> disable_werror.patch} (46%)
rename meta/recipes-devtools/elfutils/files/debian/{0001-hppa_backend.patch =>
hppa_backend.diff} (90%)
create mode 100644 meta/recipes-devtools/elfutils/files/debian/hurd_path.patch
create mode 100644
meta/recipes-devtools/elfutils/files/debian/kfreebsd_path.patch
rename meta/recipes-devtools/elfutils/files/debian/{0001-mips_backend.patch =>
mips_backend.diff} (91%)
rename meta/recipes-devtools/elfutils/files/debian/{0001-mips_readelf_w.patch
=> mips_readelf_w.patch} (48%)
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.174.bb
b/meta/recipes-devtools/elfutils/elfutils_0.175.bb
similarity index 76%
rename from meta/recipes-devtools/elfutils/elfutils_0.174.bb
rename to meta/recipes-devtools/elfutils/elfutils_0.175.bb
index c30265b..b0b9ddc 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.174.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.175.bb
@@ -6,36 +6,32 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
DEPENDS = "libtool bzip2 zlib virtual/libintl"
DEPENDS_append_libc-musl = " argp-standalone fts "
# The Debian patches below are from:
-#
http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz
+#
http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.175-1.debian.tar.xz
SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
file://0001-dso-link-change.patch \
file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \
file://0003-fixheadercheck.patch \
file://0004-Disable-the-test-to-convert-euc-jp.patch \
- file://0005-fix-a-stack-usage-warning.patch \
file://0006-Fix-build-on-aarch64-musl.patch \
file://0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch \
file://0001-libasm-may-link-with-libbz2-if-found.patch \
file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \
- file://0001-libdwfl-Sanity-check-partial-core-file-data-reads.patch
\
- file://0001-size-Handle-recursive-ELF-ar-files.patch \
- file://0001-arlib-Check-that-sh_entsize-isn-t-zero.patch \
- file://debian/0001-hppa_backend.patch \
- file://debian/0001-arm_backend.patch \
- file://debian/0001-mips_backend.patch \
-
[OE-core] [PATCH] mdadm: improve the run-ptest
From: Mingli Yu
* There are 120+ cases under ${libdir}/mdadm/ptest/tests,
but the test will break if one test fails as
below logic in run-ptest.
./test &>./test.log
That's to say, the tests after the failed test
have no chance to run with the current logic.
To guarantee all the tests can run even one
of the tests fails, the option --keep-going
should be added.
* Refactor the test report to make the report
more detailed and more common
Signed-off-by: Mingli Yu
---
meta/recipes-extended/mdadm/files/run-ptest | 25 ++---
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-extended/mdadm/files/run-ptest
b/meta/recipes-extended/mdadm/files/run-ptest
index 5b276090f5..234f97376a 100644
--- a/meta/recipes-extended/mdadm/files/run-ptest
+++ b/meta/recipes-extended/mdadm/files/run-ptest
@@ -1,10 +1,19 @@
#!/bin/sh
-./test &>./test.log
-if [ $? -eq 0 ]
-then
- echo "PASS: mdadm"
- rm test.log
-else
- echo "FAIL: mdadm"
-fi
+LOG="$(pwd)/test.log"
+# make the test continue to execute even one fail
+./test --keep-going 2>&1|tee ${LOG}
+# translate the test report
+# "tests/18imsm-r10_4d-takeover-r0_2d... succeeded" -> "PASS:
tests/18imsm-r10_4d-takeover-r0_2d"
+# "tests/19raid6repair... FAILED - see //log for details" -> "FAIL:
tests/19raid6repair"
+sed -i -e '/succeeded/ s/^/PASS: /' -e '/FAILED/ s/^/FAIL: /' ${LOG}
+sed -i -e 's/... FAILED//g' -e 's/... succeeded//g' ${LOG}
+passed=`grep PASS: ${LOG}|wc -l`
+failed=`grep FAIL: ${LOG}|wc -l`
+all=$((passed + failed))
+
+( echo "=== Test Summary ==="
+ echo "TOTAL: ${all}"
+ echo "PASSED: ${passed}"
+ echo "FAILED: ${failed}"
+) | tee -a /${LOG}
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] oe-selftest : Unset SANITY_TESTED_DISTROS bugzilla: 11933
Hi, unset the SANITY_TESTED_DISTROS in the function _add_layer_libs() file b/meta/lib/oeqa/selftest/context.py And added function remove_variables() which is called in final: self.remove_variables() the function will comment the the unset SANITY_TESTED_DISTROS in local.conf Thanks && Best Regards Srikanth B 0001-oe-selftest-Unset-SANITY_TESTED_DISTROS.patch Description: 0001-oe-selftest-Unset-SANITY_TESTED_DISTROS.patch -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 1/2] sstate.bbclass: Only remove sstate file when task is existed
This can improve the performance a lot for "bitbake
-ccleansstate" when there are a lot of sstate files.
For example:
* Before
$ bitbake quilt-native -ccleansstate
- Check log.do_cleansstate:
Removing
/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_package.tgz*
Removing
/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_package_qa.tgz*
Removing
/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_package_write_rpm.tgz*
Removing
/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_packagedata.tgz*
Removing /sstate-cache/*/sstate:quilt-native::0.65:r0::3:*_populate_lic.tgz*
Removing
/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_populate_sysroot.tgz*
There are no package tasks for quilt-native, so the first 4 lines doesn't
make any sense, but the glob pattern "sstate-cache/*/*" is very time
consuming when there are no disk caches. E.g., I have more than 600,000
sstate files:
- Without disk caches
# echo 3 >/proc/sys/vm/drop_caches
$ time python3 -c 'import glob;
glob.glob("/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_package.tgz*")'
real4m32.583s
user0m5.768s
sys 0m12.892s
- With disk caches (e.g., run it in the second time)
$ time python3 -c 'import glob;
glob.glob("/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_package.tgz*")'
real0m5.128s
user0m2.772s
sys 0m2.308s
So the 4 removing *package* commands cost more than 20s or 272s in theory.
* After
$ bitbake quilt-native -ccleansstate
- Check log.do_cleansstate:
Removing /sstate-cache/*/sstate:quilt-native::0.65:r0::3:*_populate_lic.tgz*
Removing
/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_populate_sysroot.tgz*
We can see that it saved 20s or 272s in theory.
Signed-off-by: Robert Yang
---
meta/classes/sstate.bbclass | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index efb0096..9f059a0 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -423,8 +423,9 @@ def sstate_clean_cachefile(ss, d):
import oe.path
sstatepkgfile = d.getVar('SSTATE_PATHSPEC') + "*_" + ss['task'] + ".tgz*"
-bb.note("Removing %s" % sstatepkgfile)
-oe.path.remove(sstatepkgfile)
+if d.getVarFlag('do_%s' % ss['task'], 'task'):
+bb.note("Removing %s" % sstatepkgfile)
+oe.path.remove(sstatepkgfile)
def sstate_clean_cachefiles(d):
for task in (d.getVar('SSTATETASKS') or "").split():
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 2/2] sstate.bbclass: set SSTATE_EXTRAPATHWILDCARD explicitly
The glob.glob("/sstate/*/*/") is very time consuming, set
SSTATE_EXTRAPATHWILDCARD explicity to avoid that. This can save a lot of time
when there are many sstate files.
For example, I have more than 600,000 sstate files:
* Before
- Without disk caches
$ time python3 -c 'import glob;
glob.glob("/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_populate_sysroot.tgz*")'
real4m32.583s
user0m5.768s
sys 0m12.892s
- With disk caches
$ time python3 -c 'import glob;
glob.glob("/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_populate_sysroot.tgz*")'
real0m4.111s
user0m2.348s
sys 0m1.756s
* After
$ time python3 -c 'import glob;
glob.glob("/sstate-cache.bak/universal/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_populate_sysroot.tgz*")'
- Without disk caches:
real0m7.928s
user0m0.172s
sys 0m0.124s
- With disk caches:
real0m0.131s
user0m0.088s
sys 0m0.044s
We can see that it saves about 3.8s with disk caches, and saves about 264s
without disk caches.
Signed-off-by: Robert Yang
---
meta/classes/sstate.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 9f059a0..8b48ab4 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -101,7 +101,7 @@ python () {
if bb.data.inherits_class('native', d) or
bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross', d):
d.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/")
d.setVar('BB_HASHFILENAME', "True ${SSTATE_PKGSPEC} ${SSTATE_SWSPEC}")
-d.setVar('SSTATE_EXTRAPATHWILDCARD', "*/")
+d.setVar('SSTATE_EXTRAPATHWILDCARD', "${NATIVELSBSTRING}/")
unique_tasks = sorted(set((d.getVar('SSTATETASKS') or "").split()))
d.setVar('SSTATETASKS', " ".join(unique_tasks))
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 0/2] Improve performance for native/cross/crosssdk's cleansstate
* V2 - Teach sstate.bbclass rather than edit nopackages.bbclass to fix the problem. * V1 These 2 patches can improve performance a lot for native/cross/crosssdk's cleansstate: This test is based on more than 600,000 sstate files * Without disk caches # echo 3 >/proc/sys/vm/drop_caches $ bitbake -p $ time bitbake quilt-native -ccleansstate - Before: real4m53.815s user0m0.820s sys 0m0.128s - After real0m58.483s user0m0.744s sys 0m0.108s Saved 293 - 58 = 235s (80% improvement) * With disk caches (26.6s -> 5.8s, 78% improvement) $ bitbake -p $ time bitbake quilt-native -ccleansstate - Before: real0m26.682s user0m0.748s sys 0m0.088s - After real0m5.846s user0m0.716s sys 0m0.116s Saved 26.6 - 5.8 = 20.8s (78% improvement) == I have another idea is put sstate files into the directory named by the recipe, e.g.: sstate-cache/quilt-native/sstate:quilt-native::0.65:r0::3:773341447192feb6c1519cace0e6be35_populate_lic.tgz sstate-cache/quilt-native/sstate:quilt-native::0.65:r0::3:773341447192feb6c1519cace0e6be35_populate_lic.tgz.siginfo sstate-cache/quilt-native/sstate:quilt-native::0.65:r0::3:ab4a82a07b10926bb42d2f37242413c7_patch.tgz.siginfo sstate-cache/quilt-native/sstate:quilt-native::0.65:r0::3:e8a4c952a66942653e36f289eaf68ca5_fetch.tgz.siginfo sstate-cache/quilt-native/sstate:quilt-native::0.65:r0::3:fd35240c437cefa66e24cfe65d3fb335_unpack.tgz.siginfo This can make it easier to manage sstate files, and can reduce the load of glob.glob(), currently, the remove command is something like: $ rm -f glob.glob(sstate-cache/*/sstate:foo.*bar.*) If we put them into recipe named directory, then we can run: $ rm -f glob.glob(sstate-cache//sstate:foo.*bar.*) Which should be faster, what's your opinion, please ? The following changes since commit fc5418e7bbdecfb27bafe595084e0fd0f991a388: meta/icecc.bbclass: Update system blacklists (2018-11-21 11:48:18 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/sstate http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/sstate Robert Yang (2): sstate.bbclass: Only remove sstate file when task is existed sstate.bbclass: set SSTATE_EXTRAPATHWILDCARD explicitly meta/classes/sstate.bbclass | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/9] busybox: ship a symlink farm for ptest
From: Ross Burton
Ship a symlink farm for busybox, which correctly considers SUID
split. This ensures that all utilities used in busybox's test cases
will first use that ones that are provided by busybox.
Modify run-ptest to prepend the directory to PATH, and also change
variable name from current_dir to current_path, as the former is
a little misleading. `readlink -f $0' gets a path to the current
script instead of the current directory.
Signed-off-by: Chen Qi
---
meta/recipes-core/busybox/busybox.inc | 14 ++
meta/recipes-core/busybox/files/run-ptest | 5 +++--
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox.inc
b/meta/recipes-core/busybox/busybox.inc
index b45d2b6..68ba8c6 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -352,6 +352,20 @@ do_install_ptest () {
cp -r ${B}/testsuite ${D}${PTEST_PATH}/
cp ${B}/.config ${D}${PTEST_PATH}/
ln -s /bin/busybox ${D}${PTEST_PATH}/busybox
+
+ mkdir ${D}${PTEST_PATH}/bin
+ if [ "${BUSYBOX_SPLIT_SUID}" = "1" ]; then
+ while read link; do
+ ln -s ${base_bindir}/busybox.suid
${D}${PTEST_PATH}/bin/$(basename $link)
+ done <${D}${sysconfdir}/busybox.links.suid
+ while read link; do
+ ln -s ${base_bindir}/busybox.nosuid
${D}${PTEST_PATH}/bin/$(basename $link)
+ done <${D}${sysconfdir}/busybox.links.nosuid
+ else
+ while read link; do
+ ln -s ${base_bindir}/busybox
${D}${PTEST_PATH}/bin/$(basename $link)
+ done <${D}${sysconfdir}/busybox.links
+ fi
}
inherit update-alternatives
diff --git a/meta/recipes-core/busybox/files/run-ptest
b/meta/recipes-core/busybox/files/run-ptest
index 8b99bed..b19e5b5 100644
--- a/meta/recipes-core/busybox/files/run-ptest
+++ b/meta/recipes-core/busybox/files/run-ptest
@@ -1,7 +1,8 @@
#!/bin/sh
-current_dir=$(readlink -f $0)
-export bindir=$(dirname $current_dir)
+current_path=$(readlink -f $0)
+export bindir=$(dirname $current_path)
+export PATH=$bindir/bin:$PATH
export SKIP_KNOWN_BUGS=1
cd testsuite || exit 1
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/9] busybox: fix du-l-works test case
64 + 64 + 16 = 144K
144 + sizeof_a_directory >= 145
So fix to use 145 instead of 144.
Signed-off-by: Chen Qi
---
...-du-l-works-fix-to-use-145-instead-of-144.patch | 32 ++
meta/recipes-core/busybox/busybox_1.29.2.bb| 1 +
2 files changed, 33 insertions(+)
create mode 100644
meta/recipes-core/busybox/busybox/0001-du-l-works-fix-to-use-145-instead-of-144.patch
diff --git
a/meta/recipes-core/busybox/busybox/0001-du-l-works-fix-to-use-145-instead-of-144.patch
b/meta/recipes-core/busybox/busybox/0001-du-l-works-fix-to-use-145-instead-of-144.patch
new file mode 100644
index 000..bb5f753
--- /dev/null
+++
b/meta/recipes-core/busybox/busybox/0001-du-l-works-fix-to-use-145-instead-of-144.patch
@@ -0,0 +1,32 @@
+From c69feb2fdb755d6db34d0eb0a9e9994386c15e3a Mon Sep 17 00:00:00 2001
+From: Chen Qi
+Date: Wed, 14 Nov 2018 15:19:57 +0800
+Subject: [PATCH] du-l-works: fix to use 145 instead of 144
+
+64 + 64 + 16 = 144
+144 + size_of_directory >= 145
+So fix to use 145 instead of 144.
+
+Upstream-Status: Submitted
[http://lists.busybox.net/pipermail/busybox/2018-November/086836.html]
+
+Signed-off-by: Chen Qi
+---
+ testsuite/du/du-l-works | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testsuite/du/du-l-works b/testsuite/du/du-l-works
+index af87345..575064a 100644
+--- a/testsuite/du/du-l-works
b/testsuite/du/du-l-works
+@@ -5,7 +5,7 @@ cd du.testdir
+ dd if=/dev/zero of=file1 bs=1k count=64 2>/dev/null
+ ln file1 file1.1
+ dd if=/dev/zero of=file2 bs=1k count=16 2>/dev/null
+-test x"`busybox du -l .`" = x"144 ." \
++test x"`busybox du -l .`" = x"145 ." \
+ -o x"`busybox du -l .`" = x"146 ." \
+ -o x"`busybox du -l .`" = x"148 ." \
+ -o x"`busybox du -l .`" = x"152 ." \
+--
+2.7.4
+
diff --git a/meta/recipes-core/busybox/busybox_1.29.2.bb
b/meta/recipes-core/busybox/busybox_1.29.2.bb
index 98767f0..f38db2a 100644
--- a/meta/recipes-core/busybox/busybox_1.29.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.29.2.bb
@@ -43,6 +43,7 @@ SRC_URI =
"http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://makefile-libbb-race.patch \
file://0001-testsuite-check-uudecode-before-using-it.patch \
file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch
\
+ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \
"
SRC_URI_append_libc-musl = " file://musl.cfg "
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 9/9] base-files: default hostname to localhost
Previously we default hostname to be ${MACHINE}, but there's no entry
in /etc/hosts, and `hostname -f' command fails. So change it to
'localhost'.
Signed-off-by: Chen Qi
---
meta/recipes-core/base-files/base-files_3.0.14.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb
b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 6e75652..3a0eb4e 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -60,13 +60,13 @@ conffiles = "${sysconfdir}/debian_version
${sysconfdir}/host.conf \
${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \
${sysconfdir}/default"
-# By default the hostname is the machine name. If the hostname is unset then a
+# By default the hostname is 'localhost'. If the hostname is unset then a
# /etc/hostname file isn't written, suitable for environments with dynamic
# hostnames.
#
# The hostname can be changed outside of this recipe by using
# hostname_pn-base-files = "my-host-name".
-hostname = "${MACHINE}"
+hostname = "localhost"
BASEFILESISSUEINSTALL ?= "do_install_basefilesissue"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/9] busybox: check CONFIG_DESKTOP before using 'od -t' in test case
The '-t' option support for 'od' is enabled by CONFIG_DESKTOP.
So check it before using it in test cases.
Signed-off-by: Chen Qi
---
...te-check-CONFIG_DESKTOP-before-using-od-t.patch | 83 ++
meta/recipes-core/busybox/busybox_1.29.2.bb| 1 +
2 files changed, 84 insertions(+)
create mode 100644
meta/recipes-core/busybox/busybox/0001-testsuite-check-CONFIG_DESKTOP-before-using-od-t.patch
diff --git
a/meta/recipes-core/busybox/busybox/0001-testsuite-check-CONFIG_DESKTOP-before-using-od-t.patch
b/meta/recipes-core/busybox/busybox/0001-testsuite-check-CONFIG_DESKTOP-before-using-od-t.patch
new file mode 100644
index 000..9b96eee
--- /dev/null
+++
b/meta/recipes-core/busybox/busybox/0001-testsuite-check-CONFIG_DESKTOP-before-using-od-t.patch
@@ -0,0 +1,83 @@
+From b09db631e77c63ebe733c69b00108f043f1f1d85 Mon Sep 17 00:00:00 2001
+From: Chen Qi
+Date: Wed, 21 Nov 2018 10:00:29 +0800
+Subject: [PATCH] testsuite: check CONFIG_DESKTOP before using 'od -t'
+
+The '-t' option for od is enabled by CONFIG_DESKTOP. So
+check this config before using 'od -t' in test cases.
+
+Upstream-Status: Submitted
[http://lists.busybox.net/pipermail/busybox/2018-November/086895.html]
+
+Signed-off-by: Chen Qi
+---
+ testsuite/echo/echo-prints-dash| 1 +
+ testsuite/echo/echo-prints-non-opts| 1 +
+ testsuite/echo/echo-prints-slash-zero | 2 +-
+ testsuite/echo/echo-prints-slash_00041 | 2 +-
+ testsuite/echo/echo-prints-slash_0041 | 2 +-
+ testsuite/echo/echo-prints-slash_041 | 2 +-
+ testsuite/echo/echo-prints-slash_41| 2 +-
+ 7 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/testsuite/echo/echo-prints-dash b/testsuite/echo/echo-prints-dash
+index ddcdbad..f1f31a0 100644
+--- a/testsuite/echo/echo-prints-dash
b/testsuite/echo/echo-prints-dash
+@@ -1 +1,2 @@
++# FEATURE: CONFIG_DESKTOP
+ test "`busybox echo - | od -t x1 | head -n 1`" = "000 2d 0a"
+diff --git a/testsuite/echo/echo-prints-non-opts
b/testsuite/echo/echo-prints-non-opts
+index c7d1e20..4e642a1 100644
+--- a/testsuite/echo/echo-prints-non-opts
b/testsuite/echo/echo-prints-non-opts
+@@ -1 +1,2 @@
++# FEATURE: CONFIG_DESKTOP
+ test "`busybox echo -neEZ | od -t x1 | head -n 1`" = "000 2d 6e 65 45 5a
0a"
+diff --git a/testsuite/echo/echo-prints-slash-zero
b/testsuite/echo/echo-prints-slash-zero
+index d97ed8e..948f899 100644
+--- a/testsuite/echo/echo-prints-slash-zero
b/testsuite/echo/echo-prints-slash-zero
+@@ -1,3 +1,3 @@
+-# FEATURE: CONFIG_FEATURE_FANCY_ECHO
++# FEATURE: CONFIG_FEATURE_FANCY_ECHO CONFIG_DESKTOP
+
+ test "`busybox echo -e -n 'msg\n\0' | od -t x1 | head -n 1`" = "000 6d 73
67 0a 00"
+diff --git a/testsuite/echo/echo-prints-slash_00041
b/testsuite/echo/echo-prints-slash_00041
+index 9cffabd..7ea217b 100644
+--- a/testsuite/echo/echo-prints-slash_00041
b/testsuite/echo/echo-prints-slash_00041
+@@ -1,3 +1,3 @@
+-# FEATURE: CONFIG_FEATURE_FANCY_ECHO
++# FEATURE: CONFIG_FEATURE_FANCY_ECHO CONFIG_DESKTOP
+
+ test "`busybox echo -ne '\00041z' | od -t x1 | head -n 1`" = "000 04 31
7a"
+diff --git a/testsuite/echo/echo-prints-slash_0041
b/testsuite/echo/echo-prints-slash_0041
+index b07429d..941faca 100644
+--- a/testsuite/echo/echo-prints-slash_0041
b/testsuite/echo/echo-prints-slash_0041
+@@ -1,3 +1,3 @@
+-# FEATURE: CONFIG_FEATURE_FANCY_ECHO
++# FEATURE: CONFIG_FEATURE_FANCY_ECHO CONFIG_DESKTOP
+
+ test "`busybox echo -ne '\0041z' | od -t x1 | head -n 1`" = "000 21 7a"
+diff --git a/testsuite/echo/echo-prints-slash_041
b/testsuite/echo/echo-prints-slash_041
+index 1d70cec..60cbfca 100644
+--- a/testsuite/echo/echo-prints-slash_041
b/testsuite/echo/echo-prints-slash_041
+@@ -1,3 +1,3 @@
+-# FEATURE: CONFIG_FEATURE_FANCY_ECHO
++# FEATURE: CONFIG_FEATURE_FANCY_ECHO CONFIG_DESKTOP
+
+ test "`busybox echo -ne '\041z' | od -t x1 | head -n 1`" = "000 21 7a"
+diff --git a/testsuite/echo/echo-prints-slash_41
b/testsuite/echo/echo-prints-slash_41
+index 6d8999b..afd7c36 100644
+--- a/testsuite/echo/echo-prints-slash_41
b/testsuite/echo/echo-prints-slash_41
+@@ -1,3 +1,3 @@
+-# FEATURE: CONFIG_FEATURE_FANCY_ECHO
++# FEATURE: CONFIG_FEATURE_FANCY_ECHO CONFIG_DESKTOP
+
+ test "`busybox echo -ne '\41z' | od -t x1 | head -n 1`" = "000 21 7a"
+--
+2.7.4
+
diff --git a/meta/recipes-core/busybox/busybox_1.29.2.bb
b/meta/recipes-core/busybox/busybox_1.29.2.bb
index f38db2a..66049bd 100644
--- a/meta/recipes-core/busybox/busybox_1.29.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.29.2.bb
@@ -44,6 +44,7 @@ SRC_URI =
"http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://0001-testsuite-check-uudecode-before-using-it.patch \
file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch
\
file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \
+ file://0001-testsuite-check-CONFIG_DESKTOP-before-using-od-t.patch \
"
SRC_URI_append_libc-musl = "
[OE-core] [PATCH 5/9] busybox: use example.org instead of google.com in wget test case
Use example.org to ensure it's always reachible.
Signed-off-by: Chen Qi
---
...e-use-www.example.org-for-wget-test-cases.patch | 62 ++
meta/recipes-core/busybox/busybox_1.29.2.bb| 1 +
2 files changed, 63 insertions(+)
create mode 100644
meta/recipes-core/busybox/busybox/0001-testsuite-use-www.example.org-for-wget-test-cases.patch
diff --git
a/meta/recipes-core/busybox/busybox/0001-testsuite-use-www.example.org-for-wget-test-cases.patch
b/meta/recipes-core/busybox/busybox/0001-testsuite-use-www.example.org-for-wget-test-cases.patch
new file mode 100644
index 000..7ba0f77
--- /dev/null
+++
b/meta/recipes-core/busybox/busybox/0001-testsuite-use-www.example.org-for-wget-test-cases.patch
@@ -0,0 +1,62 @@
+From 03acf460990dfcf6e52b298301b348b9504460a8 Mon Sep 17 00:00:00 2001
+From: Chen Qi
+Date: Tue, 13 Nov 2018 13:51:42 +0800
+Subject: [PATCH] testsuite: use www.example.org for wget test cases
+
+Use example.org instead of google.com to make sure it's
+always reachible.
+
+Upstream-Status: Submitted
[http://lists.busybox.net/pipermail/busybox/2018-November/086835.html]
+
+Signed-off-by: Chen Qi
+---
+ testsuite/wget/wget--O-overrides--P| 2 +-
+ testsuite/wget/wget-handles-empty-path | 2 +-
+ testsuite/wget/wget-retrieves-google-index | 2 +-
+ testsuite/wget/wget-supports--P| 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/testsuite/wget/wget--O-overrides--P
b/testsuite/wget/wget--O-overrides--P
+index 40a3a96..490d743 100644
+--- a/testsuite/wget/wget--O-overrides--P
b/testsuite/wget/wget--O-overrides--P
+@@ -1,5 +1,5 @@
+ test x"$SKIP_INTERNET_TESTS" != x"" && exit
+
+ mkdir foo
+-busybox wget -q -O index.html -P foo http://www.google.com/
++busybox wget -q -O index.html -P foo http://www.example.org/
+ test -s index.html
+diff --git a/testsuite/wget/wget-handles-empty-path
b/testsuite/wget/wget-handles-empty-path
+index 01d60bd..1802db6 100644
+--- a/testsuite/wget/wget-handles-empty-path
b/testsuite/wget/wget-handles-empty-path
+@@ -1,3 +1,3 @@
+ test x"$SKIP_INTERNET_TESTS" != x"" && exit
+
+-busybox wget http://www.google.com
++busybox wget http://www.example.org
+diff --git a/testsuite/wget/wget-retrieves-google-index
b/testsuite/wget/wget-retrieves-google-index
+index f9dbb8b..fc801d4 100644
+--- a/testsuite/wget/wget-retrieves-google-index
b/testsuite/wget/wget-retrieves-google-index
+@@ -1,4 +1,4 @@
+ test x"$SKIP_INTERNET_TESTS" != x"" && exit
+
+-busybox wget -q -O foo http://www.google.com/
++busybox wget -q -O foo http://www.example.org/
+ test -s foo
+diff --git a/testsuite/wget/wget-supports--P b/testsuite/wget/wget-supports--P
+index bfe4ac4..4ff2fe0 100644
+--- a/testsuite/wget/wget-supports--P
b/testsuite/wget/wget-supports--P
+@@ -1,5 +1,5 @@
+ test x"$SKIP_INTERNET_TESTS" != x"" && exit
+
+ mkdir foo
+-busybox wget -q -P foo http://www.google.com/
++busybox wget -q -P foo http://www.example.org/
+ test -s foo/index.html
+--
+2.7.4
+
diff --git a/meta/recipes-core/busybox/busybox_1.29.2.bb
b/meta/recipes-core/busybox/busybox_1.29.2.bb
index a63fa82..98767f0 100644
--- a/meta/recipes-core/busybox/busybox_1.29.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.29.2.bb
@@ -42,6 +42,7 @@ SRC_URI =
"http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://rcK \
file://makefile-libbb-race.patch \
file://0001-testsuite-check-uudecode-before-using-it.patch \
+ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch
\
"
SRC_URI_append_libc-musl = " file://musl.cfg "
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/9] bzip2: extend alternatives list to include bzip2
bzip2 could also be provided by busybox. So extend the alternatives
list to include bzip2.
Signed-off-by: Chen Qi
---
meta/recipes-extended/bzip2/bzip2_1.0.6.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
index 025f45c..7d04e30 100644
--- a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
@@ -29,7 +29,7 @@ CFLAGS_append = " -fPIC -fpic -Winline -fno-strength-reduce
-D_FILE_OFFSET_BITS=
inherit autotools update-alternatives ptest relative_symlinks
ALTERNATIVE_PRIORITY = "100"
-ALTERNATIVE_${PN} = "bunzip2 bzcat"
+ALTERNATIVE_${PN} = "bunzip2 bzcat bzip2"
#install binaries to bzip2-native under sysroot for replacement-native
EXTRA_OECONF_append_class-native = " --bindir=${STAGING_BINDIR_NATIVE}/${PN}"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/9] busybox: enable bzip2 by default
bunzip2 is enabled by default, but bzip2 is not. This is kind of strange, and it also causes busybox's ptest failure regarding bunzip2, as bunzip2's test case needs bzip2 command. Signed-off-by: Chen Qi --- meta/recipes-core/busybox/busybox/defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig index 32213c0..0c40990 100644 --- a/meta/recipes-core/busybox/busybox/defconfig +++ b/meta/recipes-core/busybox/busybox/defconfig @@ -150,7 +150,7 @@ CONFIG_LZCAT=y # CONFIG_UNXZ is not set CONFIG_XZCAT=y # CONFIG_XZ is not set -# CONFIG_BZIP2 is not set +CONFIG_BZIP2=y CONFIG_FEATURE_BZIP2_DECOMPRESS=y CONFIG_CPIO=y # CONFIG_FEATURE_CPIO_O is not set -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/9] busybox: check uudecode before using it in test case
Check uudecode before using it in test case to avoid unexpected failure.
Signed-off-by: Chen Qi
---
...-testsuite-check-uudecode-before-using-it.patch | 45 ++
meta/recipes-core/busybox/busybox_1.29.2.bb| 1 +
2 files changed, 46 insertions(+)
create mode 100644
meta/recipes-core/busybox/busybox/0001-testsuite-check-uudecode-before-using-it.patch
diff --git
a/meta/recipes-core/busybox/busybox/0001-testsuite-check-uudecode-before-using-it.patch
b/meta/recipes-core/busybox/busybox/0001-testsuite-check-uudecode-before-using-it.patch
new file mode 100644
index 000..2d9856f
--- /dev/null
+++
b/meta/recipes-core/busybox/busybox/0001-testsuite-check-uudecode-before-using-it.patch
@@ -0,0 +1,45 @@
+From 85f164ec427fecbae24140b3c93acbbe2ba1c817 Mon Sep 17 00:00:00 2001
+From: Chen Qi
+Date: Tue, 13 Nov 2018 11:27:01 +0800
+Subject: [PATCH] testsuite: check uudecode before using it
+
+The unzip and tar test cases use uudecode command, so also
+check it via optional function.
+
+Upstream-Status: Submitted
[http://lists.busybox.net/pipermail/busybox/2018-November/086833.html]
+
+Signed-off-by: Chen Qi
+---
+ testsuite/tar.tests | 2 +-
+ testsuite/unzip.tests | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/testsuite/tar.tests b/testsuite/tar.tests
+index d71a349..8c88567 100755
+--- a/testsuite/tar.tests
b/testsuite/tar.tests
+@@ -336,7 +336,7 @@ SKIP=
+ cd .. || exit 1; rm -rf tar.tempdir 2>/dev/null
+
+ mkdir tar.tempdir && cd tar.tempdir || exit 1
+-optional FEATURE_SEAMLESS_BZ2 FEATURE_TAR_AUTODETECT LS
++optional FEATURE_SEAMLESS_BZ2 FEATURE_TAR_AUTODETECT LS UUDECODE
+ testing "Symlink attack: create symlink and then write through it" '\
+ exec 2>&1
+ uudecode -o input && tar xvf input; echo $?
+diff --git a/testsuite/unzip.tests b/testsuite/unzip.tests
+index af53de9..3b45ece 100755
+--- a/testsuite/unzip.tests
b/testsuite/unzip.tests
+@@ -31,7 +31,7 @@ rmdir foo
+ rm foo.zip
+
+ # File containing some damaged encrypted stream
+-optional FEATURE_UNZIP_CDF
++optional FEATURE_UNZIP_CDF UUDECODE
+ testing "unzip (bad archive)" "uudecode; unzip bad.zip 2>&1; echo \$?" \
+ "Archive: bad.zip
+ inflating: ]3j½r«IK-%Ix
+--
+2.7.4
+
diff --git a/meta/recipes-core/busybox/busybox_1.29.2.bb
b/meta/recipes-core/busybox/busybox_1.29.2.bb
index df3ea59..a63fa82 100644
--- a/meta/recipes-core/busybox/busybox_1.29.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.29.2.bb
@@ -41,6 +41,7 @@ SRC_URI =
"http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://rcS \
file://rcK \
file://makefile-libbb-race.patch \
+ file://0001-testsuite-check-uudecode-before-using-it.patch \
"
SRC_URI_append_libc-musl = " file://musl.cfg "
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/9] busybox: add zip to RDEPENDS of ptest package
busybox's unzip test case requires zip command. However, busybox
itself does not provide one. So add zip as a runtime dependency.
Signed-off-by: Chen Qi
---
meta/recipes-core/busybox/busybox.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-core/busybox/busybox.inc
b/meta/recipes-core/busybox/busybox.inc
index b8d8858..b45d2b6 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -53,6 +53,9 @@ RDEPENDS_${PN} = "${@["",
"busybox-inittab"][(d.getVar('VIRTUAL-RUNTIME_init_man
inherit cml1 systemd update-rc.d ptest
+# busybox's unzip test case needs zip command, which busybox itself does not
provide
+RDEPENDS_${PN}-ptest = "zip"
+
# internal helper
def busybox_cfg(feature, tokens, cnf, rem):
if type(tokens) == type(""):
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 0/9] Fixes for busybox ptest
Changes in V2: * fix bzip2 recipe to extend its alternatives list * check CONFIG_DESKTOP beforing using 'od -t' in test cases Changes in V3: * add a symlink farm for busybox ptest to ensure utilities provided by busybox are used in ptest * default hostname to 'localhost' * drop the patch to remove three test cases for hostname The following changes since commit 6b84ac788321b24cfa2e6a883806eb3f3198254b: ref-manual: Updated list of supported Linux Distros: (2018-11-22 12:20:52 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib ChenQi/busybox-ptest http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/busybox-ptest Chen Qi (8): busybox: enable bzip2 by default bzip2: extend alternatives list to include bzip2 busybox: add zip to RDEPENDS of ptest package busybox: check uudecode before using it in test case busybox: use example.org instead of google.com in wget test case busybox: fix du-l-works test case busybox: check CONFIG_DESKTOP before using 'od -t' in test case base-files: default hostname to localhost Ross Burton (1): busybox: ship a symlink farm for ptest meta/recipes-core/base-files/base-files_3.0.14.bb | 4 +- meta/recipes-core/busybox/busybox.inc | 17 + ...-du-l-works-fix-to-use-145-instead-of-144.patch | 32 + ...te-check-CONFIG_DESKTOP-before-using-od-t.patch | 83 ++ ...-testsuite-check-uudecode-before-using-it.patch | 45 ...e-use-www.example.org-for-wget-test-cases.patch | 62 meta/recipes-core/busybox/busybox/defconfig| 2 +- meta/recipes-core/busybox/busybox_1.29.2.bb| 4 ++ meta/recipes-core/busybox/files/run-ptest | 5 +- meta/recipes-extended/bzip2/bzip2_1.0.6.bb | 2 +- 10 files changed, 250 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-core/busybox/busybox/0001-du-l-works-fix-to-use-145-instead-of-144.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-testsuite-check-CONFIG_DESKTOP-before-using-od-t.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-testsuite-check-uudecode-before-using-it.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-testsuite-use-www.example.org-for-wget-test-cases.patch -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] python: add tk support
Ping.
Thanks,
On 2018年11月14日 17:38, mingli...@windriver.com wrote:
From: Mingli Yu
Add support to enable tk via PACKGECONFIG.
before the patch:
# python
Python 2.7.15 (default, Nov 8 2018, 04:53:50)
[GCC 8.2.0] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>> import Tkinter
Traceback (most recent call last):
File "", line 1, in
File "/usr/lib64/python2.7/lib-tk/Tkinter.py", line 39, in
import _tkinter # If this fails your Python may not be configured for Tk
ImportError: No module named _tkinter
>>>
After the patch, if enable tk in PACKGECONFIG, then
# python
Python 2.7.15 (default, Oct 25 2018, 08:12:45)
[GCC 8.2.0] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>> import Tkinter
>>>
Signed-off-by: Mingli Yu
---
meta/recipes-devtools/python/python/python2-manifest.json | 3 ++-
meta/recipes-devtools/python/python_2.7.15.bb | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/python/python/python2-manifest.json
b/meta/recipes-devtools/python/python/python2-manifest.json
index 260fa6f..a9f3924 100644
--- a/meta/recipes-devtools/python/python/python2-manifest.json
+++ b/meta/recipes-devtools/python/python/python2-manifest.json
@@ -966,6 +966,7 @@
"core"
],
"files": [
+"${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_tkinter.so",
"${libdir}/python2.7/lib-tk"
]
},
@@ -1043,4 +1044,4 @@
"${libdir}/python2.7/lib-dynload/zlib.so"
]
}
-}
\ No newline at end of file
+}
diff --git a/meta/recipes-devtools/python/python_2.7.15.bb
b/meta/recipes-devtools/python/python_2.7.15.bb
index dd969d8..6a60aa7 100644
--- a/meta/recipes-devtools/python/python_2.7.15.bb
+++ b/meta/recipes-devtools/python/python_2.7.15.bb
@@ -21,7 +21,7 @@ SRC_URI += "\
file://setuptweaks.patch \
file://check-if-target-is-64b-not-host.patch \
file://search_db_h_in_inc_dirs_and_avoid_warning.patch \
- file://avoid_warning_about_tkinter.patch \
+ ${@bb.utils.contains('PACKAGECONFIG', 'tk', '',
'file://avoid_warning_about_tkinter.patch', d)} \
file://avoid_warning_for_sunos_specific_module.patch \
file://python-2.7.3-remove-bsdb-rpath.patch \
file://run-ptest \
@@ -45,6 +45,7 @@ EXTRA_OECONF += "ac_cv_file__dev_ptmx=yes
ac_cv_file__dev_ptc=no"
PACKAGECONFIG ??= "bdb"
PACKAGECONFIG[bdb] = ",,db"
+PACKAGECONFIG[tk] = ",,tk"
do_configure_append() {
rm -f ${S}/Makefile.orig
@@ -172,7 +173,7 @@ RDEPENDS_${PN}-modules += "${PN}-misc"
# ptest
RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip"
-
+RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk', '',
d)}"
# catch manpage
PACKAGES += "${PN}-man"
FILES_${PN}-man = "${datadir}/man"
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] python3: add tk support
Ping.
Thanks,
On 2018年11月14日 17:36, mingli...@windriver.com wrote:
From: Mingli Yu
Add support to enable tk via PACKAGECONFIG.
before this patch:
# python3
Python 3.5.6 (default, Nov 8 2018, 04:53:45)
[GCC 8.2.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import tkinter
Traceback (most recent call last):
File "", line 1, in
File "/usr/lib64/python3.5/tkinter/__init__.py", line 35, in
import _tkinter # If this fails your Python may not be configured for Tk
ImportError: No module named '_tkinter'
>>>
After this patch, if enable tk in PACKAGECONFIG, then
# python3
Python 3.5.6 (default, Nov 8 2018, 03:15:52)
[GCC 8.2.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import tkinter
>>>
Signed-off-by: Mingli Yu
---
meta/recipes-devtools/python/python3-native_3.5.6.bb | 3 ++-
meta/recipes-devtools/python/python3/python3-manifest.json | 1 +
meta/recipes-devtools/python/python3_3.5.6.bb | 5 +++--
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/python/python3-native_3.5.6.bb
b/meta/recipes-devtools/python/python3-native_3.5.6.bb
index d5953cf..1e98c03 100644
--- a/meta/recipes-devtools/python/python3-native_3.5.6.bb
+++ b/meta/recipes-devtools/python/python3-native_3.5.6.bb
@@ -12,7 +12,7 @@ file://130-readline-setup.patch \
file://150-fix-setupterm.patch \
file://python-3.3-multilib.patch \
file://03-fix-tkinter-detection.patch \
-file://avoid_warning_about_tkinter.patch \
+${@bb.utils.contains('PACKAGECONFIG', 'tk', '',
'file://avoid_warning_about_tkinter.patch', d)} \
file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \
file://sysroot-include-headers.patch \
file://unixccompiler.patch \
@@ -28,6 +28,7 @@
file://0003-bpo-32947-Fixes-for-TLS-1.3-and-OpenSSL-1.1.1-GH-876.patch \
file://0004-bpo-33570-TLS-1.3-ciphers-for-OpenSSL-1.1.1-GH-6976.patch \
file://0005-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-2305.patch \
"
+PACKAGECONFIG[tk] = ",,tk-native"
EXTRANATIVEPATH += "bzip2-native"
DEPENDS = "openssl-native bzip2-replacement-native zlib-native readline-native
sqlite3-native gdbm-native"
diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json
b/meta/recipes-devtools/python/python3/python3-manifest.json
index 5329bf7..617256a 100644
--- a/meta/recipes-devtools/python/python3/python3-manifest.json
+++ b/meta/recipes-devtools/python/python3/python3-manifest.json
@@ -1060,6 +1060,7 @@
"core"
],
"files": [
+"${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_tkinter.*.so",
"${libdir}/python${PYTHON_MAJMIN}/tkinter"
],
"cached": []
diff --git a/meta/recipes-devtools/python/python3_3.5.6.bb
b/meta/recipes-devtools/python/python3_3.5.6.bb
index 31f8ead..5c80421 100644
--- a/meta/recipes-devtools/python/python3_3.5.6.bb
+++ b/meta/recipes-devtools/python/python3_3.5.6.bb
@@ -21,7 +21,7 @@ ${DISTRO_SRC_URI} \
SRC_URI += "\
file://03-fix-tkinter-detection.patch \
-file://avoid_warning_about_tkinter.patch \
+${@bb.utils.contains('PACKAGECONFIG', 'tk', '',
'file://avoid_warning_about_tkinter.patch', d)} \
file://cgi_py.patch \
file://host_include_contamination.patch \
file://python-3.3-multilib.patch \
@@ -82,6 +82,7 @@ PACKAGECONFIG ??= "readline
${@bb.utils.contains('MACHINE_FEATURES', 'qemu-userm
PACKAGECONFIG[readline] = ",,readline"
# Use profile guided optimisation by running PyBench inside qemu-user
PACKAGECONFIG[pgo] = "--enable-optimizations"
+PACKAGECONFIG[tk] = ",,tk"
do_configure_append() {
rm -f ${S}/Makefile.orig
@@ -246,7 +247,7 @@ PACKAGES += "${PN}-man"
FILES_${PN}-man = "${datadir}/man"
RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip bzip2"
-
+RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk', '',
d)}"
RDEPENDS_${PN}-dev = ""
BBCLASSEXTEND = "nativesdk"
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 08/16] btrfs-tools: update to 4.19
On Thu, 2018-11-22 at 16:41 +0100, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin
> ---
> .../btrfs-tools/{btrfs-tools_4.17.1.bb => btrfs-tools_4.19.bb} | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.17.1.bb =>
> btrfs-tools_4.19.bb} (96%)
>
> diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.17.1.bb
> b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.bb
> similarity index 96%
> rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.17.1.bb
> rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.bb
> index 6b53fbcd7fe..9590a723d50 100644
> --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.17.1.bb
> +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.bb
> @@ -14,7 +14,7 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl
> python3-setuptools-native"
> DEPENDS_append_class-target = " udev"
> RDEPENDS_${PN} = "libgcc"
>
> -SRCREV = "7faaca0d9f78f7162ae603231f693dd8e1af2a41"
> +SRCREV = "d72d913291683188ddf5d758db02f1bc3b05d2f7"
> SRC_URI =
> "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
> file://0001-Makefile-build-mktables-using-native-gcc.patch \
> file://0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch \
Sadly this upgrade is showing problems:
https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/5/steps/7/logs/step6b
https://autobuilder.yoctoproject.org/typhoon/#/builders/70/builds/5/steps/7/logs/step1b
https://autobuilder.yoctoproject.org/typhoon/#/builders/62/builds/5/steps/7/logs/step1b
https://autobuilder.yoctoproject.org/typhoon/#/builders/63/builds/5/steps/7/logs/step1b
possibly a problem on mips/ppc?
Cheers,
Richard
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 16/16] dnf: update to 4.0.9
On Thu, 2018-11-22 at 16:41 +0100, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin
> ---
> meta/recipes-devtools/dnf/{dnf_4.0.4.bb => dnf_4.0.9.bb} | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> rename meta/recipes-devtools/dnf/{dnf_4.0.4.bb => dnf_4.0.9.bb}
> (98%)
>
> diff --git a/meta/recipes-devtools/dnf/dnf_4.0.4.bb b/meta/recipes-
> devtools/dnf/dnf_4.0.9.bb
> similarity index 98%
> rename from meta/recipes-devtools/dnf/dnf_4.0.4.bb
> rename to meta/recipes-devtools/dnf/dnf_4.0.9.bb
> index 931e9eff07f..24412fd4860 100644
> --- a/meta/recipes-devtools/dnf/dnf_4.0.4.bb
> +++ b/meta/recipes-devtools/dnf/dnf_4.0.9.bb
> @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/rpm-software-
> management/dnf.git \
> file://0030-Run-python-scripts-using-env.patch \
> "
>
> -SRCREV = "6fdf0e8cc714c92ee08bd4db9412d4c587ffafe9"
> +SRCREV = "689a4c515738226f3dc85edb2035d23233ff41d8"
> UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)"
>
> S = "${WORKDIR}/git"
Something still isn't quite right somewhere:
https://autobuilder.yoctoproject.org/typhoon/#/builders/69/builds/5/steps/7/logs/step7b
https://autobuilder.yoctoproject.org/typhoon/#/builders/58/builds/5/steps/7/logs/step2b
(the above wic build has many similar errors)
Cheers,
Richard
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v7] u-boot: Add mkenvimage tool
This utility is used for creation of images containing
usable in run-time U-Boot environment.
As of today this utility is added per-board like here [1]
for Intel Edison board.
[1]
http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-edison/tree/meta-intel-edison-bsp/recipes-bsp/u-boot/u-boot-tools_2014.04.bb
Given there're quite some U-Boot tools that we may want to add later
this recipe name switch from "u-boot-mkimage" to generic "u-boot-tools"
still for compatibility we provide "u-boot-mkimage" with help
of PROVIDES as well as proposed "u-boot-mkenvimage".
Signed-off-by: Alexey Brodkin
Cc: Richard Purdie
Cc: Otavio Salvador
Cc: Martin Jansa
Cc: Ross Burton
Cc: Marek Vasut
---
Changes v6 -> v7:
* Fix building "u-boot-tools-native"
Changes v5 -> v6:
* Really enable separate pakaging of mkimage and mkenvimage
Changes v4 -> v5:
* Added backward compatibility with "u-boot-mkimage" recipe
* Improved handling of nativesdk
* Update all references from "u-boot-mkimage" to "u-boot-tools"
Changes v3 -> v4:
* Updated maintainer info to make Yocto autobuilder happy again
Changes v2 -> v3:
* Recipe renamed to "u-boot-tools" to better match its contents
(especially in the future as we add more tools there)
* Existing "u-boot-mkimage" and newly introduced "u-boot-mkenvimage"
made avaialble via PROVIDES
Changes v1 -> v2:
* Got rid of a separate recipe and instead added mkenvimage
to u-boot mkimage recipe
meta/classes/image_types.bbclass | 2 +-
meta/classes/kernel-fitimage.bbclass | 2 +-
meta/classes/kernel-uimage.bbclass | 2 +-
meta/conf/distro/include/distro_alias.inc | 2 +-
meta/conf/distro/include/maintainers.inc | 2 +-
...-mkimage_2018.07.bb => u-boot-tools_2018.07.bb} | 27 --
6 files changed, 30 insertions(+), 7 deletions(-)
rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2018.07.bb =>
u-boot-tools_2018.07.bb} (55%)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 05e5b0a2e0..5c406481ef 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -308,7 +308,7 @@ CONVERSION_DEPENDS_lzo = "lzop-native"
CONVERSION_DEPENDS_zip = "zip-native"
CONVERSION_DEPENDS_sum = "mtd-utils-native"
CONVERSION_DEPENDS_bmap = "bmap-tools-native"
-CONVERSION_DEPENDS_u-boot = "u-boot-mkimage-native"
+CONVERSION_DEPENDS_u-boot = "u-boot-tools-native"
CONVERSION_DEPENDS_vmdk = "qemu-native"
CONVERSION_DEPENDS_vdi = "qemu-native"
CONVERSION_DEPENDS_qcow2 = "qemu-native"
diff --git a/meta/classes/kernel-fitimage.bbclass
b/meta/classes/kernel-fitimage.bbclass
index 4c4fd99ff4..328bef4069 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -4,7 +4,7 @@ python __anonymous () {
kerneltypes = d.getVar('KERNEL_IMAGETYPES') or ""
if 'fitImage' in kerneltypes.split():
depends = d.getVar("DEPENDS")
-depends = "%s u-boot-mkimage-native dtc-native" % depends
+depends = "%s u-boot-tools-native dtc-native" % depends
d.setVar("DEPENDS", depends)
uarch = d.getVar("UBOOT_ARCH")
diff --git a/meta/classes/kernel-uimage.bbclass
b/meta/classes/kernel-uimage.bbclass
index c2de6bb40d..cedb4fa070 100644
--- a/meta/classes/kernel-uimage.bbclass
+++ b/meta/classes/kernel-uimage.bbclass
@@ -3,7 +3,7 @@ inherit kernel-uboot
python __anonymous () {
if "uImage" in d.getVar('KERNEL_IMAGETYPES'):
depends = d.getVar("DEPENDS")
-depends = "%s u-boot-mkimage-native" % depends
+depends = "%s u-boot-tools-native" % depends
d.setVar("DEPENDS", depends)
# Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal
diff --git a/meta/conf/distro/include/distro_alias.inc
b/meta/conf/distro/include/distro_alias.inc
index 7502542e89..f23db1e8a4 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -354,7 +354,7 @@ DISTRO_PN_ALIAS_pn-tremor = "OSPDT
upstream=http://www.xiph.org/vorbis/;
DISTRO_PN_ALIAS_pn-ttf-bitstream-vera = "Debian=ttf-bitstream-vera
Ubuntu=ttf-bitstream-vera"
DISTRO_PN_ALIAS_pn-tzcode = "OSPDT"
DISTRO_PN_ALIAS_pn-u-boot-fw-utils = "Ubuntu=u-boot-tools Debian=u-boot-tools"
-DISTRO_PN_ALIAS_pn-u-boot-mkimage = "Ubuntu=uboot-mkimage Debian=uboot-mkimage"
+DISTRO_PN_ALIAS_pn-u-boot-tools = "Ubuntu=u-boot-tools Debian=uboot-tools"
DISTRO_PN_ALIAS_pn-udev = "Mandriva=udev Fedora=udev"
DISTRO_PN_ALIAS_pn-udev-extraconf = "OE-Core"
DISTRO_PN_ALIAS_pn-unfs3 = "Debian=unfs3 Fedora=unfs3"
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index 05a2c9f38a..8a4362d947 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -656,7 +656,7 @@ RECIPE_MAINTAINER_pn-tzcode-native = "Armin Kuster
"
RECIPE_MAINTAINER_pn-tzdata = "Armin Kuster "
[OE-core] [PATCH] arc: Disable LTTng
LTTng depends on liburcu which is not yet ported to ARC
so disable LTTng on ARC for now.
Signed-off-by: Alexey Brodkin
---
meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | 3 +++
meta/recipes-devtools/gdb/gdb-common.inc | 1 +
meta/recipes-kernel/lttng/lttng-tools_2.10.5.bb| 1 +
3 files changed, 5 insertions(+)
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 33d9c09a66..762c046636 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -38,13 +38,16 @@ SYSTEMTAP_riscv64 = ""
# lttng-ust uses sched_getcpu() which is not there on for some platforms.
LTTNGUST = "lttng-ust"
LTTNGUST_libc-musl = ""
+LTTNGUST_arc = ""
LTTNGUST_riscv64 = ""
LTTNGTOOLS = "lttng-tools"
LTTNGTOOLS_libc-musl = ""
+LTTNGTOOLS_arc = ""
LTTNGTOOLS_riscv64 = ""
LTTNGMODULES = "lttng-modules"
+LTTNGMODULES_arc = ""
LTTNGMODULES_riscv64 = ""
BABELTRACE = "babeltrace"
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc
b/meta/recipes-devtools/gdb/gdb-common.inc
index fa64939f26..57bc0dc773 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -4,6 +4,7 @@ SECTION = "devel"
DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native"
LTTNGUST = "lttng-ust"
+LTTNGUST_arc = ""
LTTNGUST_aarch64 = ""
LTTNGUST_riscv64 = ""
LTTNGUST_mipsarch = ""
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.10.5.bb
b/meta/recipes-kernel/lttng/lttng-tools_2.10.5.bb
index 11d7db6848..85ed3c691b 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.10.5.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.10.5.bb
@@ -25,6 +25,7 @@ PACKAGECONFIG[lttng-ust] = "--with-lttng-ust,
--without-lttng-ust, lttng-ust"
PACKAGECONFIG[kmod] = "--with-kmod, --without-kmod, kmod"
PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages,
asciidoc-native xmlto-native libxslt-native"
PACKAGECONFIG_remove_libc-musl = "lttng-ust"
+PACKAGECONFIG_remove_arc = "lttng-ust"
PACKAGECONFIG_remove_riscv64 = "lttng-ust"
SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
--
2.16.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] socat: fix LICENSE
According to both the README and source headers, the LICENSE value for socat is explicitly GPLv2, not v2 or later, so adjust LICENSE accordingly (leaving aside whether "GPL-2.0+-with-OpenSSL-exception" should actually be considered a valid LICENSE string or not). Signed-off-by: Paul Eggleton --- meta/recipes-connectivity/socat/socat_1.7.3.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/socat/socat_1.7.3.2.bb b/meta/recipes-connectivity/socat/socat_1.7.3.2.bb index 927df7463ae..b2d6b1dea4a 100644 --- a/meta/recipes-connectivity/socat/socat_1.7.3.2.bb +++ b/meta/recipes-connectivity/socat/socat_1.7.3.2.bb @@ -7,7 +7,7 @@ SECTION = "console/network" DEPENDS = "openssl readline" -LICENSE = "GPL-2.0+-with-OpenSSL-exception" +LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://README;beginline=257;endline=287;md5=338c05eadd013872abb1d6e198e10a3f" -- 2.17.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] socat: fix LICENSE
The following changes since commit c80972be1f3592d797da9eb0845b739420c6da4a: maintainers: Add entry for new recipe libdazzle (2018-11-22 10:00:12 +) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib paule/socat-license http://cgit.openembedded.org/openembedded-core-contrib/log/?h=paule/socat-license Paul Eggleton (1): socat: fix LICENSE meta/recipes-connectivity/socat/socat_1.7.3.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] reproducible: Don't look for youngest file when no source tarball
Some packages (eg. init-ifupdown) take their source files entirely from
openembedded-core, that is, they download no source tarball.
These recipes either don't use S at all (ie. it is empty at unpack time),
or they set S = WORKDIR (as in init-ifupdown).
Looking at the file timestamps in the WORKDIR causes a non-reproducible
SOURCE_DATE_EPOCH, as files taken from file:// URIs do not have
reproducible timestamps.
If S == WORKDIR, we are better to assume that there is no source tarball,
and to fall back to a fixed timestamp for the SOURCE_DATE_EPOCH.
This makes the init-ifupdown build reproducible.
Signed-off-by: Douglas Royds
---
meta/classes/reproducible_build.bbclass | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/meta/classes/reproducible_build.bbclass
b/meta/classes/reproducible_build.bbclass
index a0fd4d656b..8788ad7145 100644
--- a/meta/classes/reproducible_build.bbclass
+++ b/meta/classes/reproducible_build.bbclass
@@ -22,7 +22,10 @@
# 3. Use the mtime of "known" files such as NEWS, CHANGLELOG, ...
#This works for well-kept repositories distributed via tarball.
#
-# 4. If the above steps fail, use the modification time of the youngest file
in the source tree.
+# 4. Use the modification time of the youngest file in the source tree, if
there is one.
+#This will be the newest file from the distribution tarball, if any.
+#
+# 5. Fall back to a fixed timestamp.
#
# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in the
recipe's SDE_FILE.
# If none of these mechanisms are suitable, replace the
do_deploy_source_date_epoch task
@@ -104,15 +107,15 @@ def get_source_date_epoch_from_git(d, sourcedir):
return source_date_epoch
def get_source_date_epoch_from_youngest_file(d, sourcedir):
+if sourcedir == d.getVar('WORKDIR'):
+ # These sources are almost certainly not from a tarball
+ return None
+
# Do it the hard way: check all files and find the youngest one...
source_date_epoch = None
newest_file = None
-# Just in case S = WORKDIR
-exclude = set(["build", "image", "license-destdir", "patches", "pseudo",
- "recipe-sysroot", "recipe-sysroot-native",
"sysroot-destdir", "temp"])
for root, dirs, files in os.walk(sourcedir, topdown=True):
files = [f for f in files if not f[0] == '.']
-dirs[:] = [d for d in dirs if d not in exclude]
for fname in files:
filename = os.path.join(root, fname)
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] reproducible: Refactor: Break out fixed_source_date_epoch() function
Signed-off-by: Douglas Royds
---
meta/classes/reproducible_build.bbclass | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/meta/classes/reproducible_build.bbclass
b/meta/classes/reproducible_build.bbclass
index 0eb696ac78..a0fd4d656b 100644
--- a/meta/classes/reproducible_build.bbclass
+++ b/meta/classes/reproducible_build.bbclass
@@ -128,6 +128,10 @@ def get_source_date_epoch_from_youngest_file(d, sourcedir):
bb.debug(1, "Newest file found: %s" % newest_file)
return source_date_epoch
+def fixed_source_date_epoch():
+bb.debug(1, "No tarball or git repo found to determine SOURCE_DATE_EPOCH")
+return 0
+
python do_create_source_date_epoch_stamp() {
epochfile = d.getVar('SDE_FILE')
if os.path.isfile(epochfile):
@@ -139,11 +143,8 @@ python do_create_source_date_epoch_stamp() {
get_source_date_epoch_from_git(d, sourcedir) or
get_source_date_epoch_from_known_files(d, sourcedir) or
get_source_date_epoch_from_youngest_file(d, sourcedir) or
-0 # Last resort
+fixed_source_date_epoch() # Last resort
)
-if source_date_epoch == 0:
-# empty folder, not a single file ...
-bb.debug(1, "No files found to determine SOURCE_DATE_EPOCH")
bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch)
bb.utils.mkdirhier(d.getVar('SDE_DIR'))
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] boost-context: Reproducibility: Set .file section for all *_elf_gas.S files
Add a .file directive explicitly for all *_elf_gas.S files to prevent the linker adding a host build-system path as a FILE symbol to the object file. This replaces the existing patch that added the .file directive to a small subset of these files. Upstream-Status: Submitted [https://github.com/boostorg/context/issues/91] Signed-off-by: Douglas Royds --- ..._64_sysv_elf_gas.S-set-.file-section.patch | 48 ...lity-add-file-directive-to-assembler.patch | 243 ++ meta/recipes-support/boost/boost_1.68.0.bb| 2 +- 3 files changed, 244 insertions(+), 49 deletions(-) delete mode 100644 meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch create mode 100644 meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch diff --git a/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch b/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch deleted file mode 100644 index c2ac49e58f..00 --- a/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c99f798407e44c86e9f64f5b1adf3b4d0549eef2 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Fri, 15 Jun 2018 16:21:56 +0800 -Subject: [PATCH] make_x86_64_sysv_elf_gas.S: set .file section - -Set .file section explicitly for .S files to avoid -the linker introduces the host path in symbols for -object files whose source file is .S -Otherwise, there is a host path in the symbols as below: -$ readelf --wide --symbols /my-build/boost/1.67.0-r0/boost_1_67_0/x86_64-poky-linux/boost/bin.v2/libs/context/build/aca09349fdb84d131321425f6c3a38ed/libboost_context.so.1.67.0 - -42: 0 FILE LOCAL DEFAULT ABS /my-build/boost/1.67.0-r0/boost_1_67_0/x86_64-poky-linux/boost/bin.v2/libs/context/build/aca09349fdb84d131321425f6c3a38ed/asm/make_x86_64_sysv_elf_gas.o - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu - libs/context/src/asm/make_i386_sysv_elf_gas.S | 1 + - libs/context/src/asm/make_x86_64_sysv_elf_gas.S | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/libs/context/src/asm/make_i386_sysv_elf_gas.S b/libs/context/src/asm/make_i386_sysv_elf_gas.S -index de77e88..b76de26 100644 a/libs/context/src/asm/make_i386_sysv_elf_gas.S -+++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S -@@ -24,6 +24,7 @@ - * * - / - -+.file "make_i386_sysv_elf_gas.S" - .text - .globl make_fcontext - .align 2 -diff --git a/libs/context/src/asm/make_x86_64_sysv_elf_gas.S b/libs/context/src/asm/make_x86_64_sysv_elf_gas.S -index 25a0c00..0ef3756 100644 a/libs/context/src/asm/make_x86_64_sysv_elf_gas.S -+++ b/libs/context/src/asm/make_x86_64_sysv_elf_gas.S -@@ -24,6 +24,7 @@ - * * - / - -+.file "make_x86_64_sysv_elf_gas.S" - .text - .globl make_fcontext - .type make_fcontext,@function --- -2.7.4 - diff --git a/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch b/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch new file mode 100644 index 00..155653316c --- /dev/null +++ b/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch @@ -0,0 +1,243 @@ +Author: Douglas Royds +Date: Thu Nov 22 09:34:22 2018 +1300 + +Add a .file directive explicitly for all *_elf_gas.S files to prevent the linker +adding a host build-system path as a FILE symbol to the object file. + +This replaces the existing patch that added the .file directive to a small +subset of these files. + +Upstream-Status: Submitted [https://github.com/boostorg/context/issues/91] +Signed-off-by: Douglas Royds + +diff -ur boost_1_68_0.original/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 boost_1_68_0/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S 2018-11-22 09:04:27.900876941 +1300 +@@ -51,6 +51,7 @@ + * * + ***/ + ++.file "jump_arm64_aapcs_elf_gas.S" + .text + .align 2 + .global jump_fcontext +diff -ur boost_1_68_0.original/libs/context/src/asm/jump_arm_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_arm_aapcs_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/jump_arm_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 boost_1_68_0/libs/context/src/asm/jump_arm_aapcs_elf_gas.S
Re: [OE-core] ✗ patchtest: failure for boost-context: Reproducibility: Set .file section for all *_elf_gas.S files (rev2)
On 23/11/18 2:24 AM, Burton, Ross wrote: On Thu, 22 Nov 2018 at 00:38, Douglas Royds wrote: On 22/11/18 1:33 PM, Patchwork wrote: ... * Issue Upstream-Status is Submitted, but it is not mentioned where [test_upstream_status_presence_format] Suggested fixInclude where reproducibility-add-file-directive-to-assembler.patch was submitted Yes it is ... Current Upstream-Status: Submitted https://github.com/boostorg/context/issues/91 Standard format Upstream-Status: Submitted [where] The [] is not syntactic markers but literal characters, i.e. it expects to see: Upstream-Status: Submitted [https://github.com/boostorg/context/issues/91] Yes, this test could be considered overly pedantic, but I'm also aware that raising and formalising this would be a bikeshed of epic proportions... Ross Great, thanks, my mistake. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] qemu.inc: Drop rng-tools
On Thu, Nov 22, 2018 at 3:40 PM Martin Jansa wrote: > I was just hit by this issue as well, we're using VirtualBox instead of QEmu, > so of course we were missing "-device virtio-rng-pci" and I haven't found > some equivalent of this for VirtualBox. > > Adding rng-tools back to our images allows to use ssh again (without > rng-tools sshd never started because ssh-keygen got stuck trying to read > /dev/random). > > I don't know how many people are using VirtualBox or docker to run qemu > images built with OE, but it's probably worth mentioning in 2.6 release notes. Agreed :-) -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] qemu.inc: Drop rng-tools
Hi all, I was just hit by this issue as well, we're using VirtualBox instead of QEmu, so of course we were missing "-device virtio-rng-pci" and I haven't found some equivalent of this for VirtualBox. Adding rng-tools back to our images allows to use ssh again (without rng-tools sshd never started because ssh-keygen got stuck trying to read /dev/random). I don't know how many people are using VirtualBox or docker to run qemu images built with OE, but it's probably worth mentioning in 2.6 release notes. Cheers, On Thu, Nov 16, 2017 at 2:26 PM Otavio Salvador < otavio.salva...@ossystems.com.br> wrote: > Hello Richard, > Hello Ross, > > On Thu, Nov 16, 2017 at 11:14 AM, Richard Purdie > wrote: > > On Thu, 2017-11-16 at 13:11 +, Burton, Ross wrote: > >> On 15 November 2017 at 19:59, Otavio Salvador >> ems.com.br> wrote: > >> > > Are you enabling the virtio-rng driver so qemu can bridge the > >> > host entropy > >> > > into the guest? > >> > > >> > I am not. Do you have an example of command line for it? > >> https://wiki.qemu.org/Features/VirtIORNG talks about qemu's support > >> and what to turn on there (the default qemu machines enable that). > >> > >> http://elixir.free-electrons.com/linux/latest/source/drivers/char/hw_ > >> random/Kconfig documents HW_RANDOM_VIRTIO and says at the top that > >> the devices feed into the kernel pool. > > > > Just to add, for qemuarm: > > > > machine/qemuarm.conf:QB_OPT_APPEND = "-show-cursor -usb -device > usb-tablet -device virtio-rng-pci" > > > > the key piece being virtio-rng-pci on the commandline. > > I did try it here. Thanks for the pointers. > > We use a Docker container to run QEMU and in this environment, it does > not work well. At least I did not get it working. > > I don't know if it is a problem or not for OE-Core. Possibly people > will run things inside a container and keep rng-tools makes it working > in those environments. > > I will keep investigating here if I can make it work in a container ... > > -- > Otavio Salvador O.S. Systems > http://www.ossystems.com.brhttp://code.ossystems.com.br > Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for dmidecode: fix the Upstream-Status in a custom patch
== Series Details == Series: dmidecode: fix the Upstream-Status in a custom patch Revision: 1 URL : https://patchwork.openembedded.org/series/15043/ 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 c80972be1f) 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] dmidecode: fix the Upstream-Status in a custom patch
Signed-off-by: Alexander Kanavin --- .../0001-Committing-changes-from-do_unpack_extra.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/dmidecode/dmidecode/0001-Committing-changes-from-do_unpack_extra.patch b/meta/recipes-devtools/dmidecode/dmidecode/0001-Committing-changes-from-do_unpack_extra.patch index c9b19182ddf..ce9d423104b 100644 --- a/meta/recipes-devtools/dmidecode/dmidecode/0001-Committing-changes-from-do_unpack_extra.patch +++ b/meta/recipes-devtools/dmidecode/dmidecode/0001-Committing-changes-from-do_unpack_extra.patch @@ -3,7 +3,7 @@ From: OpenEmbedded Date: Thu, 22 Nov 2018 12:05:04 + Subject: [PATCH] Do not install to /usr/local -Upstream-Status: Inappropriate +Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin --- Makefile | 2 +- -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for "gobject-introspection: update ..." and 15 more
== Series Details == Series: "gobject-introspection: update ..." and 15 more Revision: 1 URL : https://patchwork.openembedded.org/series/15041/ 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 Upstream-Status is Inappropriate, but no reason was provided [test_upstream_status_presence_format] Suggested fixInclude a brief reason why 0001-Committing-changes-from-do_unpack_extra.patch is inappropriate Current Upstream-Status: Inappropriate Standard format Upstream-Status: Inappropriate [reason] 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] documentation: Add newlib to TCLIBC's [doc] entry
TCBLIC can be set to 'newlib' now, document this. [YOCTO #13032] Signed-off-by: Richard Purdie --- meta/conf/documentation.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index fc6d008807b..4d2a707563d 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf @@ -413,7 +413,7 @@ TARGET_FPU[doc] = "Specifies the method for handling FPU code. For FPU-less targ TARGET_OS[doc] = "Specifies the target's operating system." TARGET_PREFIX[doc] = "The prefix for the cross-compile toolchain (e.g. arm-linux-)." TARGET_SYS[doc] = "The target system is comprised of TARGET_ARCH,TARGET_VENDOR and TARGET_OS." -TCLIBC[doc] = "Specifies C library (libc) variant to use during the build process. You can select 'baremetal', 'glibc' or 'musl'." +TCLIBC[doc] = "Specifies C library (libc) variant to use during the build process. You can select 'baremetal', 'glibc', 'musl' or 'newlib'." TCMODE[doc] = "Enables an external toolchain (where provided by an additional layer) if set to a value other than 'default'." TESTIMAGE_AUTO[doc] = "Enables test booting of virtual machine images under the QEMU emulator after any root filesystems are created and runs tests against those images each time an image is built." TEST_QEMUBOOT_TIMEOUT[doc] = "The time in seconds allowed for an image to boot before automated runtime tests begin to run against an image." -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 16/16] dnf: update to 4.0.9
Signed-off-by: Alexander Kanavin
---
meta/recipes-devtools/dnf/{dnf_4.0.4.bb => dnf_4.0.9.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/dnf/{dnf_4.0.4.bb => dnf_4.0.9.bb} (98%)
diff --git a/meta/recipes-devtools/dnf/dnf_4.0.4.bb
b/meta/recipes-devtools/dnf/dnf_4.0.9.bb
similarity index 98%
rename from meta/recipes-devtools/dnf/dnf_4.0.4.bb
rename to meta/recipes-devtools/dnf/dnf_4.0.9.bb
index 931e9eff07f..24412fd4860 100644
--- a/meta/recipes-devtools/dnf/dnf_4.0.4.bb
+++ b/meta/recipes-devtools/dnf/dnf_4.0.9.bb
@@ -12,7 +12,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \
file://0030-Run-python-scripts-using-env.patch \
"
-SRCREV = "6fdf0e8cc714c92ee08bd4db9412d4c587ffafe9"
+SRCREV = "689a4c515738226f3dc85edb2035d23233ff41d8"
UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)"
S = "${WORKDIR}/git"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 14/16] lighttpd: update to 1.4.51
Signed-off-by: Alexander Kanavin
---
.../lighttpd/{lighttpd_1.4.50.bb => lighttpd_1.4.51.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/lighttpd/{lighttpd_1.4.50.bb =>
lighttpd_1.4.51.bb} (96%)
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.50.bb
b/meta/recipes-extended/lighttpd/lighttpd_1.4.51.bb
similarity index 96%
rename from meta/recipes-extended/lighttpd/lighttpd_1.4.50.bb
rename to meta/recipes-extended/lighttpd/lighttpd_1.4.51.bb
index 5373a61d703..f28fd2f6905 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.50.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.51.bb
@@ -20,8 +20,8 @@ SRC_URI =
"http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
\
"
-SRC_URI[md5sum] = "0547831efda8492648b7f0c652865dfd"
-SRC_URI[sha256sum] =
"29378312d8887cbc14ffe8a7fadef2d5a08c7e7e1be942795142346ad95629eb"
+SRC_URI[md5sum] = "6e68c19601af332fa3c5f174245f59bf"
+SRC_URI[sha256sum] =
"2af9fdb265d1f025bfa634e13770239712ecbd585e4975b8226edf1df74e9c82"
PACKAGECONFIG ??= "openssl pcre zlib \
${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 15/16] libdnf: update to 0.22.3
Signed-off-by: Alexander Kanavin
---
.../libdnf/{libdnf_0.22.0.bb => libdnf_0.22.3.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/libdnf/{libdnf_0.22.0.bb => libdnf_0.22.3.bb}
(95%)
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.22.0.bb
b/meta/recipes-devtools/libdnf/libdnf_0.22.3.bb
similarity index 95%
rename from meta/recipes-devtools/libdnf/libdnf_0.22.0.bb
rename to meta/recipes-devtools/libdnf/libdnf_0.22.3.bb
index 61ebcd821cc..d0cb01f0ea8 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.22.0.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.22.3.bb
@@ -9,7 +9,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf \
file://0001-Add-WITH_TESTS-option.patch \
"
-SRCREV = "fe14ad928f60890fa28b412639c88cd47889635e"
+SRCREV = "5c198ea2357c5779cf83050e5291646c3b186446"
S = "${WORKDIR}/git"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/16] psmisc: update to 23.2
Signed-off-by: Alexander Kanavin
---
...001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch | 14 +-
.../psmisc/{psmisc_23.1.bb => psmisc_23.2.bb} | 2 +-
2 files changed, 6 insertions(+), 10 deletions(-)
rename meta/recipes-extended/psmisc/{psmisc_23.1.bb => psmisc_23.2.bb} (87%)
diff --git
a/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch
b/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch
index b57a006bc67..3609594b67a 100644
---
a/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch
+++
b/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch
@@ -1,4 +1,4 @@
-From 5dc872bb2fba6421cb8e1ee578f7bd4aaed55f61 Mon Sep 17 00:00:00 2001
+From 115fcf1daff18aa2f2e130d63704f04031878db0 Mon Sep 17 00:00:00 2001
From: Khem Raj
Date: Thu, 24 Mar 2016 15:46:14 +
Subject: [PATCH] Use UINTPTR_MAX instead of __WORDSIZE
@@ -7,14 +7,13 @@ Do not include sys/user.h since it conflicts with
pt_regs struct from kernel APIs in asm/ptrace.h
Signed-off-by: Khem Raj
-Upstream-Status: Pending
+---
src/peekfd.c | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/peekfd.c b/src/peekfd.c
-index cba2130..0d39878 100644
+index 5aa990a..7e8e3fc 100644
--- a/src/peekfd.c
+++ b/src/peekfd.c
@@ -30,8 +30,11 @@
@@ -28,8 +27,8 @@ index cba2130..0d39878 100644
+#include
#include
#include
-
-@@ -228,11 +231,11 @@ int main(int argc, char **argv)
+ #include
+@@ -266,11 +269,11 @@ int main(int argc, char **argv)
if (WIFSTOPPED(status)) {
#ifdef PPC
struct pt_regs regs;
@@ -46,6 +45,3 @@ index cba2130..0d39878 100644
#elif defined(ARM)
struct pt_regs regs;
ptrace(PTRACE_GETREGS, pid, 0, );
---
-1.9.1
-
diff --git a/meta/recipes-extended/psmisc/psmisc_23.1.bb
b/meta/recipes-extended/psmisc/psmisc_23.2.bb
similarity index 87%
rename from meta/recipes-extended/psmisc/psmisc_23.1.bb
rename to meta/recipes-extended/psmisc/psmisc_23.2.bb
index f07c9db1e7e..38e0a440587 100644
--- a/meta/recipes-extended/psmisc/psmisc_23.1.bb
+++ b/meta/recipes-extended/psmisc/psmisc_23.2.bb
@@ -6,5 +6,5 @@ SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https \
file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \
file://0001-Makefile.am-create-src-directory-before-attempting-t.patch \
"
-SRCREV = "bd952b3063f2466ecab4ec093026cf0c4ce373c7"
+SRCREV = "44eab9a3a63394eae6b79a7ef0a042f57e0c8a8f"
S = "${WORKDIR}/git"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/16] webkitgtk: update to 2.22.4
Signed-off-by: Alexander Kanavin
---
.../webkit/{webkitgtk_2.22.3.bb => webkitgtk_2.22.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-sato/webkit/{webkitgtk_2.22.3.bb => webkitgtk_2.22.4.bb}
(97%)
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.22.3.bb
b/meta/recipes-sato/webkit/webkitgtk_2.22.4.bb
similarity index 97%
rename from meta/recipes-sato/webkit/webkitgtk_2.22.3.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.22.4.bb
index d06d2a1a69a..60f1b3ea5d6 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.22.3.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.22.4.bb
@@ -22,8 +22,8 @@ SRC_URI =
"http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
file://detect-gstreamer-gl.patch \
"
-SRC_URI[md5sum] = "6dae6837c884a25413fb1d4527c9894a"
-SRC_URI[sha256sum] =
"9dfd542902953be9af8ff32bd37fe662ca3d75f7348514ebac15c6252a6ccd72"
+SRC_URI[md5sum] = "9f08d09cfc21c761a431a545549f301a"
+SRC_URI[sha256sum] =
"fab5be2883802352ae0e735dd1eff4bc18abaff7ac78689cec72eb2f611943b8"
inherit cmake pkgconfig gobject-introspection perlnative distro_features_check
upstream-version-is-even gtk-doc
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 13/16] libwebp: update to 1.0.1
Signed-off-by: Alexander Kanavin
---
.../webp/{libwebp_1.0.0.bb => libwebp_1.0.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-multimedia/webp/{libwebp_1.0.0.bb => libwebp_1.0.1.bb}
(93%)
diff --git a/meta/recipes-multimedia/webp/libwebp_1.0.0.bb
b/meta/recipes-multimedia/webp/libwebp_1.0.1.bb
similarity index 93%
rename from meta/recipes-multimedia/webp/libwebp_1.0.0.bb
rename to meta/recipes-multimedia/webp/libwebp_1.0.1.bb
index 1a9679f9dc8..451b0659b0c 100644
--- a/meta/recipes-multimedia/webp/libwebp_1.0.0.bb
+++ b/meta/recipes-multimedia/webp/libwebp_1.0.1.bb
@@ -14,8 +14,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=6e8dee932c26f2dab503abf70c96d8bb \
file://PATENTS;md5=c6926d0cb07d296f886ab6e0cc5a85b7"
SRC_URI = "http://downloads.webmproject.org/releases/webp/${BP}.tar.gz;
-SRC_URI[md5sum] = "967b8f087cb392e6cc94d5e116a120c0"
-SRC_URI[sha256sum] =
"84259c4388f18637af3c5a6361536d754a5394492f91be1abc2e981d4983225b"
+SRC_URI[md5sum] = "ba72dfa7588c751a3a9b735a6746a23e"
+SRC_URI[sha256sum] =
"8c744a5422dbffa0d1f92e90b34186fb8ed44db93fbacb55abd751ac8808d922"
UPSTREAM_CHECK_URI =
"http://downloads.webmproject.org/releases/webp/index.html;
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/16] btrfs-tools: update to 4.19
Signed-off-by: Alexander Kanavin
---
.../btrfs-tools/{btrfs-tools_4.17.1.bb => btrfs-tools_4.19.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.17.1.bb =>
btrfs-tools_4.19.bb} (96%)
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.17.1.bb
b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.bb
similarity index 96%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.17.1.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.bb
index 6b53fbcd7fe..9590a723d50 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.17.1.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.bb
@@ -14,7 +14,7 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl
python3-setuptools-native"
DEPENDS_append_class-target = " udev"
RDEPENDS_${PN} = "libgcc"
-SRCREV = "7faaca0d9f78f7162ae603231f693dd8e1af2a41"
+SRCREV = "d72d913291683188ddf5d758db02f1bc3b05d2f7"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
\
file://0001-Makefile-build-mktables-using-native-gcc.patch \
file://0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch \
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 12/16] sysprof: update to 3.30.2
Signed-off-by: Alexander Kanavin
---
...fix-non-literal-format-string-issues.patch | 34 -
.../sysprof/files/wordsize.patch | 38 ---
.../{sysprof_3.30.0.bb => sysprof_3.30.2.bb} | 6 +--
3 files changed, 2 insertions(+), 76 deletions(-)
delete mode 100644
meta/recipes-kernel/sysprof/files/0001-fix-non-literal-format-string-issues.patch
delete mode 100644 meta/recipes-kernel/sysprof/files/wordsize.patch
rename meta/recipes-kernel/sysprof/{sysprof_3.30.0.bb => sysprof_3.30.2.bb}
(82%)
diff --git
a/meta/recipes-kernel/sysprof/files/0001-fix-non-literal-format-string-issues.patch
b/meta/recipes-kernel/sysprof/files/0001-fix-non-literal-format-string-issues.patch
deleted file mode 100644
index 38f9f5f66a8..000
---
a/meta/recipes-kernel/sysprof/files/0001-fix-non-literal-format-string-issues.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From de13d1f908335cc882c447e4d7c4360b9e5da190 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Thu, 6 Sep 2018 17:49:44 -0700
-Subject: [PATCH] fix non-literal format string issues
-
-clang errors out when using -Werror=format-nonliteral
-since the definition of g_strdup_vprintf() from glib-2.0
-is using va_list and clangs still warns where as
-gcc doesn't do that for va_list arguments
-
-Fixes
-src/sp-window.c:96:27: error: format string is not a string literal
[-Werror,-Wformat-nonliteral]
-| str = g_strdup_vprintf (format, args);
-| ^~
-
-Upstream-Status: Submitted
[https://gitlab.gnome.org/GNOME/sysprof/merge_requests/6]
-Signed-off-by: Khem Raj
- src/sp-window.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sp-window.c b/src/sp-window.c
-index 4dfac2d..aff4779 100644
a/src/sp-window.c
-+++ b/src/sp-window.c
-@@ -80,7 +80,7 @@ static guint signals [N_SIGNALS];
- static void sp_window_set_profiler (SpWindow *self,
- SpProfiler *profiler);
-
--static void
-+static G_GNUC_PRINTF(3, 4) void
- sp_window_notify_user (SpWindow *self,
-GtkMessageType message_type,
-const gchar*format,
diff --git a/meta/recipes-kernel/sysprof/files/wordsize.patch
b/meta/recipes-kernel/sysprof/files/wordsize.patch
deleted file mode 100644
index d65b13a682f..000
--- a/meta/recipes-kernel/sysprof/files/wordsize.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Upstream-Status: Submitted
[https://gitlab.gnome.org/GNOME/sysprof/merge_requests/5]
-Signed-off-by: Ross Burton
-
-From bc7e3e27c28d0bab8bea72f2314191532b2e7840 Mon Sep 17 00:00:00 2001
-From: Ross Burton
-Date: Fri, 7 Sep 2018 01:30:09 +0100
-Subject: [PATCH] capture: use size of void* instead of glibc-specific
- __WORDSIZE
-
-__WORDSIZE is glibc-specific so sp-capture-types.h doesn't work with musl.
- lib/capture/sp-capture-types.h | 6 --
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/lib/capture/sp-capture-types.h b/lib/capture/sp-capture-types.h
-index 48fcfb8..1d6cd1d 100644
a/lib/capture/sp-capture-types.h
-+++ b/lib/capture/sp-capture-types.h
-@@ -32,12 +32,14 @@ G_BEGIN_DECLS
- #define SP_CAPTURE_MAGIC (GUINT32_TO_LE(0xFDCA975E))
- #define SP_CAPTURE_ALIGN (sizeof(SpCaptureAddress))
-
--#if __WORDSIZE == 64
-+#if GLIB_SIZEOF_VOID_P == 8
- # define SP_CAPTURE_JITMAP_MARKG_GUINT64_CONSTANT(0xE000)
- # define SP_CAPTURE_ADDRESS_FORMAT "0x%016lx"
--#else
-+#elif GLIB_SIZEOF_VOID_P == 4
- # define SP_CAPTURE_JITMAP_MARKG_GUINT64_CONSTANT(0xE000)
- # define SP_CAPTURE_ADDRESS_FORMAT "0x%016llx"
-+#else
-+#error Unknown GLIB_SIZEOF_VOID_P
- #endif
-
- #define SP_CAPTURE_CURRENT_TIME (sp_clock_get_current_time())
---
-2.11.0
-
diff --git a/meta/recipes-kernel/sysprof/sysprof_3.30.0.bb
b/meta/recipes-kernel/sysprof/sysprof_3.30.2.bb
similarity index 82%
rename from meta/recipes-kernel/sysprof/sysprof_3.30.0.bb
rename to meta/recipes-kernel/sysprof/sysprof_3.30.2.bb
index 19dcf25a51d..866642cd1ea 100644
--- a/meta/recipes-kernel/sysprof/sysprof_3.30.0.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_3.30.2.bb
@@ -9,13 +9,11 @@ inherit gnomebase gettext systemd upstream-version-is-even
DEPENDS = "glib-2.0 libxml2-native glib-2.0-native"
-SRC_URI[archive.md5sum] = "ae896a8a2364e18c07fafa9573202f59"
-SRC_URI[archive.sha256sum] =
"29cd2c4be277f00698dce48259219557c4fddc2c01254b8fac95900a8c663f63"
+SRC_URI[archive.md5sum] = "80cb47906eced2e7b9976bf00deec323"
+SRC_URI[archive.sha256sum] =
"e90878e5a509bd79d170a7a51d47cc5508ab1363afaf0d97654373dfd9c8ba0b"
SRC_URI += " \
file://define-NT_GNU_BUILD_ID.patch \
file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \
- file://wordsize.patch \
- file://0001-fix-non-literal-format-string-issues.patch \
"
RECIPE_NO_UPDATE_REASON = "Waiting for resolution of
https://bugzilla.gnome.org/show_bug.cgi?id=794625;
--
2.17.1
--
[OE-core] [PATCH 06/16] gdbm: update to 1.18.1
Signed-off-by: Alexander Kanavin
---
meta/recipes-support/gdbm/{gdbm_1.18.bb => gdbm_1.18.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/gdbm/{gdbm_1.18.bb => gdbm_1.18.1.bb} (89%)
diff --git a/meta/recipes-support/gdbm/gdbm_1.18.bb
b/meta/recipes-support/gdbm/gdbm_1.18.1.bb
similarity index 89%
rename from meta/recipes-support/gdbm/gdbm_1.18.bb
rename to meta/recipes-support/gdbm/gdbm_1.18.1.bb
index aad4300952c..16ecc506cea 100644
--- a/meta/recipes-support/gdbm/gdbm_1.18.bb
+++ b/meta/recipes-support/gdbm/gdbm_1.18.1.bb
@@ -10,8 +10,8 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
file://ptest.patch \
"
-SRC_URI[md5sum] = "e316f8e4a3e7e4f23955be65d54fec48"
-SRC_URI[sha256sum] =
"b8822cb4769e2d759c828c06f196614936c88c141c3132b18252fe25c2b635ce"
+SRC_URI[md5sum] = "988dc82182121c7570e0cb8b4fcd5415"
+SRC_URI[sha256sum] =
"86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc"
inherit autotools gettext texinfo lib_package ptest
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/16] tiff: update to 4.0.10
Signed-off-by: Alexander Kanavin
---
.../libtiff/files/CVE-2017-17095.patch| 46 -
.../libtiff/files/CVE-2017-18013.patch| 42 -
.../libtiff/files/CVE-2017-9935.patch | 160
.../libtiff/files/CVE-2018-10963.patch| 39
.../libtiff/files/CVE-2018-5784.patch | 135 -
.../libtiff/files/CVE-2018-7456.patch | 178 --
.../libtiff/files/CVE-2018-8905.patch | 61 --
.../libtiff/files/libtool2.patch | 19 +-
.../libtiff/{tiff_4.0.9.bb => tiff_4.0.10.bb} | 15 +-
9 files changed, 16 insertions(+), 679 deletions(-)
delete mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2017-17095.patch
delete mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2017-18013.patch
delete mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2017-9935.patch
delete mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch
delete mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2018-5784.patch
delete mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2018-7456.patch
delete mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2018-8905.patch
rename meta/recipes-multimedia/libtiff/{tiff_4.0.9.bb => tiff_4.0.10.bb} (80%)
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2017-17095.patch
b/meta/recipes-multimedia/libtiff/files/CVE-2017-17095.patch
deleted file mode 100644
index 9b9962ed352..000
--- a/meta/recipes-multimedia/libtiff/files/CVE-2017-17095.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 9171da596c88e6a2dadcab4a3a896e1b4655 Mon Sep 17 00:00:00 2001
-From: Nathan Baker
-Date: Thu, 25 Jan 2018 21:28:15 +
-Subject: [PATCH] Add workaround to pal2rgb buffer overflow.
-
-CVE: CVE-2017-17095
-
-Upstream-Status: Backport (unchanged)
[gitlab.com/libtiff/libtiff/commit/9171da5...]
-
-Signed-off-by: Joe Slater
-Date: Sun, 31 Dec 2017 15:09:41 +0100
-Subject: [PATCH] libtiff/tif_print.c: TIFFPrintDirectory(): fix null pointer
- dereference on corrupted file. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2770
-
-Upstream-Status: Backport
-[https://gitlab.com/libtiff/libtiff/commit/c6f41df7b581402dfba3c19a1e3df4454c551a01]
-
-CVE: CVE-2017-18013
-
-Signed-off-by: Yi Zhao
- libtiff/tif_print.c | 8
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c
-index 24d4b98..f494cfb 100644
a/libtiff/tif_print.c
-+++ b/libtiff/tif_print.c
-@@ -667,13 +667,13 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
- #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
- fprintf(fd, "%3lu: [%8I64u, %8I64u]\n",
- (unsigned long) s,
-- (unsigned __int64) td->td_stripoffset[s],
-- (unsigned __int64) td->td_stripbytecount[s]);
-+ td->td_stripoffset ? (unsigned __int64)
td->td_stripoffset[s] : 0,
-+ td->td_stripbytecount ? (unsigned __int64)
td->td_stripbytecount[s] : 0);
- #else
- fprintf(fd, "%3lu: [%8llu, %8llu]\n",
- (unsigned long) s,
-- (unsigned long long) td->td_stripoffset[s],
-- (unsigned long long) td->td_stripbytecount[s]);
-+ td->td_stripoffset ? (unsigned long long)
td->td_stripoffset[s] : 0,
-+ td->td_stripbytecount ? (unsigned long long)
td->td_stripbytecount[s] : 0);
- #endif
- }
- }
---
-2.7.4
-
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2017-9935.patch
b/meta/recipes-multimedia/libtiff/files/CVE-2017-9935.patch
deleted file mode 100644
index 60684dd2a68..000
--- a/meta/recipes-multimedia/libtiff/files/CVE-2017-9935.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From abb0055d21c52a9925314d5b0628fb2b6307619c Mon Sep 17 00:00:00 2001
-From: Brian May
-Date: Thu, 7 Dec 2017 07:46:47 +1100
-Subject: [PATCH] tiff2pdf: Fix CVE-2017-9935
-
-Fix for http://bugzilla.maptools.org/show_bug.cgi?id=2704
-
-This vulnerability - at least for the supplied test case - is because we
-assume that a tiff will only have one transfer function that is the same
-for all pages. This is not required by the TIFF standards.
-
-We than read the transfer function for every page. Depending on the
-transfer function, we allocate either 2 or 4 bytes to the XREF buffer.
-We allocate this memory after we read in the transfer function for the
-page.
-
-For the first exploit - POC1, this file has 3 pages. For the first page
-we allocate 2 extra extra XREF entries. Then for the next page 2 more
-entries. Then for the last page the transfer function changes and we
-allocate 4 more entries.
-
-When we read the file into memory, we assume we have 4 bytes extra for
-each and every page (as per the last transfer function we read). Which
-is not correct, we only have 2 bytes
[OE-core] [PATCH 07/16] icu: update to 63.1
Signed-off-by: Alexander Kanavin
---
.../icu/icu/fix-install-manx.patch| 21 ---
.../icu/{icu_62.1.bb => icu_63.1.bb} | 4 ++--
2 files changed, 11 insertions(+), 14 deletions(-)
rename meta/recipes-support/icu/{icu_62.1.bb => icu_63.1.bb} (85%)
diff --git a/meta/recipes-support/icu/icu/fix-install-manx.patch
b/meta/recipes-support/icu/icu/fix-install-manx.patch
index 8186fb41227..925b064ebd5 100644
--- a/meta/recipes-support/icu/icu/fix-install-manx.patch
+++ b/meta/recipes-support/icu/icu/fix-install-manx.patch
@@ -1,7 +1,7 @@
-From 3063a9211669bee673840ee81f81d30699b9b702 Mon Sep 17 00:00:00 2001
+From a6ddabc8cadb76bfe2d2e374a6702442cfe51cce Mon Sep 17 00:00:00 2001
From: Ross Burton
Date: Fri, 9 Oct 2015 17:50:41 +0100
-Subject: [PATCH 2/4] icu: fix install race
+Subject: [PATCH] icu: fix install race
The generic recursive target calls target-local so also adding it to the
dependency list results in races due to install-local being executed twice in
@@ -18,11 +18,11 @@ Signed-off-by: Ross Burton
source/Makefile.in | 8
1 file changed, 4 insertions(+), 4 deletions(-)
-diff --git a/source/Makefile.in b/source/Makefile.in
-index c1db15b..4948deb 100644
+diff --git a/Makefile.in b/Makefile.in
+index be9435b..ada20d7 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -73,7 +73,7 @@ EXTRA_DATA =
+@@ -77,7 +77,7 @@ EXTRA_DATA =
## List of phony targets
.PHONY : all all-local all-recursive install install-local install-udata
install-udata-files install-udata-dlls \
@@ -31,7 +31,7 @@ index c1db15b..4948deb 100644
distclean-local distclean-recursive doc dist dist-local dist-recursive
\
check check-local check-recursive clean-recursive-with-twist install-icu \
doc install-doc tests icu4j-data icu4j-data-install update-windows-makefiles
xcheck-local xcheck-recursive xperf xcheck xperf-recursive \
-@@ -84,9 +84,9 @@ check-exhaustive check-exhaustive-local
check-exhaustive-recursive releaseDist
+@@ -88,9 +88,9 @@ check-exhaustive check-exhaustive-local
check-exhaustive-recursive releaseDist
## List of standard targets
all: all-local all-recursive
@@ -43,15 +43,12 @@ index c1db15b..4948deb 100644
dist: dist-recursive
check: all check-recursive
check-recursive: all
-@@ -350,7 +350,7 @@ config.status: $(srcdir)/configure
$(srcdir)/common/unicode/uvernum.h
-
+@@ -357,7 +357,7 @@ config.status: $(srcdir)/configure
$(srcdir)/common/unicode/uvernum.h
install-manx: $(MANX_FILES)
$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
+ ifneq ($(MANX_FILES),)
- $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION)
+ $(INSTALL_DATA) $^ $(DESTDIR)$(mandir)/man$(SECTION)
+ endif
config/%.$(SECTION): $(srcdir)/config/%.$(SECTION).in
- cd $(top_builddir) \
---
-2.14.2
-
diff --git a/meta/recipes-support/icu/icu_62.1.bb
b/meta/recipes-support/icu/icu_63.1.bb
similarity index 85%
rename from meta/recipes-support/icu/icu_62.1.bb
rename to meta/recipes-support/icu/icu_63.1.bb
index 4e3750b997a..e593dc1bdbd 100644
--- a/meta/recipes-support/icu/icu_62.1.bb
+++ b/meta/recipes-support/icu/icu_63.1.bb
@@ -22,8 +22,8 @@ SRC_URI = "${BASE_SRC_URI} \
SRC_URI_append_class-target = "\
file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
"
-SRC_URI[md5sum] = "490ad9d920158e0314e10ba74ae9a150"
-SRC_URI[sha256sum] =
"3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3"
+SRC_URI[md5sum] = "9e40f6055294284df958200e308bce50"
+SRC_URI[sha256sum] =
"05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d"
UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/"
UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/;
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/16] dmidecode: update to 3.2
Also, replace a sed hack with a proper patch.
Signed-off-by: Alexander Kanavin
---
...mitting-changes-from-do_unpack_extra.patch | 24 +++
.../{dmidecode_3.1.bb => dmidecode_3.2.bb}| 13 --
2 files changed, 29 insertions(+), 8 deletions(-)
create mode 100644
meta/recipes-devtools/dmidecode/dmidecode/0001-Committing-changes-from-do_unpack_extra.patch
rename meta/recipes-devtools/dmidecode/{dmidecode_3.1.bb => dmidecode_3.2.bb}
(60%)
diff --git
a/meta/recipes-devtools/dmidecode/dmidecode/0001-Committing-changes-from-do_unpack_extra.patch
b/meta/recipes-devtools/dmidecode/dmidecode/0001-Committing-changes-from-do_unpack_extra.patch
new file mode 100644
index 000..c9b19182ddf
--- /dev/null
+++
b/meta/recipes-devtools/dmidecode/dmidecode/0001-Committing-changes-from-do_unpack_extra.patch
@@ -0,0 +1,24 @@
+From 00a3ace35d66e7ae60046e254a4d00f0f9c1abe2 Mon Sep 17 00:00:00 2001
+From: OpenEmbedded
+Date: Thu, 22 Nov 2018 12:05:04 +
+Subject: [PATCH] Do not install to /usr/local
+
+Upstream-Status: Inappropriate
+Signed-off-by: Alexander Kanavin
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 77c9310..fc378fd 100644
+--- a/Makefile
b/Makefile
+@@ -30,7 +30,7 @@ CFLAGS += -O2
+ LDFLAGS =
+
+ DESTDIR =
+-prefix = /usr/local
++prefix = /usr
+ sbindir = $(prefix)/sbin
+ mandir = $(prefix)/share/man
+ man8dir = $(mandir)/man8
diff --git a/meta/recipes-devtools/dmidecode/dmidecode_3.1.bb
b/meta/recipes-devtools/dmidecode/dmidecode_3.2.bb
similarity index 60%
rename from meta/recipes-devtools/dmidecode/dmidecode_3.1.bb
rename to meta/recipes-devtools/dmidecode/dmidecode_3.2.bb
index b423fda6d24..63f4061cb7e 100644
--- a/meta/recipes-devtools/dmidecode/dmidecode_3.1.bb
+++ b/meta/recipes-devtools/dmidecode/dmidecode_3.2.bb
@@ -3,7 +3,9 @@ HOMEPAGE = "http://www.nongnu.org/dmidecode/;
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/dmidecode/${BP}.tar.xz"
+SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/dmidecode/${BP}.tar.xz \
+ file://0001-Committing-changes-from-do_unpack_extra.patch \
+ "
COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm|powerpc|powerpc64).*-linux"
@@ -17,11 +19,6 @@ do_install() {
oe_runmake DESTDIR="${D}" install
}
-do_unpack_extra() {
- sed -i -e '/^prefix/s:/usr/local:${exec_prefix}:' ${S}/Makefile
-}
-addtask unpack_extra after do_unpack before do_patch
-
-SRC_URI[md5sum] = "679c2c015c515aa6ca5f229aee49c102"
-SRC_URI[sha256sum] =
"d766ce9b25548c59b1e7e930505b4cad9a7bb0b904a1a391fbb604d529781ac0"
+SRC_URI[md5sum] = "9cc2e27e74ade740a25b1aaf0412461b"
+SRC_URI[sha256sum] =
"077006fa2da0d06d6383728112f2edef9684e9c8da56752e97cd45a11f838edd"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/16] vala: update to 0.42.3
Signed-off-by: Alexander Kanavin
---
meta/recipes-devtools/vala/{vala_0.42.0.bb => vala_0.42.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/vala/{vala_0.42.0.bb => vala_0.42.3.bb} (64%)
diff --git a/meta/recipes-devtools/vala/vala_0.42.0.bb
b/meta/recipes-devtools/vala/vala_0.42.3.bb
similarity index 64%
rename from meta/recipes-devtools/vala/vala_0.42.0.bb
rename to meta/recipes-devtools/vala/vala_0.42.3.bb
index 2b02e0c8404..0d11ff6ba76 100644
--- a/meta/recipes-devtools/vala/vala_0.42.0.bb
+++ b/meta/recipes-devtools/vala/vala_0.42.3.bb
@@ -6,5 +6,5 @@ SRC_URI += "
file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pa
file://0001-Disable-valadoc.patch \
"
-SRC_URI[md5sum] = "aa6eb8097d25b5847ad3fab34c0ff865"
-SRC_URI[sha256sum] =
"62a55986da23cf3aaafd7624c32db2a1af11c8419e0bb0751727d10f1f7ab7be"
+SRC_URI[md5sum] = "6fdd6fadbef27e3dd05086d6a3220556"
+SRC_URI[sha256sum] =
"5fc73dd1e683dc7391bb96d02b2f671aa8289411a48611a05265629e0048587d"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/16] openssl10: update to 1.0.2q
Signed-off-by: Alexander Kanavin
---
.../openssl10/0001-fix-CVE-2018-0734.patch| 33 ---
...penssl10_1.0.2p.bb => openssl10_1.0.2q.bb} | 5 ++-
2 files changed, 2 insertions(+), 36 deletions(-)
delete mode 100644
meta/recipes-connectivity/openssl/openssl10/0001-fix-CVE-2018-0734.patch
rename meta/recipes-connectivity/openssl/{openssl10_1.0.2p.bb =>
openssl10_1.0.2q.bb} (98%)
diff --git
a/meta/recipes-connectivity/openssl/openssl10/0001-fix-CVE-2018-0734.patch
b/meta/recipes-connectivity/openssl/openssl10/0001-fix-CVE-2018-0734.patch
deleted file mode 100644
index b9865a69b5f..000
--- a/meta/recipes-connectivity/openssl/openssl10/0001-fix-CVE-2018-0734.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-CVE: CVE-2018-0734
-
-Upstream-Status: Backport
-
-Signed-off-by: Kai Kang
-
-From 43e6a58d4991a451daf4891ff05a48735df871ac Mon Sep 17 00:00:00 2001
-From: Pauli
-Date: Mon, 29 Oct 2018 08:24:22 +1000
-Subject: [PATCH] Merge DSA reallocation timing fix CVE-2018-0734.
-
-Reviewed-by: Richard Levitte
-(Merged from https://github.com/openssl/openssl/pull/7513)
- crypto/dsa/dsa_ossl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c
-index 2dcfed..100e269268 100644
a/crypto/dsa/dsa_ossl.c
-+++ b/crypto/dsa/dsa_ossl.c
-@@ -279,7 +279,7 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM
**kinvp,
- goto err;
-
- /* Preallocate space */
--q_bits = BN_num_bits(dsa->q);
-+q_bits = BN_num_bits(dsa->q) + sizeof(dsa->q->d[0]) * 16;
- if (!BN_set_bit(, q_bits)
- || !BN_set_bit(, q_bits)
- || !BN_set_bit(, q_bits))
---
-2.17.0
-
diff --git a/meta/recipes-connectivity/openssl/openssl10_1.0.2p.bb
b/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb
similarity index 98%
rename from meta/recipes-connectivity/openssl/openssl10_1.0.2p.bb
rename to meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb
index 43259407010..8058b98677a 100644
--- a/meta/recipes-connectivity/openssl/openssl10_1.0.2p.bb
+++ b/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb
@@ -40,7 +40,6 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz
\
file://0001-Fix-build-with-clang-using-external-assembler.patch \
file://0001-openssl-force-soft-link-to-avoid-rare-race.patch \
file://0001-allow-manpages-to-be-disabled.patch \
- file://0001-fix-CVE-2018-0734.patch \
"
SRC_URI_append_class-target = " \
@@ -52,8 +51,8 @@ SRC_URI_append_class-nativesdk = " \
file://environment.d-openssl.sh \
"
-SRC_URI[md5sum] = "ac5eb30bf5798aa14b1ae6d0e7da58df"
-SRC_URI[sha256sum] =
"50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00"
+SRC_URI[md5sum] = "7563e1ce046cb21948eeb6ba1a0eb71c"
+SRC_URI[sha256sum] =
"5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684"
S = "${WORKDIR}/openssl-${PV}"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/16] openssl: update to 1.1.1a
Signed-off-by: Alexander Kanavin
---
.../openssl/0002-fix-CVE-2018-0734.patch | 108 --
.../openssl/0003-fix-CVE-2018-0735.patch | 50
.../{openssl_1.1.1.bb => openssl_1.1.1a.bb} | 6 +-
3 files changed, 2 insertions(+), 162 deletions(-)
delete mode 100644
meta/recipes-connectivity/openssl/openssl/0002-fix-CVE-2018-0734.patch
delete mode 100644
meta/recipes-connectivity/openssl/openssl/0003-fix-CVE-2018-0735.patch
rename meta/recipes-connectivity/openssl/{openssl_1.1.1.bb =>
openssl_1.1.1a.bb} (96%)
diff --git
a/meta/recipes-connectivity/openssl/openssl/0002-fix-CVE-2018-0734.patch
b/meta/recipes-connectivity/openssl/openssl/0002-fix-CVE-2018-0734.patch
deleted file mode 100644
index 2a3e03fe2af..000
--- a/meta/recipes-connectivity/openssl/openssl/0002-fix-CVE-2018-0734.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-Backport patch to fix CVE-2018-0734. Remove a section which only remove a
-space. It can't be applied because the context is different.
-
-CVE: CVE-2018-0734
-Upstream-Status: Backport
-
-Signed-off-by: Kai Kang
-
-From 8abfe72e8c1de1b95f50aa0d9134803b4d00070f Mon Sep 17 00:00:00 2001
-From: Pauli
-Date: Wed, 24 Oct 2018 07:42:46 +1000
-Subject: [PATCH] Timing vulnerability in DSA signature generation
- (CVE-2018-0734).
-
-Avoid a timing attack that leaks information via a side channel that
-triggers when a BN is resized. Increasing the size of the BNs
-prior to doing anything with them suppresses the attack.
-
-Thanks due to Samuel Weiser for finding and locating this.
-
-Reviewed-by: Bernd Edlinger
-(Merged from https://github.com/openssl/openssl/pull/7486)
-
-(cherry picked from commit a9cfb8c2aa7254a4aa6a1716909e3f8cb78049b6)
- crypto/dsa/dsa_ossl.c | 28 +++-
- 1 file changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c
-index ca20811200..2dd2d7489a 100644
a/crypto/dsa/dsa_ossl.c
-+++ b/crypto/dsa/dsa_ossl.c
-@@ -9,6 +9,7 @@
-
- #include
- #include "internal/cryptlib.h"
-+#include "internal/bn_int.h"
- #include
- #include
- #include "dsa_locl.h"
-@@ -180,9 +181,9 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
- {
- BN_CTX *ctx = NULL;
- BIGNUM *k, *kinv = NULL, *r = *rp;
--BIGNUM *l, *m;
-+BIGNUM *l;
- int ret = 0;
--int q_bits;
-+int q_bits, q_words;
-
- if (!dsa->p || !dsa->q || !dsa->g) {
- DSAerr(DSA_F_DSA_SIGN_SETUP, DSA_R_MISSING_PARAMETERS);
-@@ -191,8 +192,7 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
-
- k = BN_new();
- l = BN_new();
--m = BN_new();
--if (k == NULL || l == NULL || m == NULL)
-+if (k == NULL || l == NULL)
- goto err;
-
- if (ctx_in == NULL) {
-@@ -203,9 +203,9 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
-
- /* Preallocate space */
- q_bits = BN_num_bits(dsa->q);
--if (!BN_set_bit(k, q_bits)
--|| !BN_set_bit(l, q_bits)
--|| !BN_set_bit(m, q_bits))
-+q_words = bn_get_top(dsa->q);
-+if (!bn_wexpand(k, q_words + 2)
-+|| !bn_wexpand(l, q_words + 2))
- goto err;
-
- /* Get random k */
-@@ -240,14 +240,17 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
- * small timing information leakage. We then choose the sum that is
- * one bit longer than the modulus.
- *
-- * TODO: revisit the BN_copy aiming for a memory access agnostic
-- * conditional copy.
-+ * There are some concerns about the efficacy of doing this. More
-+ * specificly refer to the discussion starting with:
-+ * https://github.com/openssl/openssl/pull/7486#discussion_r228323705
-+ * The fix is to rework BN so these gymnastics aren't required.
- */
- if (!BN_add(l, k, dsa->q)
--|| !BN_add(m, l, dsa->q)
--|| !BN_copy(k, BN_num_bits(l) > q_bits ? l : m))
-+|| !BN_add(k, l, dsa->q))
- goto err;
-
-+BN_consttime_swap(BN_is_bit_set(l, q_bits), k, l, q_words + 2);
-+
- if ((dsa)->meth->bn_mod_exp != NULL) {
- if (!dsa->meth->bn_mod_exp(dsa, r, dsa->g, k, dsa->p, ctx,
-dsa->method_mont_p))
-@@ -275,7 +278,6 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
- BN_CTX_free(ctx);
- BN_clear_free(k);
- BN_clear_free(l);
--BN_clear_free(m);
- return ret;
- }
-
---
-2.17.0
-
diff --git
a/meta/recipes-connectivity/openssl/openssl/0003-fix-CVE-2018-0735.patch
b/meta/recipes-connectivity/openssl/openssl/0003-fix-CVE-2018-0735.patch
deleted file mode 100644
index 736323f0ce6..000
--- a/meta/recipes-connectivity/openssl/openssl/0003-fix-CVE-2018-0735.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-CVE: CVE-2018-0735
-
-Upstream-Status: Backport
-
-Signed-off-by: Kai Kang
-
-From b1d6d55ece1c26fa2829e2b819b038d7b6d692b4 Mon Sep 17 00:00:00 2001
-From: Pauli
-Date: Fri, 26 Oct 2018 10:54:58 +1000
-Subject: [PATCH] Timing vulnerability in ECDSA
[OE-core] [PATCH 01/16] gobject-introspection: update to 1.58.1
Also, change default meson option to building introspection files
(previously they were not built by default).
Signed-off-by: Alexander Kanavin
---
...0001-Port-cross-compilation-support-to-meson.patch | 11 ++-
...e-the-repository-directory-for-native-builds.patch | 2 +-
...tion_1.58.0.bb => gobject-introspection_1.58.1.bb} | 4 ++--
3 files changed, 9 insertions(+), 8 deletions(-)
rename
meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.58.0.bb =>
gobject-introspection_1.58.1.bb} (98%)
diff --git
a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
index b0eee1ebe5b..63b02fe0f3d 100644
---
a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
+++
b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
@@ -1,10 +1,11 @@
-From e8ce42c5cb54847517fe8fbe50bbaea452618218 Mon Sep 17 00:00:00 2001
+From fabf8c505181636182a357e0c6e764b752ccf468 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin
Date: Thu, 15 Nov 2018 15:10:05 +0100
Subject: [PATCH] Port cross-compilation support to meson
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin
+
---
gir/meson.build | 59 ++-
meson.build | 4 +++-
@@ -12,7 +13,7 @@ Signed-off-by: Alexander Kanavin
3 files changed, 66 insertions(+), 17 deletions(-)
diff --git a/gir/meson.build b/gir/meson.build
-index 607bbc4..c0e221b 100644
+index 607bbc45..c0e221b3 100644
--- a/gir/meson.build
+++ b/gir/meson.build
@@ -37,15 +37,27 @@ typelibdir = join_paths(get_option('libdir'),
'girepository-1.0')
@@ -115,7 +116,7 @@ index 607bbc4..c0e221b 100644
install_dir: typelibdir,
)
diff --git a/meson.build b/meson.build
-index 7ec9532..9e20da5 100644
+index 7ec95328..9e20da57 100644
--- a/meson.build
+++ b/meson.build
@@ -76,7 +76,9 @@ libffi_dep = dependency('libffi',
@@ -130,7 +131,7 @@ index 7ec9532..9e20da5 100644
subdir('docs')
subdir('tests')
diff --git a/meson_options.txt b/meson_options.txt
-index 49726be..3e17c78 100644
+index 49726be6..d557a3b6 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -21,3 +21,23 @@ option('cairo-libname', type: 'string',
@@ -150,7 +151,7 @@ index 49726be..3e17c78 100644
+ description: 'Use a ldd wrapper instead of system ldd command in giscanner
(useful when cross-compiling)'
+)
+
-+option('enable-introspection-data', type: 'boolean', value : false,
++option('enable-introspection-data', type: 'boolean', value : true,
+ description: 'Build introspection data (.gir and .typelib files) in
addition to library and tools'
+)
+
diff --git
a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
index b9754a96c22..17b9eac057c 100644
---
a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
+++
b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
@@ -1,4 +1,4 @@
-From 2e2bf063ab79ddff1c284834aef8e22710db9350 Mon Sep 17 00:00:00 2001
+From a20b4d70f9875b7c54750ab0f02eefb0870d Mon Sep 17 00:00:00 2001
From: Sascha Silbe
Date: Fri, 8 Jun 2018 13:55:10 +0200
Subject: [PATCH] Relocate the repository directory for native builds
diff --git
a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.0.bb
b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.1.bb
similarity index 98%
rename from
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.0.bb
rename to
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.1.bb
index c9a0d816f5e..66f99185389 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.0.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.1.bb
@@ -22,8 +22,8 @@ SRC_URI =
"${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$
file://0001-Port-cross-compilation-support-to-meson.patch \
"
-SRC_URI[md5sum] = "94fec875276262037bfcd51226db12fe"
-SRC_URI[sha256sum] =
"27c1590a32749de0a5481ce897772547043e94bccba4bc0a7edb3d8513e401ec"
+SRC_URI[md5sum] = "101b04fb0184f9a0c718d450c056d68c"
+SRC_URI[sha256sum] =
"4954681fa5c5ed95451d914de89de1263a5b35158b1ded1a8b870042c0d0df89"
SRC_URI_append_class-native = "
file://0001-Relocate-the-repository-directory-for-native-builds.patch"
--
2.17.1
--
___
Openembedded-core mailing list
[OE-core] [PATCH 2/2] openssl: don't disable the AFALG engine based on host kernel
Whether the AFALG engine (use of hardware crypto via AF_ALG) is enable or
disable depends on whether the host kernel is 4.1 or above, which has no bearing
on whether the target system supports it.
Remove the complicated logic and simply enable/disable as requested.
Signed-off-by: Ross Burton
---
.../openssl/openssl/afalg.patch| 31 ++
meta/recipes-connectivity/openssl/openssl_1.1.1.bb | 1 +
2 files changed, 32 insertions(+)
create mode 100644 meta/recipes-connectivity/openssl/openssl/afalg.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/afalg.patch
b/meta/recipes-connectivity/openssl/openssl/afalg.patch
new file mode 100644
index 000..7c4b084f3df
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/afalg.patch
@@ -0,0 +1,31 @@
+Don't refuse to build afalgeng if cross-compiling or the host kernel is too
old.
+
+Upstream-Status: Submitted [hhttps://github.com/openssl/openssl/pull/7688]
+Signed-off-by: Ross Burton
+
+diff --git a/Configure b/Configure
+index 3baa8ce..9ef52ed 100755
+--- a/Configure
b/Configure
+@@ -1550,20 +1550,7 @@ unless ($disabled{"crypto-mdebug-backtrace"})
+ unless ($disabled{afalgeng}) {
+ $config{afalgeng}="";
+ if (grep { $_ eq 'afalgeng' } @{$target{enable}}) {
+-my $minver = 4*1 + 1*100 + 0;
+-if ($config{CROSS_COMPILE} eq "") {
+-my $verstr = `uname -r`;
+-my ($ma, $mi1, $mi2) = split("\\.", $verstr);
+-($mi2) = $mi2 =~ /(\d+)/;
+-my $ver = $ma*1 + $mi1*100 + $mi2;
+-if ($ver < $minver) {
+-$disabled{afalgeng} = "too-old-kernel";
+-} else {
+-push @{$config{engdirs}}, "afalg";
+-}
+-} else {
+-$disabled{afalgeng} = "cross-compiling";
+-}
++push @{$config{engdirs}}, "afalg";
+ } else {
+ $disabled{afalgeng} = "not-linux";
+ }
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1.bb
b/meta/recipes-connectivity/openssl/openssl_1.1.1.bb
index 8d5d4b146e7..5d19910941e 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1.bb
@@ -18,6 +18,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz
\
file://0002-fix-CVE-2018-0734.patch \
file://0003-fix-CVE-2018-0735.patch \
file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \
+ file://afalg.patch \
"
SRC_URI_append_class-nativesdk = " \
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] openssl: output the configure data in do_configure
To aid debugging configure, dump the configdata in do_configure.
Signed-off-by: Ross Burton
---
meta/recipes-connectivity/openssl/openssl_1.1.1.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1.bb
b/meta/recipes-connectivity/openssl/openssl_1.1.1.bb
index 1234b64b864..8d5d4b146e7 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1.bb
@@ -114,6 +114,7 @@ do_configure () {
# environment variables set by bitbake. Adjust the environment
variables instead.
PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \
perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS}
--prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdir} $target
+ perl ${B}/configdata.pm --dump
}
do_install () {
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v6] u-boot: Add mkenvimage tool
On Thu, 2018-11-22 at 13:18 +, Alexey Brodkin wrote:
> Hi, Richard, Otavio,
>
> On Thu, 2018-11-22 at 11:28 +0300, Alexey Brodkin wrote:
> > This utility is used for creation of images containing
> > usable in run-time U-Boot environment.
> >
> > As of today this utility is added per-board like here [1]
> > for Intel Edison board.
> >
> > [1]
> > http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-edison/tree/meta-intel-edison-bsp/recipes-bsp/u-boot/u-boot-tools_2014.04.bb
> >
> > Given there're quite some U-Boot tools that we may want to add
> > later
> > this recipe name switch from "u-boot-mkimage" to generic "u-boot-
> > tools"
> > still for compatibility we provide "u-boot-mkimage" with help
> > of PROVIDES as well as proposed "u-boot-mkenvimage".
> >
> > Signed-off-by: Alexey Brodkin
> > Cc: Richard Purdie
> > Cc: Otavio Salvador
> > Cc: Martin Jansa
> > Cc: Ross Burton
> > Cc: Marek Vasut
> > ---
> >
> > Changes v5 -> v6:
> > * Really enable separate pakaging of mkimage and mkenvimage
> >
> > Changes v4 -> v5:
> > * Added backward compatibility with "u-boot-mkimage" recipe
> > * Improved handling of nativesdk
> > * Update all references from "u-boot-mkimage" to "u-boot-tools"
> >
> > Changes v3 -> v4:
> > * Updated maintainer info to make Yocto autobuilder happy again
> >
> > Changes v2 -> v3:
> > * Recipe renamed to "u-boot-tools" to better match its contents
> >(especially in the future as we add more tools there)
> > * Existing "u-boot-mkimage" and newly introduced "u-boot-
> > mkenvimage"
> >made avaialble via PROVIDES
> >
> > Changes v1 -> v2:
> > * Got rid of a separate recipe and instead added mkenvimage
> >to u-boot mkimage recipe
>
> So apparently something is still broken :(
> ->8---
> NOTE: Resolving any missing task queue dependencies
> ERROR: Nothing RPROVIDES 'u-boot-tools-native-mkimage-native' (but
> virtual:native:.../openembedded-core/meta/recipes-bsp/u-boot/u-boot-
> tools_2018.07.bb RDEPENDS on or otherwise requires it)
>
> NOTE: Runtime target 'u-boot-tools-native-mkimage-native' is
> unbuildable, removing...
> Missing or unbuildable dependency chain was: ['u-boot-tools-native-
> mkimage-native']
>
> ERROR: Required build target 'core-image-base' has no buildable
> providers.
> Missing or unbuildable dependency chain was: ['core-image-base',
> 'virtual/kernel', 'u-boot-tools-native', 'u-boot-tools-native-
> mkimage-native']
> ->8---
>
> Indeed "u-boot-tools-native-mkimage-native" looks quite odd.
>
> Any hints on how that could be addressed?
Just guessing but maybe
RDEPENDS_${PN}_class-native = ""
?
Cheers,
Richard
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ✗ patchtest: failure for boost-context: Reproducibility: Set .file section for all *_elf_gas.S files (rev2)
On Thu, 22 Nov 2018 at 00:38, Douglas Royds wrote: > > On 22/11/18 1:33 PM, Patchwork wrote: > > > ... > > > > * Issue Upstream-Status is Submitted, but it is not mentioned > > where [test_upstream_status_presence_format] > >Suggested fixInclude where > > reproducibility-add-file-directive-to-assembler.patch was submitted > > Yes it is ... > > > >Current Upstream-Status: Submitted > > https://github.com/boostorg/context/issues/91 > >Standard format Upstream-Status: Submitted [where] The [] is not syntactic markers but literal characters, i.e. it expects to see: Upstream-Status: Submitted [https://github.com/boostorg/context/issues/91] Yes, this test could be considered overly pedantic, but I'm also aware that raising and formalising this would be a bikeshed of epic proportions... Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v6] u-boot: Add mkenvimage tool
Hi, Richard, Otavio, On Thu, 2018-11-22 at 11:28 +0300, Alexey Brodkin wrote: > This utility is used for creation of images containing > usable in run-time U-Boot environment. > > As of today this utility is added per-board like here [1] > for Intel Edison board. > > [1] > http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-edison/tree/meta-intel-edison-bsp/recipes-bsp/u-boot/u-boot-tools_2014.04.bb > > Given there're quite some U-Boot tools that we may want to add later > this recipe name switch from "u-boot-mkimage" to generic "u-boot-tools" > still for compatibility we provide "u-boot-mkimage" with help > of PROVIDES as well as proposed "u-boot-mkenvimage". > > Signed-off-by: Alexey Brodkin > Cc: Richard Purdie > Cc: Otavio Salvador > Cc: Martin Jansa > Cc: Ross Burton > Cc: Marek Vasut > --- > > Changes v5 -> v6: > * Really enable separate pakaging of mkimage and mkenvimage > > Changes v4 -> v5: > * Added backward compatibility with "u-boot-mkimage" recipe > * Improved handling of nativesdk > * Update all references from "u-boot-mkimage" to "u-boot-tools" > > Changes v3 -> v4: > * Updated maintainer info to make Yocto autobuilder happy again > > Changes v2 -> v3: > * Recipe renamed to "u-boot-tools" to better match its contents >(especially in the future as we add more tools there) > * Existing "u-boot-mkimage" and newly introduced "u-boot-mkenvimage" >made avaialble via PROVIDES > > Changes v1 -> v2: > * Got rid of a separate recipe and instead added mkenvimage >to u-boot mkimage recipe So apparently something is still broken :( ->8--- NOTE: Resolving any missing task queue dependencies ERROR: Nothing RPROVIDES 'u-boot-tools-native-mkimage-native' (but virtual:native:.../openembedded-core/meta/recipes-bsp/u-boot/u-boot- tools_2018.07.bb RDEPENDS on or otherwise requires it) NOTE: Runtime target 'u-boot-tools-native-mkimage-native' is unbuildable, removing... Missing or unbuildable dependency chain was: ['u-boot-tools-native-mkimage-native'] ERROR: Required build target 'core-image-base' has no buildable providers. Missing or unbuildable dependency chain was: ['core-image-base', 'virtual/kernel', 'u-boot-tools-native', 'u-boot-tools-native-mkimage-native'] ->8--- Indeed "u-boot-tools-native-mkimage-native" looks quite odd. Any hints on how that could be addressed? -Alexey -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] nopackages.bbclass: improve performance for cleansstate
Sent from mobile phone
> 在 2018年11月22日，20:15，Richard Purdie 写道：
>
>> On Thu, 2018-11-22 at 19:51 +0800, Robert Yang wrote:
>> Leave the task in SSTATETASKS doesn't make sense when it is removed,
>> so also
>> remove it from SSTATETASKS.
>>
>> This can improve the performance a lot for "bitbake > native/cross/crosssdk>
>> -ccleansstate" when there are a lot of sstate files.
>>
>> For example:
>> * Before
>> $ bitbake quilt-native -ccleansstate
>> - Check log.do_cleansstate:
>> Removing /sstate-cache/*/*/sstate:quilt-native:x86_64-
>> linux:0.65:r0:x86_64:3:*_package.tgz*
>> Removing /sstate-cache/*/*/sstate:quilt-native:x86_64-
>> linux:0.65:r0:x86_64:3:*_package_qa.tgz*
>> Removing /sstate-cache/*/*/sstate:quilt-native:x86_64-
>> linux:0.65:r0:x86_64:3:*_package_write_rpm.tgz*
>> Removing /sstate-cache/*/*/sstate:quilt-native:x86_64-
>> linux:0.65:r0:x86_64:3:*_packagedata.tgz*
>> Removing /sstate-cache/*/sstate:quilt-
>> native::0.65:r0::3:*_populate_lic.tgz*
>> Removing /sstate-cache/*/*/sstate:quilt-native:x86_64-
>> linux:0.65:r0:x86_64:3:*_populate_sysroot.tgz*
>>
>> There are no package tasks for quilt-native, so the first 4 lines
>> doesn't
>> make any sense, but the glob pattern "sstate-cache/*/*" is very
>> time
>> consuming when there are no disk caches. E.g., I have more than
>> 600,000
>> sstate files:
>> - Without disk caches
>> # echo 3 >/proc/sys/vm/drop_caches
>> $ time python3 -c 'import glob; glob.glob("/sstate-
>> cache/*/*/sstate:quilt-native:x86_64-
>> linux:0.65:r0:x86_64:3:*_package.tgz*")'
>>real4m32.583s
>>user0m5.768s
>>sys 0m12.892s
>>
>> - With disk caches (e.g., run it in the second time)
>> $ time python3 -c 'import glob; glob.glob("/sstate-
>> cache/*/*/sstate:quilt-native:x86_64-
>> linux:0.65:r0:x86_64:3:*_package.tgz*")'
>>real0m5.128s
>>user0m2.772s
>>sys 0m2.308s
>>
>> So the 4 removing *package* commands cost more than 20s or 272s in
>> theory.
>>
>> * After
>> $ bitbake quilt-native -ccleansstate
>> - Check log.do_cleansstate:
>> Removing /sstate-cache/*/sstate:quilt-
>> native::0.65:r0::3:*_populate_lic.tgz*
>> Removing /sstate-cache/*/*/sstate:quilt-native:x86_64-
>> linux:0.65:r0:x86_64:3:*_populate_sysroot.tgz*
>>
>> Now the package tasks are gone when cleanssate for native recipes,
>> which
>> saved 20s or 272s in theory.
>>
>> Signed-off-by: Robert Yang
>> ---
>> meta/classes/nopackages.bbclass | 35 +++--
>> --
>> 1 file changed, 23 insertions(+), 12 deletions(-)
>>
>> diff --git a/meta/classes/nopackages.bbclass
>> b/meta/classes/nopackages.bbclass
>> index 559f507..66e4936 100644
>> --- a/meta/classes/nopackages.bbclass
>> +++ b/meta/classes/nopackages.bbclass
>> @@ -1,12 +1,23 @@
>> -deltask do_package
>> -deltask do_package_write_rpm
>> -deltask do_package_write_ipk
>> -deltask do_package_write_deb
>> -deltask do_package_qa
>> -deltask do_packagedata
>> -deltask do_package_setscene
>> -deltask do_package_write_rpm_setscene
>> -deltask do_package_write_ipk_setscene
>> -deltask do_package_write_deb_setscene
>> -deltask do_package_qa_setscene
>> -deltask do_packagedata_setscene
>> +NO_PACKAGES_TASKS = " \
>> +do_package \
>> +do_package_write_rpm \
>> +do_package_write_ipk \
>> +do_package_write_deb \
>> +do_package_qa \
>> +do_packagedata \
>> +"
>> +
>> +python() {
>> +sstatetasks = (d.getVar('SSTATETASKS') or '').split()
>> +for task in d.getVar('NO_PACKAGES_TASKS').split():
>> +setscene_task = '%s_setscene' % task
>> +tasks = (task, setscene_task)
>> +for t in tasks:
>> +bb.build.deltask(t, d)
>> +
>> +if task in sstatetasks:
>> +bb.debug(2, 'Removing sstate task %s from SSTATETASKS' %
>> task)
>> +sstatetasks.remove(task)
>> +d.setVar('SSTATETASKS', ' '.join(sstatetasks))
>> +
>> +}
>
> I really don't want to turn more comparatively readable classes into a
> mess of anonymous python if we can help it.
>
> Can we not just teach cleansstate to check if a task exists before
> trying to delete the sstate? It should be possible with
> d.getVarFlag(taskname, "task")?
Thanks, yes, this is my first thought, but I only knew __BBTASKS which is an
internal var of bitbake, I will use d.getVarFlag(taskname, "task") to send a v2.
// Robert
>
> Cheers,
>
> Richard
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] nopackages.bbclass: improve performance for cleansstate
On Thu, 2018-11-22 at 19:51 +0800, Robert Yang wrote:
> Leave the task in SSTATETASKS doesn't make sense when it is removed,
> so also
> remove it from SSTATETASKS.
>
> This can improve the performance a lot for "bitbake native/cross/crosssdk>
> -ccleansstate" when there are a lot of sstate files.
>
> For example:
> * Before
> $ bitbake quilt-native -ccleansstate
> - Check log.do_cleansstate:
> Removing /sstate-cache/*/*/sstate:quilt-native:x86_64-
> linux:0.65:r0:x86_64:3:*_package.tgz*
> Removing /sstate-cache/*/*/sstate:quilt-native:x86_64-
> linux:0.65:r0:x86_64:3:*_package_qa.tgz*
> Removing /sstate-cache/*/*/sstate:quilt-native:x86_64-
> linux:0.65:r0:x86_64:3:*_package_write_rpm.tgz*
> Removing /sstate-cache/*/*/sstate:quilt-native:x86_64-
> linux:0.65:r0:x86_64:3:*_packagedata.tgz*
> Removing /sstate-cache/*/sstate:quilt-
> native::0.65:r0::3:*_populate_lic.tgz*
> Removing /sstate-cache/*/*/sstate:quilt-native:x86_64-
> linux:0.65:r0:x86_64:3:*_populate_sysroot.tgz*
>
> There are no package tasks for quilt-native, so the first 4 lines
> doesn't
> make any sense, but the glob pattern "sstate-cache/*/*" is very
> time
> consuming when there are no disk caches. E.g., I have more than
> 600,000
> sstate files:
> - Without disk caches
> # echo 3 >/proc/sys/vm/drop_caches
> $ time python3 -c 'import glob; glob.glob("/sstate-
> cache/*/*/sstate:quilt-native:x86_64-
> linux:0.65:r0:x86_64:3:*_package.tgz*")'
> real4m32.583s
> user0m5.768s
> sys 0m12.892s
>
> - With disk caches (e.g., run it in the second time)
> $ time python3 -c 'import glob; glob.glob("/sstate-
> cache/*/*/sstate:quilt-native:x86_64-
> linux:0.65:r0:x86_64:3:*_package.tgz*")'
> real0m5.128s
> user0m2.772s
> sys 0m2.308s
>
> So the 4 removing *package* commands cost more than 20s or 272s in
> theory.
>
> * After
> $ bitbake quilt-native -ccleansstate
> - Check log.do_cleansstate:
> Removing /sstate-cache/*/sstate:quilt-
> native::0.65:r0::3:*_populate_lic.tgz*
> Removing /sstate-cache/*/*/sstate:quilt-native:x86_64-
> linux:0.65:r0:x86_64:3:*_populate_sysroot.tgz*
>
> Now the package tasks are gone when cleanssate for native recipes,
> which
> saved 20s or 272s in theory.
>
> Signed-off-by: Robert Yang
> ---
> meta/classes/nopackages.bbclass | 35 +++--
> --
> 1 file changed, 23 insertions(+), 12 deletions(-)
>
> diff --git a/meta/classes/nopackages.bbclass
> b/meta/classes/nopackages.bbclass
> index 559f507..66e4936 100644
> --- a/meta/classes/nopackages.bbclass
> +++ b/meta/classes/nopackages.bbclass
> @@ -1,12 +1,23 @@
> -deltask do_package
> -deltask do_package_write_rpm
> -deltask do_package_write_ipk
> -deltask do_package_write_deb
> -deltask do_package_qa
> -deltask do_packagedata
> -deltask do_package_setscene
> -deltask do_package_write_rpm_setscene
> -deltask do_package_write_ipk_setscene
> -deltask do_package_write_deb_setscene
> -deltask do_package_qa_setscene
> -deltask do_packagedata_setscene
> +NO_PACKAGES_TASKS = " \
> +do_package \
> +do_package_write_rpm \
> +do_package_write_ipk \
> +do_package_write_deb \
> +do_package_qa \
> +do_packagedata \
> +"
> +
> +python() {
> +sstatetasks = (d.getVar('SSTATETASKS') or '').split()
> +for task in d.getVar('NO_PACKAGES_TASKS').split():
> +setscene_task = '%s_setscene' % task
> +tasks = (task, setscene_task)
> +for t in tasks:
> +bb.build.deltask(t, d)
> +
> +if task in sstatetasks:
> +bb.debug(2, 'Removing sstate task %s from SSTATETASKS' %
> task)
> +sstatetasks.remove(task)
> +d.setVar('SSTATETASKS', ' '.join(sstatetasks))
> +
> +}
I really don't want to turn more comparatively readable classes into a
mess of anonymous python if we can help it.
Can we not just teach cleansstate to check if a task exists before
trying to delete the sstate? It should be possible with
d.getVarFlag(taskname, "task")?
Cheers,
Richard
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [master][thud][PATCH] openssl: correct bad path on package preprocess
In case of SDK generation, /usr/bin/ path are not correct
and must be replaced by ${bindir}.
Signed-off-by: Christophe Priouzeau
---
meta/recipes-connectivity/openssl/openssl10_1.0.2p.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-connectivity/openssl/openssl10_1.0.2p.bb
b/meta/recipes-connectivity/openssl/openssl10_1.0.2p.bb
index 4325940..42f9bcf 100644
--- a/meta/recipes-connectivity/openssl/openssl10_1.0.2p.bb
+++ b/meta/recipes-connectivity/openssl/openssl10_1.0.2p.bb
@@ -354,8 +354,8 @@ openssl_package_preprocess () {
for file in `find ${PKGD} -name *.h -o -name *.pc -o -name *.so`; do
rm $file
done
-rm ${PKGD}/usr/bin/openssl
-rm ${PKGD}/usr/bin/c_rehash
-rmdir ${PKGD}/usr/bin
+rm ${PKGD}${bindir}/openssl
+rm ${PKGD}${bindir}/c_rehash
+rmdir ${PKGD}${bindir}
}
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gcc: Select proper ARC CPU when build for target
By default GCC for ARC is configured with ARC700 CPU.
This means when we don't pass "-mcpu=xxx":
a) Code will be compiled for ARC700
b) Libs will used for ARC700
And if we happen to run on ARCv2 core like ARC HSxx we
won't be able to use target gcc w/o "-mcpu=xxx" which
is not very convenient as we want to build "target" toolchain
but not canadian-cross.
Note the trick here is we set TUNE_PKGARCH in just 2 values,
it is either "arc700" for all ARCompact cores (ARC750 & ARC770)
and "archs" for all ARCv2 cores (ARC HS38 & HS48), see [1].
This gives us usable defaults.
For cross-compilation we use TUNE_CCARGS for fine-tuning depending
on which HW features we have on the current target so that
we may have HW feature A & B or B & C or A & B & C, see [2].
[1]
https://github.com/foss-for-synopsys-dwc-arc-processors/meta-synopsys/blob/master/conf/machine/include/tune-arcv2.inc#L4
[2]
https://github.com/foss-for-synopsys-dwc-arc-processors/meta-synopsys/blob/master/conf/machine/include/tune-arcv2.inc#L34
Signed-off-by: Alexey Brodkin
---
meta/recipes-devtools/gcc/gcc-target.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-devtools/gcc/gcc-target.inc
b/meta/recipes-devtools/gcc/gcc-target.inc
index bc2236fed0..6270059644 100644
--- a/meta/recipes-devtools/gcc/gcc-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-target.inc
@@ -20,6 +20,7 @@ ARMFPARCHEXT ?= ""
EXTRA_OECONF_append_armv6 = " --with-arch=armv6${ARMFPARCHEXT}"
EXTRA_OECONF_append_armv7a = " --with-arch=armv7-a${ARMFPARCHEXT}"
EXTRA_OECONF_append_armv7ve = " --with-arch=armv7ve${ARMFPARCHEXT}"
+EXTRA_OECONF_append_arc = " --with-cpu=${TUNE_PKGARCH}"
# libcc1 requres gcc_cv_objdump when cross build, but gcc_cv_objdump is
# set in subdir gcc, so subdir libcc1 can't use it, export it here to
--
2.16.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] sstate.bbclass: set SSTATE_EXTRAPATHWILDCARD explicitly
The glob.glob("/sstate/*/*/") is very time consuming, set
SSTATE_EXTRAPATHWILDCARD explicity to avoid that. This can save a lot of time
when there are many sstate files.
For example, I have more than 600,000 sstate files:
* Before
- Without disk caches
$ time python3 -c 'import glob;
glob.glob("/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_populate_sysroot.tgz*")'
real4m32.583s
user0m5.768s
sys 0m12.892s
- With disk caches
$ time python3 -c 'import glob;
glob.glob("/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_populate_sysroot.tgz*")'
real0m4.111s
user0m2.348s
sys 0m1.756s
* After
$ time python3 -c 'import glob;
glob.glob("/sstate-cache.bak/universal/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_populate_sysroot.tgz*")'
- Without disk caches:
real0m7.928s
user0m0.172s
sys 0m0.124s
- With disk caches:
real0m0.131s
user0m0.088s
sys 0m0.044s
We can see that it saves about 3.8s with disk caches, and saves about 264s
without disk caches.
Signed-off-by: Robert Yang
---
meta/classes/sstate.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index efb0096..94fde6d 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -101,7 +101,7 @@ python () {
if bb.data.inherits_class('native', d) or
bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross', d):
d.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/")
d.setVar('BB_HASHFILENAME', "True ${SSTATE_PKGSPEC} ${SSTATE_SWSPEC}")
-d.setVar('SSTATE_EXTRAPATHWILDCARD', "*/")
+d.setVar('SSTATE_EXTRAPATHWILDCARD', "${NATIVELSBSTRING}/")
unique_tasks = sorted(set((d.getVar('SSTATETASKS') or "").split()))
d.setVar('SSTATETASKS', " ".join(unique_tasks))
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] nopackages.bbclass: improve performance for cleansstate
Leave the task in SSTATETASKS doesn't make sense when it is removed, so also
remove it from SSTATETASKS.
This can improve the performance a lot for "bitbake
-ccleansstate" when there are a lot of sstate files.
For example:
* Before
$ bitbake quilt-native -ccleansstate
- Check log.do_cleansstate:
Removing
/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_package.tgz*
Removing
/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_package_qa.tgz*
Removing
/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_package_write_rpm.tgz*
Removing
/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_packagedata.tgz*
Removing /sstate-cache/*/sstate:quilt-native::0.65:r0::3:*_populate_lic.tgz*
Removing
/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_populate_sysroot.tgz*
There are no package tasks for quilt-native, so the first 4 lines doesn't
make any sense, but the glob pattern "sstate-cache/*/*" is very time
consuming when there are no disk caches. E.g., I have more than 600,000
sstate files:
- Without disk caches
# echo 3 >/proc/sys/vm/drop_caches
$ time python3 -c 'import glob;
glob.glob("/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_package.tgz*")'
real4m32.583s
user0m5.768s
sys 0m12.892s
- With disk caches (e.g., run it in the second time)
$ time python3 -c 'import glob;
glob.glob("/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_package.tgz*")'
real0m5.128s
user0m2.772s
sys 0m2.308s
So the 4 removing *package* commands cost more than 20s or 272s in theory.
* After
$ bitbake quilt-native -ccleansstate
- Check log.do_cleansstate:
Removing /sstate-cache/*/sstate:quilt-native::0.65:r0::3:*_populate_lic.tgz*
Removing
/sstate-cache/*/*/sstate:quilt-native:x86_64-linux:0.65:r0:x86_64:3:*_populate_sysroot.tgz*
Now the package tasks are gone when cleanssate for native recipes, which
saved 20s or 272s in theory.
Signed-off-by: Robert Yang
---
meta/classes/nopackages.bbclass | 35 +++
1 file changed, 23 insertions(+), 12 deletions(-)
diff --git a/meta/classes/nopackages.bbclass b/meta/classes/nopackages.bbclass
index 559f507..66e4936 100644
--- a/meta/classes/nopackages.bbclass
+++ b/meta/classes/nopackages.bbclass
@@ -1,12 +1,23 @@
-deltask do_package
-deltask do_package_write_rpm
-deltask do_package_write_ipk
-deltask do_package_write_deb
-deltask do_package_qa
-deltask do_packagedata
-deltask do_package_setscene
-deltask do_package_write_rpm_setscene
-deltask do_package_write_ipk_setscene
-deltask do_package_write_deb_setscene
-deltask do_package_qa_setscene
-deltask do_packagedata_setscene
+NO_PACKAGES_TASKS = " \
+do_package \
+do_package_write_rpm \
+do_package_write_ipk \
+do_package_write_deb \
+do_package_qa \
+do_packagedata \
+"
+
+python() {
+sstatetasks = (d.getVar('SSTATETASKS') or '').split()
+for task in d.getVar('NO_PACKAGES_TASKS').split():
+setscene_task = '%s_setscene' % task
+tasks = (task, setscene_task)
+for t in tasks:
+bb.build.deltask(t, d)
+
+if task in sstatetasks:
+bb.debug(2, 'Removing sstate task %s from SSTATETASKS' % task)
+sstatetasks.remove(task)
+d.setVar('SSTATETASKS', ' '.join(sstatetasks))
+
+}
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] Improve performance for native/cross/crosssdk's cleansstate
Hi RP and Ross, These 2 patches can improve performance a lot for native/cross/crosssdk's cleansstate: This test is based on more than 600,000 sstate files * Without disk caches # echo 3 >/proc/sys/vm/drop_caches $ bitbake -p $ time bitbake quilt-native -ccleansstate - Before: real4m53.815s user0m0.820s sys 0m0.128s - After real0m58.483s user0m0.744s sys 0m0.108s Saved 293 - 58 = 235s (80% improvement) * With disk caches (26.6s -> 5.8s, 78% improvement) $ bitbake -p $ time bitbake quilt-native -ccleansstate - Before: real0m26.682s user0m0.748s sys 0m0.088s - After real0m5.846s user0m0.716s sys 0m0.116s Saved 26.6 - 5.8 = 20.8s (78% improvement) == I have another idea is put sstate files into the directory named by the recipe, e.g.: sstate-cache/quilt-native/sstate:quilt-native::0.65:r0::3:773341447192feb6c1519cace0e6be35_populate_lic.tgz sstate-cache/quilt-native/sstate:quilt-native::0.65:r0::3:773341447192feb6c1519cace0e6be35_populate_lic.tgz.siginfo sstate-cache/quilt-native/sstate:quilt-native::0.65:r0::3:ab4a82a07b10926bb42d2f37242413c7_patch.tgz.siginfo sstate-cache/quilt-native/sstate:quilt-native::0.65:r0::3:e8a4c952a66942653e36f289eaf68ca5_fetch.tgz.siginfo sstate-cache/quilt-native/sstate:quilt-native::0.65:r0::3:fd35240c437cefa66e24cfe65d3fb335_unpack.tgz.siginfo This can make it easier to manage sstate files, and can reduce the load of glob.glob(), currently, the remove command is something like: $ rm -f glob.glob(sstate-cache/*/sstate:foo.*bar.*) If we put them into recipe named directory, then we can run: $ rm -f glob.glob(sstate-cache//sstate:foo.*bar.*) Which should be faster, what's your opinion, please ? // Robert The following changes since commit fc5418e7bbdecfb27bafe595084e0fd0f991a388: meta/icecc.bbclass: Update system blacklists (2018-11-21 11:48:18 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/sstate http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/sstate Robert Yang (2): nopackages.bbclass: improve performance for cleansstate sstate.bbclass: set SSTATE_EXTRAPATHWILDCARD explicitly meta/classes/nopackages.bbclass | 35 +++ meta/classes/sstate.bbclass | 2 +- 2 files changed, 24 insertions(+), 13 deletions(-) -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] terminal: Cope with unreleased versions of tmux
When tmux is built from a non-release Git version, its version number is
"next-X" where X appears to be the expected version number for the next
release. For example, when built from the current state of master, running
"tmux -V" yields:
tmux next-2.9
Currently check_tmux_pane_size only checks for the version being less than
1.9, so it seems unfair to fail with an obscure Python error in this case.
Let's just use the version number after the "next-" prefix if it is
present.
Signed-off-by: Mike Crowe
---
meta/lib/oe/terminal.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index 94afe394ed..bf5c37f897 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -296,6 +296,8 @@ def check_terminal_version(terminalName):
vernum = ver.split(' ')[-1]
if ver.startswith('tmux'):
vernum = ver.split()[-1]
+if ver.startswith('tmux next-'):
+vernum = ver.split()[-1][5:]
return vernum
def distro_name():
--
2.19.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v6] u-boot: Add mkenvimage tool
Hi Otavio, On Thu, 2018-11-22 at 07:30 -0200, Otavio Salvador wrote: > Hello Alexey, > > On Thu, Nov 22, 2018 at 6:28 AM Alexey Brodkin > wrote: > > This utility is used for creation of images containing > > usable in run-time U-Boot environment. > > > > As of today this utility is added per-board like here [1] > > for Intel Edison board. > > > > [1] > > https://urldefense.proofpoint.com/v2/url?u=http-3A__git.yoctoproject.org_cgit_cgit.cgi_meta-2Dintel-2Dedison_tree_meta-2Dintel-2Dedison-2Dbsp_recipes-2Dbsp_u-2Dboot_u-2Dboot-2Dtools-5F2014.04.bb=DwICAg=DPL6_X_6JkXFx7AXWqB0tg=lqdeeSSEes0GFDDl656eViXO7breS55ytWkhpk5R81I=0oSj04biS8fsfFjYHNTIfKozS-TUjseTTeyuKHHcljA=hpwGEnrX5gArYJHLxYhMZ4x6s3irTZyCMjjnFipip7k= > > > > Given there're quite some U-Boot tools that we may want to add later > > this recipe name switch from "u-boot-mkimage" to generic "u-boot-tools" > > still for compatibility we provide "u-boot-mkimage" with help > > of PROVIDES as well as proposed "u-boot-mkenvimage". > > > > Signed-off-by: Alexey Brodkin > > Cc: Richard Purdie > > Cc: Otavio Salvador > > Cc: Martin Jansa > > Cc: Ross Burton > > Cc: Marek Vasut > > Acked-by: Otavio Salvador > > I'd like to thank you to keep the pace until it was ready. I know it > may be challenging to contribute to new projects and OpenEmbedded is > no different. > > You were very welcoming to comments and change requests and I believe > it was a great thread of changes which lead to a good patch. I look > forward to the new patches you'll start submitting from now on :-) I'd like to thank you guys as well for being patient and providing meaningful comments for my naive and sometime silly changes. And sure there will be more patches as now we start using OE for quite some projects basically trying to get ARC up to speed in OE as good as possible and given our architecture differs a bit from others (as any other arch) we're not only adding features but more fix issues that were not seen before due to pure luck... like we typically have 8k MMU page a bit exotic int64_t alignment by 32 bits etc so there'll be more stuff from us in the foreseeable future :) -Alexey -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v6] u-boot: Add mkenvimage tool
Hello Alexey, On Thu, Nov 22, 2018 at 6:28 AM Alexey Brodkin wrote: > > This utility is used for creation of images containing > usable in run-time U-Boot environment. > > As of today this utility is added per-board like here [1] > for Intel Edison board. > > [1] > http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-edison/tree/meta-intel-edison-bsp/recipes-bsp/u-boot/u-boot-tools_2014.04.bb > > Given there're quite some U-Boot tools that we may want to add later > this recipe name switch from "u-boot-mkimage" to generic "u-boot-tools" > still for compatibility we provide "u-boot-mkimage" with help > of PROVIDES as well as proposed "u-boot-mkenvimage". > > Signed-off-by: Alexey Brodkin > Cc: Richard Purdie > Cc: Otavio Salvador > Cc: Martin Jansa > Cc: Ross Burton > Cc: Marek Vasut Acked-by: Otavio Salvador I'd like to thank you to keep the pace until it was ready. I know it may be challenging to contribute to new projects and OpenEmbedded is no different. You were very welcoming to comments and change requests and I believe it was a great thread of changes which lead to a good patch. I look forward to the new patches you'll start submitting from now on :-) Keep the good work. Best Regards, -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4 v2] oeqa/qemu: Add support for slirp
Enable qemu for slirp. Initialize Qemurunner with slirp. Setup ip
and port attribute to enable connection with qemu running with slirp.
[YOCTO#10713]
Signed-off-by: Yeoh Ee Peng
---
meta/lib/oeqa/core/target/qemu.py | 22 +++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oeqa/core/target/qemu.py
b/meta/lib/oeqa/core/target/qemu.py
index 538bf12..f47fd74 100644
--- a/meta/lib/oeqa/core/target/qemu.py
+++ b/meta/lib/oeqa/core/target/qemu.py
@@ -13,7 +13,7 @@ supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic']
class OEQemuTarget(OESSHTarget):
def __init__(self, logger, server_ip, timeout=300, user='root',
-port=None, machine='', rootfs='', kernel='', kvm=False,
+port=None, machine='', rootfs='', kernel='', kvm=False,
slirp=False,
dump_dir='', dump_host_cmds='', display='', bootlog='',
tmpdir='', dir_image='', boottime=60, **kwargs):
@@ -25,17 +25,33 @@ class OEQemuTarget(OESSHTarget):
self.rootfs = rootfs
self.kernel = kernel
self.kvm = kvm
+self.use_slirp = slirp
self.runner = QemuRunner(machine=machine, rootfs=rootfs, tmpdir=tmpdir,
deploy_dir_image=dir_image, display=display,
logfile=bootlog, boottime=boottime,
- use_kvm=kvm, dump_dir=dump_dir,
+ use_kvm=kvm, use_slirp=slirp,
dump_dir=dump_dir,
dump_host_cmds=dump_host_cmds, logger=logger)
def start(self, params=None, extra_bootparams=None):
+if self.use_slirp and not self.server_ip:
+self.logger.error("Could not start qemu with slirp without server
ip - provide 'TEST_SERVER_IP'")
+raise RuntimeError("FAILED to start qemu - check the task log and
the boot log")
if self.runner.start(params, extra_bootparams=extra_bootparams):
self.ip = self.runner.ip
-self.server_ip = self.runner.server_ip
+if self.use_slirp:
+target_ip_port = self.runner.ip.split(':')
+if len(target_ip_port) == 2:
+target_ip = target_ip_port[0]
+port = target_ip_port[1]
+self.ip = target_ip
+self.ssh = self.ssh + ['-p', port]
+self.scp = self.scp + ['-P', port]
+else:
+self.logger.error("Could not get host machine port to
connect qemu with slirp, ssh will not be "
+ "able to connect to qemu with slirp")
+if self.runner.server_ip:
+self.server_ip = self.runner.server_ip
else:
self.stop()
raise RuntimeError("FAILED to start qemu - check the task log and
the boot log")
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4 v2] testimage: Add support for slirp
Enable testimage to support qemu slirp. Configure "QEMU_USE_SLIRP"
& "TEST_SERVER_IP" variables to enable slirp.
[YOCTO#10713]
Signed-off-by: Yeoh Ee Peng
---
meta/classes/testimage.bbclass | 5 +
1 file changed, 5 insertions(+)
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 92e5686..82cbb06 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -236,6 +236,10 @@ def testimage_main(d):
else:
kvm = False
+slirp = False
+if d.getVar("QEMU_USE_SLIRP"):
+slirp = True
+
# TODO: We use the current implementatin of qemu runner because of
# time constrains, qemu runner really needs a refactor too.
target_kwargs = { 'machine' : machine,
@@ -247,6 +251,7 @@ def testimage_main(d):
'boottime': boottime,
'bootlog' : bootlog,
'kvm' : kvm,
+ 'slirp' : slirp,
}
# TODO: Currently BBPATH is needed for custom loading of targets.
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4 v2] oeqa/qemu & runtime: qemu do not need ip input from external
Qemu do not use the ip input from external. It will retrieve ip from QemuRunner instance and assign ip value. Signed-off-by: Yeoh Ee Peng --- meta/lib/oeqa/core/target/qemu.py | 5 ++--- meta/lib/oeqa/runtime/context.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py index bf3b633..538bf12 100644 --- a/meta/lib/oeqa/core/target/qemu.py +++ b/meta/lib/oeqa/core/target/qemu.py @@ -12,15 +12,14 @@ from oeqa.utils.qemurunner import QemuRunner supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic'] class OEQemuTarget(OESSHTarget): -def __init__(self, logger, ip, server_ip, timeout=300, user='root', +def __init__(self, logger, server_ip, timeout=300, user='root', port=None, machine='', rootfs='', kernel='', kvm=False, dump_dir='', dump_host_cmds='', display='', bootlog='', tmpdir='', dir_image='', boottime=60, **kwargs): -super(OEQemuTarget, self).__init__(logger, ip, server_ip, timeout, +super(OEQemuTarget, self).__init__(logger, None, server_ip, timeout, user, port) -self.ip = ip self.server_ip = server_ip self.machine = machine self.rootfs = rootfs diff --git a/meta/lib/oeqa/runtime/context.py b/meta/lib/oeqa/runtime/context.py index a7f3823..943e29b 100644 --- a/meta/lib/oeqa/runtime/context.py +++ b/meta/lib/oeqa/runtime/context.py @@ -101,7 +101,7 @@ class OERuntimeTestContextExecutor(OETestContextExecutor): if target_type == 'simpleremote': target = OESSHTarget(logger, target_ip, server_ip, **kwargs) elif target_type == 'qemu': -target = OEQemuTarget(logger, target_ip, server_ip, **kwargs) +target = OEQemuTarget(logger, server_ip, **kwargs) else: # XXX: This code uses the old naming convention for controllers and # targets, the idea it is to leave just targets as the controller -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4 v2] qemurunner: Add support for slirp
Enable qemurunner for slirp. Retrieved the ip & port from host machine
to connect to qemu from host machine.
[YOCTO#10713]
Signed-off-by: Yeoh Ee Peng
---
meta/lib/oeqa/utils/qemurunner.py | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/meta/lib/oeqa/utils/qemurunner.py
b/meta/lib/oeqa/utils/qemurunner.py
index d40b3b8..f943034 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -28,7 +28,8 @@ re_control_char = re.compile('[%s]' %
re.escape("".join(control_chars)))
class QemuRunner:
-def __init__(self, machine, rootfs, display, tmpdir, deploy_dir_image,
logfile, boottime, dump_dir, dump_host_cmds, use_kvm, logger):
+def __init__(self, machine, rootfs, display, tmpdir, deploy_dir_image,
logfile, boottime, dump_dir, dump_host_cmds,
+ use_kvm, logger, use_slirp=False):
# Popen object for runqemu
self.runqemu = None
@@ -51,6 +52,7 @@ class QemuRunner:
self.logged = False
self.thread = None
self.use_kvm = use_kvm
+self.use_slirp = use_slirp
self.msg = ''
self.runqemutime = 120
@@ -129,6 +131,8 @@ class QemuRunner:
self.logger.debug('Not using kvm for runqemu')
if not self.display:
launch_cmd += ' nographic'
+if self.use_slirp:
+launch_cmd += ' slirp'
launch_cmd += ' %s %s' % (self.machine, self.rootfs)
return self.launch(launch_cmd, qemuparams=qemuparams, get_ip=get_ip,
extra_bootparams=extra_bootparams, env=env)
@@ -238,9 +242,14 @@ class QemuRunner:
# because is possible to have control characters
cmdline = re_control_char.sub(' ', cmdline)
try:
-ips = re.findall(r"((?:[0-9]{1,3}\.){3}[0-9]{1,3})",
cmdline.split("ip=")[1])
-self.ip = ips[0]
-self.server_ip = ips[1]
+if self.use_slirp:
+tcp_ports = cmdline.split("hostfwd=tcp::")[1]
+host_port = tcp_ports[:tcp_ports.find('-')]
+self.ip = "localhost:%s" % host_port
+else:
+ips = re.findall(r"((?:[0-9]{1,3}\.){3}[0-9]{1,3})",
cmdline.split("ip=")[1])
+self.ip = ips[0]
+self.server_ip = ips[1]
self.logger.debug("qemu cmdline used:\n{}".format(cmdline))
except (IndexError, ValueError):
# Try to get network configuration from runqemu output
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4] Enable qemu slirp for testimage only
Changes: [v2] - enable qemu slirp and like kvm, enable it only for testimage - QemuRunner by default has use_slirp=False, where oe-selftest will skipped all the new logic related to slirp Yeoh Ee Peng (4): oeqa/qemu & runtime: qemu do not need ip input from external qemurunner: Add support for slirp oeqa/qemu: Add support for slirp testimage: Add support for slirp meta/classes/testimage.bbclass| 5 + meta/lib/oeqa/core/target/qemu.py | 27 +-- meta/lib/oeqa/runtime/context.py | 2 +- meta/lib/oeqa/utils/qemurunner.py | 17 + 4 files changed, 40 insertions(+), 11 deletions(-) -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v6] u-boot: Add mkenvimage tool
This utility is used for creation of images containing
usable in run-time U-Boot environment.
As of today this utility is added per-board like here [1]
for Intel Edison board.
[1]
http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-edison/tree/meta-intel-edison-bsp/recipes-bsp/u-boot/u-boot-tools_2014.04.bb
Given there're quite some U-Boot tools that we may want to add later
this recipe name switch from "u-boot-mkimage" to generic "u-boot-tools"
still for compatibility we provide "u-boot-mkimage" with help
of PROVIDES as well as proposed "u-boot-mkenvimage".
Signed-off-by: Alexey Brodkin
Cc: Richard Purdie
Cc: Otavio Salvador
Cc: Martin Jansa
Cc: Ross Burton
Cc: Marek Vasut
---
Changes v5 -> v6:
* Really enable separate pakaging of mkimage and mkenvimage
Changes v4 -> v5:
* Added backward compatibility with "u-boot-mkimage" recipe
* Improved handling of nativesdk
* Update all references from "u-boot-mkimage" to "u-boot-tools"
Changes v3 -> v4:
* Updated maintainer info to make Yocto autobuilder happy again
Changes v2 -> v3:
* Recipe renamed to "u-boot-tools" to better match its contents
(especially in the future as we add more tools there)
* Existing "u-boot-mkimage" and newly introduced "u-boot-mkenvimage"
made avaialble via PROVIDES
Changes v1 -> v2:
* Got rid of a separate recipe and instead added mkenvimage
to u-boot mkimage recipe
meta/classes/image_types.bbclass | 2 +-
meta/classes/kernel-fitimage.bbclass | 2 +-
meta/classes/kernel-uimage.bbclass | 2 +-
meta/conf/distro/include/distro_alias.inc | 2 +-
meta/conf/distro/include/maintainers.inc | 2 +-
...-mkimage_2018.07.bb => u-boot-tools_2018.07.bb} | 26 --
6 files changed, 29 insertions(+), 7 deletions(-)
rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2018.07.bb =>
u-boot-tools_2018.07.bb} (56%)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 05e5b0a2e0..5c406481ef 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -308,7 +308,7 @@ CONVERSION_DEPENDS_lzo = "lzop-native"
CONVERSION_DEPENDS_zip = "zip-native"
CONVERSION_DEPENDS_sum = "mtd-utils-native"
CONVERSION_DEPENDS_bmap = "bmap-tools-native"
-CONVERSION_DEPENDS_u-boot = "u-boot-mkimage-native"
+CONVERSION_DEPENDS_u-boot = "u-boot-tools-native"
CONVERSION_DEPENDS_vmdk = "qemu-native"
CONVERSION_DEPENDS_vdi = "qemu-native"
CONVERSION_DEPENDS_qcow2 = "qemu-native"
diff --git a/meta/classes/kernel-fitimage.bbclass
b/meta/classes/kernel-fitimage.bbclass
index 4c4fd99ff4..328bef4069 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -4,7 +4,7 @@ python __anonymous () {
kerneltypes = d.getVar('KERNEL_IMAGETYPES') or ""
if 'fitImage' in kerneltypes.split():
depends = d.getVar("DEPENDS")
-depends = "%s u-boot-mkimage-native dtc-native" % depends
+depends = "%s u-boot-tools-native dtc-native" % depends
d.setVar("DEPENDS", depends)
uarch = d.getVar("UBOOT_ARCH")
diff --git a/meta/classes/kernel-uimage.bbclass
b/meta/classes/kernel-uimage.bbclass
index c2de6bb40d..cedb4fa070 100644
--- a/meta/classes/kernel-uimage.bbclass
+++ b/meta/classes/kernel-uimage.bbclass
@@ -3,7 +3,7 @@ inherit kernel-uboot
python __anonymous () {
if "uImage" in d.getVar('KERNEL_IMAGETYPES'):
depends = d.getVar("DEPENDS")
-depends = "%s u-boot-mkimage-native" % depends
+depends = "%s u-boot-tools-native" % depends
d.setVar("DEPENDS", depends)
# Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal
diff --git a/meta/conf/distro/include/distro_alias.inc
b/meta/conf/distro/include/distro_alias.inc
index 7502542e89..f23db1e8a4 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -354,7 +354,7 @@ DISTRO_PN_ALIAS_pn-tremor = "OSPDT
upstream=http://www.xiph.org/vorbis/;
DISTRO_PN_ALIAS_pn-ttf-bitstream-vera = "Debian=ttf-bitstream-vera
Ubuntu=ttf-bitstream-vera"
DISTRO_PN_ALIAS_pn-tzcode = "OSPDT"
DISTRO_PN_ALIAS_pn-u-boot-fw-utils = "Ubuntu=u-boot-tools Debian=u-boot-tools"
-DISTRO_PN_ALIAS_pn-u-boot-mkimage = "Ubuntu=uboot-mkimage Debian=uboot-mkimage"
+DISTRO_PN_ALIAS_pn-u-boot-tools = "Ubuntu=u-boot-tools Debian=uboot-tools"
DISTRO_PN_ALIAS_pn-udev = "Mandriva=udev Fedora=udev"
DISTRO_PN_ALIAS_pn-udev-extraconf = "OE-Core"
DISTRO_PN_ALIAS_pn-unfs3 = "Debian=unfs3 Fedora=unfs3"
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index 0889c1c429..825c24a3f8 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -654,7 +654,7 @@ RECIPE_MAINTAINER_pn-tzcode-native = "Armin Kuster
"
RECIPE_MAINTAINER_pn-tzdata = "Armin Kuster "
RECIPE_MAINTAINER_pn-u-boot = "Marek Vasut "
