Re: [OE-core] [PATCH 1/2] rng-tools: 5 -> 6.6
On 2018/11/10 上午9:14, Hongxu Jia wrote: There are also other weird hangs being observed on the autobuilder after these changes. I can't prove its this patchset but I am suspicious and its something in master-next as things were working just fine until we started poking around all this again :( https://autobuilder.yoctoproject.org/typhoon/#/builders/34/builds/182/steps/7/logs/stdio https://autobuilder.yoctoproject.org/typhoon/#/builders/2/builds/188/steps/7/logs/stdio I am trying to catch the issue patches //Hongxu -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for rng-tools: fix typo of unrecognised options: --disable-jitterntropy
== Series Details == Series: rng-tools: fix typo of unrecognised options: --disable-jitterntropy Revision: 1 URL : https://patchwork.openembedded.org/series/14867/ 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 e97a31e6bb) 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] rng-tools: fix typo of unrecognised options: --disable-jitterntropy
- Fix typo of `--disable-jitterntropy' in both of PACKAGECONFIG and configure
--help
- Enable jitterntropy for musl
Signed-off-by: Hongxu Jia
---
.../rng-tools/0001-configure.ac-fix-typo.patch | 27 ++
meta/recipes-support/rng-tools/rng-tools_6.6.bb| 5 ++--
2 files changed, 30 insertions(+), 2 deletions(-)
create mode 100644
meta/recipes-support/rng-tools/rng-tools/0001-configure.ac-fix-typo.patch
diff --git
a/meta/recipes-support/rng-tools/rng-tools/0001-configure.ac-fix-typo.patch
b/meta/recipes-support/rng-tools/rng-tools/0001-configure.ac-fix-typo.patch
new file mode 100644
index 000..d4d28a0
--- /dev/null
+++ b/meta/recipes-support/rng-tools/rng-tools/0001-configure.ac-fix-typo.patch
@@ -0,0 +1,27 @@
+From 99b0efebd765803203686d89bc4f995bcb103e78 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia
+Date: Sat, 10 Nov 2018 09:53:19 +0800
+Subject: [PATCH] configure.ac: fix typo
+
+Upstream-Status: Submitted [https://github.com/nhorman/rng-tools.git]
+Signed-off-by: Hongxu Jia
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4e799dc..0251928 100644
+--- a/configure.ac
b/configure.ac
+@@ -62,7 +62,7 @@ AS_IF([test $target_cpu = powerpc64le],
[AC_DEFINE([HAVE_DARN],1,[Enable DARN])]
+ AM_CONDITIONAL([JITTER], [false])
+
+ AC_ARG_ENABLE(jitterentropy,
+- AS_HELP_STRING([--disable-jitterntropy | --enable-jitterentropy=],
++ AS_HELP_STRING([--disable-jitterentropy |
--enable-jitterentropy=],
+ [Disable jitterentropy source, or specify its location]),
+ [if [ test -d $enable_jitterentropy ]; then
+ export LDFLAGS+=-L$enable_jitterentropy;
+--
+2.7.4
+
diff --git a/meta/recipes-support/rng-tools/rng-tools_6.6.bb
b/meta/recipes-support/rng-tools/rng-tools_6.6.bb
index 033af99..4d91216 100644
--- a/meta/recipes-support/rng-tools/rng-tools_6.6.bb
+++ b/meta/recipes-support/rng-tools/rng-tools_6.6.bb
@@ -7,6 +7,7 @@ SRC_URI = "git://github.com/nhorman/rng-tools.git \
file://0002-Add-argument-to-control-the-libargp-dependency.patch \
file://underquote.patch \
file://rng-tools-5-fix-textrels-on-PIC-x86.patch \
+ file://0001-configure.ac-fix-typo.patch \
file://init \
file://default \
file://rngd.service \
@@ -24,10 +25,10 @@ DEPENDS = "curl \
"
PACKAGECONFIG ??= "libgcrypt libjitterentropy"
-PACKAGECONFIG_libc-musl = "libargp"
+PACKAGECONFIG_libc-musl = "libargp libjitterentropy"
PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone,"
PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-libgcrypt,libgcrypt,"
-PACKAGECONFIG[libjitterentropy] =
"--enable-jitterentropy,--disable-jitterntropy,libjitterentropy"
+PACKAGECONFIG[libjitterentropy] =
"--enable-jitterentropy,--disable-jitterentropy,libjitterentropy"
# Refer autogen.sh in rng-tools
do_configure_prepend() {
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] rng-tools: 5 -> 6.6
On 2018/11/10 上午6:50, richard.pur...@linuxfoundation.org wrote:
On Fri, 2018-11-09 at 17:12 +0800, Hongxu Jia wrote:
-PACKAGECONFIG = "libgcrypt"
+PACKAGECONFIG ??= "libgcrypt libjitterentropy"
PACKAGECONFIG_libc-musl = "libargp"
PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone,"
PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-libgcrypt,libgcrypt,"
+PACKAGECONFIG[libjitterentropy] =
"--enable-jitterentropy,--disable-jitterntropy,libjitterentropy"
+
+# Refer autogen.sh in rng-tools
+do_configure_prepend() {
+cp ${S}/README.md ${S}/README
+}
do_install_append() {
# Only install the init script when 'sysvinit' is in DISTRO_FEATURES.
This fails on musl, likely as the libc-musl override wasn't tweaked. It
also means that the no libjitterentropy case wasn't tested as there is
a typo likely causing this:
https://autobuilder.yoctoproject.org/typhoon/#/builders/11/builds/190/steps/7/logs/step1b
Sorry, I am working on it
//Hongxu
There are also other weird hangs being observed on the autobuilder
after these changes. I can't prove its this patchset but I am
suspicious and its something in master-next as things were working just
fine until we started poking around all this again :(
https://autobuilder.yoctoproject.org/typhoon/#/builders/34/builds/182/steps/7/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/2/builds/188/steps/7/logs/stdio
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] rng-tools: 5 -> 6.6
On Fri, 2018-11-09 at 22:50 +, richard.pur...@linuxfoundation.org
wrote:
> On Fri, 2018-11-09 at 17:12 +0800, Hongxu Jia wrote:
> > -PACKAGECONFIG = "libgcrypt"
> > +PACKAGECONFIG ??= "libgcrypt libjitterentropy"
> > PACKAGECONFIG_libc-musl = "libargp"
> > PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-
> > standalone,"
> > PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-
> > libgcrypt,libgcrypt,"
> > +PACKAGECONFIG[libjitterentropy] = "--enable-jitterentropy,
> > --disable-jitterntropy,libjitterentropy"
> > +
> > +# Refer autogen.sh in rng-tools
> > +do_configure_prepend() {
> > +cp ${S}/README.md ${S}/README
> > +}
> >
> > do_install_append() {
> > # Only install the init script when 'sysvinit' is in
> > DISTRO_FEATURES.
>
> This fails on musl, likely as the libc-musl override wasn't tweaked.
> It
> also means that the no libjitterentropy case wasn't tested as there
> is
> a typo likely causing this:
>
>
https://autobuilder.yoctoproject.org/typhoon/#/builders/11/builds/190/steps/7/logs/step1b
The above is definitely from the typo and musl misconfiguration in this
patch.
> There are also other weird hangs being observed on the autobuilder
> after these changes. I can't prove its this patchset but I am
> suspicious and its something in master-next as things were working
> just
> fine until we started poking around all this again :(
>
>
https://autobuilder.yoctoproject.org/typhoon/#/builders/34/builds/182/steps/7/logs/stdio
>
https://autobuilder.yoctoproject.org/typhoon/#/builders/2/builds/188/steps/7/logs/stdio
Looking further into the above shows:
NOTE:
==
NOTE: ERROR: tearDownClass (opkg.OpkgRepoTest)
NOTE: --
NOTE: Traceback (most recent call last):
File
"/home/pokybuild/yocto-worker/nightly-x32/build/meta/lib/oeqa/core/case.py",
line 36, in _oeTearDownClass
clss.tearDownClassMethod()
File
"/home/pokybuild/yocto-worker/nightly-x32/build/meta/lib/oeqa/runtime/cases/opkg.py",
line 29, in tearDownClass
cls.repo_server.stop()
File
"/home/pokybuild/yocto-worker/nightly-x32/build/meta/lib/oeqa/utils/httpserver.py",
line 36, in stop
self.process.join()
File "/usr/lib/python3.6/multiprocessing/process.py", line 124, in join
res = self._popen.wait(timeout)
File "/usr/lib/python3.6/multiprocessing/popen_fork.py", line 50, in wait
return self.poll(os.WNOHANG if timeout == 0.0 else 0)
File "/usr/lib/python3.6/multiprocessing/popen_fork.py", line 28, in poll
pid, sts = os.waitpid(self.pid, flag)
File
"/home/pokybuild/yocto-worker/nightly-x32/build/meta/classes/testimage.bbclass",
line 166, in sigterm_exception
raise RuntimeError
RuntimeError
which is probably other patches in -next but raises some questions
about why an error like this would just hang.
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] rng-tools: 5 -> 6.6
On Fri, 2018-11-09 at 17:12 +0800, Hongxu Jia wrote:
> -PACKAGECONFIG = "libgcrypt"
> +PACKAGECONFIG ??= "libgcrypt libjitterentropy"
> PACKAGECONFIG_libc-musl = "libargp"
> PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone,"
> PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-libgcrypt,libgcrypt,"
> +PACKAGECONFIG[libjitterentropy] =
> "--enable-jitterentropy,--disable-jitterntropy,libjitterentropy"
> +
> +# Refer autogen.sh in rng-tools
> +do_configure_prepend() {
> +cp ${S}/README.md ${S}/README
> +}
>
> do_install_append() {
> # Only install the init script when 'sysvinit' is in DISTRO_FEATURES.
This fails on musl, likely as the libc-musl override wasn't tweaked. It
also means that the no libjitterentropy case wasn't tested as there is
a typo likely causing this:
https://autobuilder.yoctoproject.org/typhoon/#/builders/11/builds/190/steps/7/logs/step1b
There are also other weird hangs being observed on the autobuilder
after these changes. I can't prove its this patchset but I am
suspicious and its something in master-next as things were working just
fine until we started poking around all this again :(
https://autobuilder.yoctoproject.org/typhoon/#/builders/34/builds/182/steps/7/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/2/builds/188/steps/7/logs/stdio
Cheers,
Richard
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libaio: Extend to native
lvm2 currently requires libaio. So building lvm2-native will result in
the following error.
ERROR: Required build target 'lvm2-native' has no buildable providers.
Missing or unbuildable dependency chain was: ['lvm2-native', 'libaio-native']
Extend libaio to native to fix this issue.
Signed-off-by: Peter Kjellerstedt
---
This complements commit 5f56ce58, which added the corresponding support
for nativesdk.
meta/recipes-extended/libaio/libaio_0.3.111.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/libaio/libaio_0.3.111.bb
b/meta/recipes-extended/libaio/libaio_0.3.111.bb
index 04b50b61ec..8e1cd349a0 100644
--- a/meta/recipes-extended/libaio/libaio_0.3.111.bb
+++ b/meta/recipes-extended/libaio/libaio_0.3.111.bb
@@ -20,4 +20,4 @@ do_install () {
oe_runmake install DESTDIR=${D}
}
-BBCLASSEXTEND = "nativesdk"
+BBCLASSEXTEND = "native nativesdk"
--
2.12.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] avahi: add ptest
Hi Ross,
On 09/11/2018 15:29, Burton, Ross wrote:
> On Thu, 8 Nov 2018 at 09:44, Stefan Strogin via Openembedded-core
> wrote:
>> +do_install_ptest () {
>> +install -d ${D}${PTEST_PATH}/test/.libs
>> +for t in dns-spin-test dns-test hashmap-test
>> +do
>> +install -m 0755 ${B}/avahi-core/$t ${D}${PTEST_PATH}/test/
>> +sed -e 's/^relink_command=\"\(.*\)\"/relink_command=\"\"/' -i
>> ${D}${PTEST_PATH}/test/$t
>> +install -m 0755 ${B}/avahi-core/.libs/$t
>> ${D}${PTEST_PATH}/test/.libs/lt-$t
>> +done
>> +}
>
> Whilst I really do want to see more test suites, is this really a
> useful test suite? hashmap-test is a validation that the hash
> implementation works, dns-test is low-level parsing, and dns-spin-test
> is basically a way to verify an Avahi bug doesn't regress. This isn't
> exactly a full-featured test suite that creates services, ensures
> they're browsable, enumerate stuff, etc.
Thanks for the good comment. In our distro we also want to cover with tests
as many packages as possible. There are more tests in avahi source code like
avahi-test, conformance-test, querier-test, update-test...
Unfortunately the test suite is not documented at all (at least I couldn't
find any documentation on them), and I'm not very familiar with Avahi API
and the source code.
Some of the tests in case of success seem to run in an infinite loop, and exit
only in case of error. So I couldn't include them into the recipe. Maybe the
tests need to be patched [upstream].
I began to investigate it but unfortunately didn't have time, and now I have
some more urgent tasks. So I added only those tests in which I'm sure, perhaps
it's too few.
I hope to add more tests some day, or somebody else will be able to do it.
--
Stefan
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] kernel-initramfs.bbclass: Separate initramfs setup
> > > Hello, > > > > > > so I applied both patches and had to comment out (as expected) the > > > INITRAMFS_TASK. > > > I have added INITRAMFS_IMAGE_BUNDLE in my 2nd kernel recipe but last > > > night build did fail: the initramfs.cpio.xz was not found. > > > > > > I did only scrub the last lines... will debug later. > > > > > > > Ok, so the problem is copy_initramfs() is done too late and do_compile fails > > > > | > > /tmp/build/tmp-musl/work-shared/spitz/kernel-source/scripts/gen_initramfs_list.sh: > > Cannot open 'initramfs.cpio.xz' > > | /tmp/build/tmp-musl/work-shared/spitz/kernel-source/usr/Makefile:73: > > recipe for target 'usr/initramfs_data.cpio.xz' failed > > > > > > do_compile log before > > > > 1 DEBUG: Executing shell function do_compile > > 2 Copying initramfs into ./usr ... > > 3 gzip decompressing image > > 4 Finished copy of initramfs into ./usr > > 5 NOTE: make -j ... > > > > do_compile with patch applied (build fails): > > > > 1 DEBUG: Executing shell function do_compile > > 2 NOTE: make -j ... > > > > Please check again the task order. Thanks. > > So the task order is copied from the previous bundle setup (and needs > to work that way in order to prevent recursive dependency between > kernel do_install -> image -> initramfs_copy). When I mentioned that > this should behave similar to your existing setup I did mean there > were some differences. Specifically you would no longer need to > CONFIG_INITRAMFS_SOURCE in your kernel config. But in order to get the > initramfs kernel you would need to get the image generated from the > bundle. This is deployed separately to the base image type binary > ( vs -initramfs-.bin). I suspect this > might be problematic for you to change to? And as such would make it a > pain to switch away from INITRAMFS_TASK. > > Just looking at the task setup again, it might be relatively straight > forward to keep the INITRAMFS_TASK setup. Where the initramfs_copy > task is simply set as a dep for the do_compile in only that case (but > would break the use of BUNDLE in the same kernel). Would you prefer to > try and keep the INITRAMFS_TASK behaviour working? > > Thanks, > Nathan Nathan, if possible I would prefer to adapt our legacy implementation but I think the whole bundling as intended cannot be done for the 2nd kernel. What we want to keep is the possibility to build a 2nd initramfs-filled kernel living in its recipe without touching local.conf. Thus I'd say for the moment please keep the old INITRAMFS_TASK hook. Thanks Andrea -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] util-linux: make alternatives for rev and ionice work with busybox
On 11/9/18 2:24 AM, Burton, Ross wrote:
On Thu, 8 Nov 2018 at 10:58, Pascal Bach wrote:
Busybox can provide ionice and rev. They are both installed to /bin
The corresponding util-linux variant is installed to /usr/bin
This causes the following error during the do_rootfs task:
update-alternatives: renaming ionice link from /bin/ionice to /usr/bin/ionice
mv: cannot stat '/bin/ionice': No such file or directory
Moving the util-linux binaries to /bin avoids this error.
Isn't it simpler to just set ALTERNATIVE_LINK_NAME[ionice] =
"${base_bindir}/ionice" (so the system knows to use the same symlink
for this and busybox) instead of actually moving the binary too?
Ross
Case being that busybox has ionice and rev under /bin/ whereas
util-linux under /usr/bin/, I wonder would the prudent course of action
at this point rather be to revert the 'ionice' and 'rev' specific bits
that were introduced (along 'cal') in
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/meta/recipes-core/util-linux/util-linux.inc?id=78db831a7b0c2361a266eb37c7cbf2e368d2280a
-Niko
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] meta/classes/qemu.bbclass: set -cpu of e500v2 to e500mc
From: Chunrong Guo
*fix the below error
|The postinstall intercept hook 'update_font_cache' failed
|qemu: uncaught target signal 4 (Illegal instruction) - core dumped
This workaround will need to be reverted once the proper fix is found.
Signed-off-by: Chunrong Guo
---
meta/classes/qemu.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index f5c5780..e8545f1 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -55,7 +55,7 @@ def qemu_run_binary(data, rootfs_path, binary):
QEMU_OPTIONS = "-r ${OLDEST_KERNEL} ${@d.getVar("QEMU_EXTRAOPTIONS_%s" %
d.getVar('PACKAGE_ARCH')) or ""}"
QEMU_OPTIONS[vardeps] += "QEMU_EXTRAOPTIONS_${PACKAGE_ARCH}"
-QEMU_EXTRAOPTIONS_ppce500v2 = " -cpu e500v2"
+QEMU_EXTRAOPTIONS_ppce500v2 = " -cpu e500mc"
QEMU_EXTRAOPTIONS_ppce500mc = " -cpu e500mc"
QEMU_EXTRAOPTIONS_ppce5500 = " -cpu e500mc"
QEMU_EXTRAOPTIONS_ppc64e5500 = " -cpu e500mc"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] curl: actually apply latest CVE patches
On 11/9/18 8:53 AM, Ross Burton wrote:
> Signed-off-by: Ross Burton
> ---
> meta/recipes-support/curl/curl_7.61.0.bb | 3 +++
> 1 file changed, 3 insertions(+)
Thanks
-armin
>
> diff --git a/meta/recipes-support/curl/curl_7.61.0.bb
> b/meta/recipes-support/curl/curl_7.61.0.bb
> index 53cfc4a5186..56327a632b4 100644
> --- a/meta/recipes-support/curl/curl_7.61.0.bb
> +++ b/meta/recipes-support/curl/curl_7.61.0.bb
> @@ -8,6 +8,9 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=ef889a37a5a874490ac7ce116396f29a"
> SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
> file://0001-replace-krb5-config-with-pkg-config.patch \
> file://CVE-2018-14618.patch \
> + file://CVE-2018-16839.patch \
> + file://CVE-2018-16840.patch \
> + file://CVE-2018-16842.patch \
> "
>
> SRC_URI[md5sum] = "31d0a9f48dc796a7db351898a1e5058a"
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] curl: actually apply latest CVE patches
Signed-off-by: Ross Burton
---
meta/recipes-support/curl/curl_7.61.0.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-support/curl/curl_7.61.0.bb
b/meta/recipes-support/curl/curl_7.61.0.bb
index 53cfc4a5186..56327a632b4 100644
--- a/meta/recipes-support/curl/curl_7.61.0.bb
+++ b/meta/recipes-support/curl/curl_7.61.0.bb
@@ -8,6 +8,9 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=ef889a37a5a874490ac7ce116396f29a"
SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
file://0001-replace-krb5-config-with-pkg-config.patch \
file://CVE-2018-14618.patch \
+ file://CVE-2018-16839.patch \
+ file://CVE-2018-16840.patch \
+ file://CVE-2018-16842.patch \
"
SRC_URI[md5sum] = "31d0a9f48dc796a7db351898a1e5058a"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] curl: fix for CVE-2018-16839/CVE-2018-16840/CVE-2018-16842
On 11/1/18 11:07 PM, changqing...@windriver.com wrote:
> From: Changqing Li
>
> Signed-off-by: Changqing Li
> ---
> .../recipes-support/curl/curl/CVE-2018-16839.patch | 35 ++
> .../recipes-support/curl/curl/CVE-2018-16840.patch | 43
> ++
> .../recipes-support/curl/curl/CVE-2018-16842.patch | 35 ++
> 3 files changed, 113 insertions(+)
> create mode 100644 meta/recipes-support/curl/curl/CVE-2018-16839.patch
> create mode 100644 meta/recipes-support/curl/curl/CVE-2018-16840.patch
> create mode 100644 meta/recipes-support/curl/curl/CVE-2018-16842.patch
Patchtest is not catching missing bb file changes.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=13005
Sad thing is 3 people commented on this thread and no one saw the
missing recipe changes to add these patches.
- armin
>
> diff --git a/meta/recipes-support/curl/curl/CVE-2018-16839.patch
> b/meta/recipes-support/curl/curl/CVE-2018-16839.patch
> new file mode 100644
> index 000..bf972d2
> --- /dev/null
> +++ b/meta/recipes-support/curl/curl/CVE-2018-16839.patch
> @@ -0,0 +1,35 @@
> +From 55b90532f9190dce40a325b3312d014c66dc3ae1 Mon Sep 17 00:00:00 2001
> +From: Changqing Li
> +Date: Thu, 1 Nov 2018 15:27:35 +0800
> +Subject: [PATCH] Curl_auth_create_plain_message: fix too-large-input-check
> +
> +CVE-2018-16839
> +Reported-by: Harry Sintonen
> +Bug: https://curl.haxx.se/docs/CVE-2018-16839.html
> +
> +Upstream-Status: Backport [https://github.com/curl/curl/commit
> +/f3a24d7916b9173c69a3e0ee790102993833d6c5?diff=unified]
> +
> +CVE: CVE-2018-16839
> +
> +Signed-off-by: Changqing Li
> +---
> + lib/vauth/cleartext.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/lib/vauth/cleartext.c b/lib/vauth/cleartext.c
> +index 5d61ce6..1367143 100644
> +--- a/lib/vauth/cleartext.c
> b/lib/vauth/cleartext.c
> +@@ -74,7 +74,7 @@ CURLcode Curl_auth_create_plain_message(struct Curl_easy
> *data,
> + plen = strlen(passwdp);
> +
> + /* Compute binary message length. Check for overflows. */
> +- if((ulen > SIZE_T_MAX/2) || (plen > (SIZE_T_MAX/2 - 2)))
> ++ if((ulen > SIZE_T_MAX/4) || (plen > (SIZE_T_MAX/2 - 2)))
> + return CURLE_OUT_OF_MEMORY;
> + plainlen = 2 * ulen + plen + 2;
> +
> +--
> +2.7.4
> +
> diff --git a/meta/recipes-support/curl/curl/CVE-2018-16840.patch
> b/meta/recipes-support/curl/curl/CVE-2018-16840.patch
> new file mode 100644
> index 000..3d086c4
> --- /dev/null
> +++ b/meta/recipes-support/curl/curl/CVE-2018-16840.patch
> @@ -0,0 +1,43 @@
> +From 3c2846bec008e03d456e181d9ab55686da83f140 Mon Sep 17 00:00:00 2001
> +From: Changqing Li
> +Date: Thu, 1 Nov 2018 15:33:35 +0800
> +Subject: [PATCH] Curl_close: clear data->multi_easy on free to avoid
> + use-after-free
> +
> +Regression from b46cfbc (7.59.0)
> +CVE-2018-16840
> +Reported-by: Brian Carpenter (Geeknik Labs)
> +
> +Bug: https://curl.haxx.se/docs/CVE-2018-16840.html
> +
> +Upstream-Status: Backport [https://github.com/curl/curl/commit/
> +81d135d67155c5295b1033679c606165d4e28f3f]
> +
> +CVE: CVE-2018-16840
> +
> +Signed-off-by: Changqing Li
> +---
> + lib/url.c | 4 +++-
> + 1 file changed, 3 insertions(+), 1 deletion(-)
> +
> +diff --git a/lib/url.c b/lib/url.c
> +index 27b2c1e..7ef7c20 100644
> +--- a/lib/url.c
> b/lib/url.c
> +@@ -320,10 +320,12 @@ CURLcode Curl_close(struct Curl_easy *data)
> +and detach this handle from there. */
> + curl_multi_remove_handle(data->multi, data);
> +
> +- if(data->multi_easy)
> ++ if(data->multi_easy) {
> + /* when curl_easy_perform() is used, it creates its own multi handle to
> +use and this is the one */
> + curl_multi_cleanup(data->multi_easy);
> ++data->multi_easy = NULL;
> ++ }
> +
> + /* Destroy the timeout list that is held in the easy handle. It is
> + /normally/ done by curl_multi_remove_handle() but this is "just in
> +--
> +2.7.4
> +
> diff --git a/meta/recipes-support/curl/curl/CVE-2018-16842.patch
> b/meta/recipes-support/curl/curl/CVE-2018-16842.patch
> new file mode 100644
> index 000..82e7557
> --- /dev/null
> +++ b/meta/recipes-support/curl/curl/CVE-2018-16842.patch
> @@ -0,0 +1,35 @@
> +From 0e4a6058b130f07cfa52fde8a3cb6f2abfe4c700 Mon Sep 17 00:00:00 2001
> +From: Changqing Li
> +Date: Thu, 1 Nov 2018 15:30:56 +0800
> +Subject: [PATCH] voutf: fix bad arethmetic when outputting warnings to stderr
> +
> +CVE-2018-16842
> +Reported-by: Brian Carpenter
> +Bug: https://curl.haxx.se/docs/CVE-2018-16842.html
> +
> +Upstream-Status: Backport [https://github.com/curl/curl/commit
> +/d530e92f59ae9bb2d47066c3c460b25d2ffeb211]
> +
> +CVE: CVE-2018-16842
> +
> +Signed-off-by: Changqing Li
> +---
> + src/tool_msgs.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/tool_msgs.c b/src/tool_msgs.c
> +index 9cce806..05bec39 100644
> +--- a/src/tool_msgs.c
> b/src/tool_msgs.c
> +@@ -67,7 +67,7 @@ static void voutf(struct GlobalConfig *config,
[OE-core] [PATCH] unzip: actually apply CVE-2018-18384
Signed-off-by: Ross Burton
---
meta/recipes-extended/unzip/unzip_6.0.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb
b/meta/recipes-extended/unzip/unzip_6.0.bb
index b9d87dd6396..daba7227223 100644
--- a/meta/recipes-extended/unzip/unzip_6.0.bb
+++ b/meta/recipes-extended/unzip/unzip_6.0.bb
@@ -21,6 +21,7 @@ SRC_URI =
"${SOURCEFORGE_MIRROR}/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/
file://19-cve-2016-9844-zipinfo-buffer-overflow.patch \
file://symlink.patch \
file://0001-unzip-fix-CVE-2018-135.patch \
+ file://CVE-2018-18384.patch \
"
UPSTREAM_VERSION_UNKNOWN = "1"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] unzip: fix for CVE-2018-18384
On 11/1/18 11:08 PM, changqing...@windriver.com wrote:
> From: Changqing Li
>
> Signed-off-by: Changqing Li
> ---
> .../unzip/unzip/CVE-2018-18384.patch | 39
> ++
Change missing update to bb file
- armin
> 1 file changed, 39 insertions(+)
> create mode 100644 meta/recipes-extended/unzip/unzip/CVE-2018-18384.patch
>
> diff --git a/meta/recipes-extended/unzip/unzip/CVE-2018-18384.patch
> b/meta/recipes-extended/unzip/unzip/CVE-2018-18384.patch
> new file mode 100644
> index 000..cc9e2c1
> --- /dev/null
> +++ b/meta/recipes-extended/unzip/unzip/CVE-2018-18384.patch
> @@ -0,0 +1,39 @@
> +Upstream-Status: Backport [https://sourceforge.net/p/infozip/bugs/53/]
> +CVE: CVE-2018-18384
> +Signed-off-by: Changqing Li
> +
> +--- unzip60/list.c
> unzip60/list.c
> +@@ -97,7 +97,7 @@ int list_files(__G)/* return PK-type
> + {
> + int do_this_file=FALSE, cfactor, error, error_in_archive=PK_COOL;
> + #ifndef WINDLL
> +-char sgn, cfactorstr[10];
> ++char sgn, cfactorstr[1+10+1+1]; /* %NUL */
> + int longhdr=(uO.vflag>1);
> + #endif
> + int date_format;
> +@@ -389,9 +389,9 @@ int list_files(__G)/* return PK-type
> + }
> + #else /* !WINDLL */
> + if (cfactor == 100)
> +-sprintf(cfactorstr, LoadFarString(CompFactor100));
> ++snprintf(cfactorstr, sizeof(cfactorstr),
> LoadFarString(CompFactor100));
> + else
> +-sprintf(cfactorstr, LoadFarString(CompFactorStr), sgn,
> cfactor);
> ++snprintf(cfactorstr, sizeof(cfactorstr),
> LoadFarString(CompFactorStr), sgn, cfactor);
> + if (longhdr)
> + Info(slide, 0, ((char *)slide, LoadFarString(LongHdrStats),
> + FmZofft(G.crec.ucsize, "8", "u"), methbuf,
> +@@ -471,9 +471,9 @@ int list_files(__G)/* return PK-type
> +
> + #else /* !WINDLL */
> + if (cfactor == 100)
> +-sprintf(cfactorstr, LoadFarString(CompFactor100));
> ++snprintf(cfactorstr, sizeof(cfactorstr),
> LoadFarString(CompFactor100));
> + else
> +-sprintf(cfactorstr, LoadFarString(CompFactorStr), sgn, cfactor);
> ++snprintf(cfactorstr, sizeof(cfactorstr),
> LoadFarString(CompFactorStr), sgn, cfactor);
> + if (longhdr) {
> + Info(slide, 0, ((char *)slide, LoadFarString(LongFileTrailer),
> + FmZofft(tot_ucsize, "8", "u"), FmZofft(tot_csize, "8", "u"),
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] kernel-initramfs.bbclass: Separate initramfs setup
On Fri, 9 Nov 2018 at 08:55, Andrea Adami wrote:
>
> On Thu, Nov 8, 2018 at 3:25 PM Andrea Adami wrote:
> >
> > On Thu, Nov 8, 2018 at 2:25 PM Nathan Rossi wrote:
> > >
> > > On Wed, 7 Nov 2018 at 23:21, Andrea Adami wrote:
> > > >
> > > > On Wed, Nov 7, 2018 at 1:16 PM Nathan Rossi
> > > > wrote:
> > > > >
> > > > > This change moves the initramfs bundling functions and tasks into a
> > > > > separate class called 'kernel-initramfs'. The change also converts the
> > > > > copy_initramfs into a task that itself depends on the
> > > > > do_image_complete
> > > > > of the initramfs image. Making this change allows for the
> > > > > do_initramfs_*
> > > > > tasks to be conditionally added instead of relying on the task
> > > > > checking
> > > > > the variables, with the exception of do_deploy(_append).
> > > > >
> > > > > The 'use_alternate_initrd' of kernel_do_compile is replaced with a
> > > > > general use 'extra_make' variable. And the INITRAMFS_TASK
> > > > > functionality
> > > > > of kernel_do_compile is removed.
> > > > >
> > > > > The 'KERNEL_CLASSES' inherit is moved to after the EXPORT_FUNCTIONS
> > > > > do_deploy in order to allow these classes to append to the do_deploy
> > > > > task without breaking the do_deploy task itself.
> > > > >
> > > > > The functionality for INITRAMFS_TASK remained for backwards
> > > > > compatibility when the bundle changes were introduced. The bundle
> > > > > functionality has been available for a number of releases since, as
> > > > > such
> > > > > this change does not carry forward the functionality of
> > > > > INITRAMFS_TASK.
> > > > > The information regarding INITRAMFS_TASK issues for is kept along with
> > > > > the generation of a bb.fatal when a user attempts to use it.
> > > > >
> > > > > Signed-off-by: Nathan Rossi
> > > >
> > > > Hi Nathan,
> > > >
> > > > thanks for your efforts, clearly cleaning is needed wrt the bunling.
> > > >
> > > > As for the results of this work, I fear it will break the existent (10
> > > > yrs) infrastructure.
> > > > A brief recap: we want to build a non-yocto kernel bundled with our
> > > > initramfs image, this in a single kernel recipe.
> > > >
> > > > http://cgit.openembedded.org/meta-handheld/tree/recipes-kernel/linux/linux-kexecboot_4.4.bb
> > > >
> > > > In the years I have adjusted the recipe which is today needing both
> > > >
> > > > INITRAMFS_IMAGE = "initramfs-kexecboot-klibc-image"
> > > > INITRAMFS_TASK = "${INITRAMFS_IMAGE}:do_image_complete"
> > > >
> > > > I will test your patch and include the new kernel-initramfs.bbclass.
> > > > The point is that I don't want/need the NITRAMFS_IMAGE_BUNDLE for th
> > > > emain kernel, just for thi ssecond kernel provided by the a.m. recipe.
> > > > I have to check again but this var has to be set upper in local.conf,
> > > > not in the recipe afaik.
> > >
> > > My understanding is that since image.bbclass no longer has any task
> > > dependence on the initramfs bundling you should be able to mark
> > > INITRAMFS_IMAGE_BUNDLE in your second kernel recipe and it will
> > > achieve a similar result. I did test this with a single kernel recipe,
> > > which resulted in correct kernel+image build and deploying. If you
> > > have issues with it behaving as desired then I can look into and see
> > > if it is possible to solve all bundling use cases with the one
> > > implementation similar to this change.
> > >
> > > The dependence on the kernel's bundling tasks was removed here:
> > > http://git.openembedded.org/openembedded-core/commit/?id=eca501aeb4f2cc9255fabab14c68f6910367aaf9
> > >
> > > Other than the task dependencies that were in image I could find no
> > > evidence that INITRAMFS_IMAGE_BUNDLE was explicitly required in a
> > > .conf apart from the comment in local.conf.extended
> > > (http://git.openembedded.org/openembedded-core/tree/meta/conf/local.conf.sample.extended#n350).
> > >
> > > Regards,
> > > Nathan
> > >
> >
> > Hello,
> >
> > so I applied both patches and had to comment out (as expected) the
> > INITRAMFS_TASK.
> > I have added INITRAMFS_IMAGE_BUNDLE in my 2nd kernel recipe but last
> > night build did fail: the initramfs.cpio.xz was not found.
> >
> > I did only scrub the last lines... will debug later.
> >
>
> Ok, so the problem is copy_initramfs() is done too late and do_compile fails
>
> |
> /tmp/build/tmp-musl/work-shared/spitz/kernel-source/scripts/gen_initramfs_list.sh:
> Cannot open 'initramfs.cpio.xz'
> | /tmp/build/tmp-musl/work-shared/spitz/kernel-source/usr/Makefile:73:
> recipe for target 'usr/initramfs_data.cpio.xz' failed
>
>
> do_compile log before
>
> 1 DEBUG: Executing shell function do_compile
> 2 Copying initramfs into ./usr ...
> 3 gzip decompressing image
> 4 Finished copy of initramfs into ./usr
> 5 NOTE: make -j ...
>
> do_compile with patch applied (build fails):
>
> 1 DEBUG: Executing shell function do_compile
> 2 NOTE: make -j ...
>
> Please check again the task order. Thanks.
So the task order is copied from
[OE-core] [PATCH 12/12] image-buildinfo, oeqa/selftest/containerimage: Ensure image-buildinfo doesn't break tests
Having image-buildinfo enabled causes
containerimage.ContainerImageTests.test_expected_files
to fail due to the presence of an unexpected file:
['./',
'./etc/',
- './etc/build',
'./etc/default/',
'./etc/default/postinst',
Tweak the class to allow it to be disabled and disable it from the test just in
case it was enabled.
Signed-off-by: Richard Purdie
---
meta/classes/image-buildinfo.bbclass | 2 ++
meta/lib/oeqa/selftest/cases/containerimage.py | 1 +
2 files changed, 3 insertions(+)
diff --git a/meta/classes/image-buildinfo.bbclass
b/meta/classes/image-buildinfo.bbclass
index 213fb9cf9b6..87a6a1a4893 100644
--- a/meta/classes/image-buildinfo.bbclass
+++ b/meta/classes/image-buildinfo.bbclass
@@ -64,6 +64,8 @@ def buildinfo_target(d):
# Write build information to target filesystem
python buildinfo () {
+if not d.getVar('IMAGE_BUILDINFO_FILE'):
+return
with open(d.expand('${IMAGE_ROOTFS}${IMAGE_BUILDINFO_FILE}'), 'w') as
build:
build.writelines((
'''---
diff --git a/meta/lib/oeqa/selftest/cases/containerimage.py
b/meta/lib/oeqa/selftest/cases/containerimage.py
index 99a5cc9e575..8deaae75d8a 100644
--- a/meta/lib/oeqa/selftest/cases/containerimage.py
+++ b/meta/lib/oeqa/selftest/cases/containerimage.py
@@ -39,6 +39,7 @@ class ContainerImageTests(OESelftestTestCase):
IMAGE_FSTYPES = "container"
PACKAGE_CLASSES = "package_ipk"
IMAGE_FEATURES = ""
+IMAGE_BUILDINFO_FILE = ""
""")
bbvars = get_bb_vars(['bindir', 'sysconfdir', 'localstatedir',
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/12] oeqa/runtime/cases: Improve dependencies of kernel/gcc/build tests
Mark up these tests as needing a compiler, make and kernel source code
as appropriate, the image feature requirements can then be retired.
Signed-off-by: Richard Purdie
---
meta/lib/oeqa/runtime/cases/buildcpio.py | 9 +
.../lib/oeqa/runtime/cases/buildgalculator.py | 9 +
meta/lib/oeqa/runtime/cases/buildlzip.py | 12 +---
meta/lib/oeqa/runtime/cases/gcc.py| 19 ---
meta/lib/oeqa/runtime/cases/kernelmodule.py | 8 ++--
meta/lib/oeqa/runtime/cases/stap.py | 4 ++--
6 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py
b/meta/lib/oeqa/runtime/cases/buildcpio.py
index 79b22d04dd0..a61d1e03043 100644
--- a/meta/lib/oeqa/runtime/cases/buildcpio.py
+++ b/meta/lib/oeqa/runtime/cases/buildcpio.py
@@ -1,7 +1,7 @@
from oeqa.runtime.case import OERuntimeTestCase
from oeqa.core.decorator.depends import OETestDepends
from oeqa.core.decorator.oeid import OETestID
-from oeqa.core.decorator.data import skipIfNotFeature
+from oeqa.runtime.decorator.package import OEHasPackage
from oeqa.runtime.utils.targetbuildproject import TargetBuildProject
@@ -13,17 +13,18 @@ class BuildCpioTest(OERuntimeTestCase):
cls.project = TargetBuildProject(cls.tc.target,
uri,
dl_dir = cls.tc.td['DL_DIR'])
-cls.project.download_archive()
@classmethod
def tearDownClass(cls):
cls.project.clean()
@OETestID(205)
-@skipIfNotFeature('tools-sdk',
- 'Test requires tools-sdk to be in IMAGE_FEATURES')
@OETestDepends(['ssh.SSHTest.test_ssh'])
+@OEHasPackage(['gcc'])
+@OEHasPackage(['make'])
+@OEHasPackage(['autoconf'])
def test_cpio(self):
+self.project.download_archive()
self.project.run_configure()
self.project.run_make()
self.project.run_install()
diff --git a/meta/lib/oeqa/runtime/cases/buildgalculator.py
b/meta/lib/oeqa/runtime/cases/buildgalculator.py
index 7c9d4a392bb..a0a00320835 100644
--- a/meta/lib/oeqa/runtime/cases/buildgalculator.py
+++ b/meta/lib/oeqa/runtime/cases/buildgalculator.py
@@ -1,7 +1,7 @@
from oeqa.runtime.case import OERuntimeTestCase
from oeqa.core.decorator.depends import OETestDepends
from oeqa.core.decorator.oeid import OETestID
-from oeqa.core.decorator.data import skipIfNotFeature
+from oeqa.runtime.decorator.package import OEHasPackage
from oeqa.runtime.utils.targetbuildproject import TargetBuildProject
@@ -13,16 +13,17 @@ class GalculatorTest(OERuntimeTestCase):
cls.project = TargetBuildProject(cls.tc.target,
uri,
dl_dir = cls.tc.td['DL_DIR'])
-cls.project.download_archive()
@classmethod
def tearDownClass(cls):
cls.project.clean()
@OETestID(1526)
-@skipIfNotFeature('tools-sdk',
- 'Test requires tools-sdk to be in IMAGE_FEATURES')
@OETestDepends(['ssh.SSHTest.test_ssh'])
+@OEHasPackage(['gcc'])
+@OEHasPackage(['make'])
+@OEHasPackage(['autoconf'])
def test_galculator(self):
+self.project.download_archive()
self.project.run_configure()
self.project.run_make()
diff --git a/meta/lib/oeqa/runtime/cases/buildlzip.py
b/meta/lib/oeqa/runtime/cases/buildlzip.py
index ca3fead2e49..5b455a07906 100644
--- a/meta/lib/oeqa/runtime/cases/buildlzip.py
+++ b/meta/lib/oeqa/runtime/cases/buildlzip.py
@@ -1,7 +1,7 @@
from oeqa.runtime.case import OERuntimeTestCase
from oeqa.core.decorator.depends import OETestDepends
from oeqa.core.decorator.oeid import OETestID
-from oeqa.core.decorator.data import skipIfNotFeature
+from oeqa.runtime.decorator.package import OEHasPackage
from oeqa.runtime.utils.targetbuildproject import TargetBuildProject
@@ -14,21 +14,19 @@ class BuildLzipTest(OERuntimeTestCase):
cls.project = TargetBuildProject(cls.tc.target,
uri,
dl_dir = cls.tc.td['DL_DIR'])
-cls.project.download_archive()
@classmethod
def tearDownClass(cls):
cls.project.clean()
@OETestID(206)
-@skipIfNotFeature('tools-sdk',
- 'Test requires tools-sdk to be in IMAGE_FEATURES')
@OETestDepends(['ssh.SSHTest.test_ssh'])
+@OEHasPackage(['gcc'])
+@OEHasPackage(['make'])
+@OEHasPackage(['autoconf'])
def test_lzip(self):
+self.project.download_archive()
self.project.run_configure()
self.project.run_make()
self.project.run_install()
-@classmethod
-def tearDownClass(self):
-self.project.clean()
diff --git a/meta/lib/oeqa/runtime/cases/gcc.py
b/meta/lib/oeqa/runtime/cases/gcc.py
index 911083156fb..8265c59f239 100644
--- a/meta/lib/oeqa/runtime/cases/gcc.py
+++
[OE-core] [PATCH 11/12] testimage: Further cleanup DEFAULT_TEST_SUITES
Now the test markup of the development tools tests is complete, this
can be further tweaked to auto run the correct tests.
Signed-off-by: Richard Purdie
---
meta/classes/testimage.bbclass | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index b00d47441b2..4e9494296e1 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -40,12 +40,12 @@ TEST_NEEDED_PACKAGES_DIR ?= "${WORKDIR}/testimage/packages"
TEST_EXTRACTED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/extracted"
TEST_PACKAGED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/packaged"
-BASICTESTSUITE = "ping date df ssh scp python perl apt opkg gi ptest dnf rpm
parselogs logrotate connman systemd oe_syslog pam stap ldd xorg"
-DEVTESTSUITE = "gcc kernelmodule buildcpio buildlzip buildgalculator "
+BASICTESTSUITE = "\
+ping date df ssh scp python perl apt opkg gi ptest dnf rpm parselogs \
+logrotate connman systemd oe_syslog pam stap ldd xorg kernelmodule gcc \
+buildcpio buildlzip buildgalculator"
DEFAULT_TEST_SUITES = "${BASICTESTSUITE}"
-DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "${BASICTESTSUITE}
${DEVTESTSUITE}"
-DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "${BASICTESTSUITE} ${DEVTESTSUITE}"
# aarch64 has no graphics
DEFAULT_TEST_SUITES_remove_aarch64 = "xorg"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/12] testimage: Remove duplicate dependencies
Signed-off-by: Richard Purdie
---
meta/classes/testimage.bbclass | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index b8acd3ce782..b00d47441b2 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -66,12 +66,10 @@ TEST_TARGET ?= "qemu"
TESTIMAGEDEPENDS = ""
TESTIMAGEDEPENDS_append_qemuall = " qemu-native:do_populate_sysroot
qemu-helper-native:do_populate_sysroot
qemu-helper-native:do_addto_recipe_sysroot"
TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm',
'cpio-native:do_populate_sysroot', '', d)}"
-TESTIMAGEDEPENDS_append_qemuall = " ${@bb.utils.contains('IMAGE_PKGTYPE',
'rpm', 'cpio-native:do_populate_sysroot', '', d)}"
-TESTIMAGEDEPENDS_append_qemuall = " ${@bb.utils.contains('IMAGE_PKGTYPE',
'rpm', 'createrepo-c-native:do_populate_sysroot', '', d)}"
TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm',
'dnf-native:do_populate_sysroot', '', d)}"
+TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm',
'createrepo-c-native:do_populate_sysroot', '', d)}"
TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'ipk',
'opkg-utils-native:do_populate_sysroot package-index:do_package_index', '', d)}"
TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'deb',
'apt-native:do_populate_sysroot package-index:do_package_index', '', d)}"
-TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm',
'createrepo-c-native:do_populate_sysroot', '', d)}"
TESTIMAGELOCK = "${TMPDIR}/testimage.lock"
TESTIMAGELOCK_qemuall = ""
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/12] testimage: Simplfy DEFAULT_TEST_SUITES logic
Now that the tests have correct markup to automatically determine which images
they can run against, clean up the default test suites logic to be simpler
and not image specific.
Some cleanup of the compiler tests still needs to be completed but this
is a good first step.
The only downside to this is more noise during testing as we now see
many skipped messages for simple images like core-image-minimal.
The auto type is being removed since it currently breaks badly due to the
socat mandatory inclusion from the meta-selftest layer which is a problem
which needs to be addressed seperately.
Signed-off-by: Richard Purdie
---
meta/classes/testimage.bbclass | 31 ++-
1 file changed, 6 insertions(+), 25 deletions(-)
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index ba2d9c491b2..b8acd3ce782 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -40,31 +40,12 @@ TEST_NEEDED_PACKAGES_DIR ?= "${WORKDIR}/testimage/packages"
TEST_EXTRACTED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/extracted"
TEST_PACKAGED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/packaged"
-PKGMANTESTSUITE = "\
-${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'dnf rpm', '', d)} \
-${@bb.utils.contains('IMAGE_PKGTYPE', 'ipk', 'opkg', '', d)} \
-${@bb.utils.contains('IMAGE_PKGTYPE', 'deb', 'apt', '', d)} \
-"
-SYSTEMDSUITE = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
-MINTESTSUITE = "ping"
-NETTESTSUITE = "${MINTESTSUITE} ssh df date scp oe_syslog ${SYSTEMDSUITE}"
-DEVTESTSUITE = "gcc kernelmodule ldd"
-PTESTTESTSUITE = "${MINTESTSUITE} ssh scp ptest"
-
-DEFAULT_TEST_SUITES = "${MINTESTSUITE} auto"
-DEFAULT_TEST_SUITES_pn-core-image-minimal = "${MINTESTSUITE}"
-DEFAULT_TEST_SUITES_pn-core-image-minimal-dev = "${MINTESTSUITE}"
-DEFAULT_TEST_SUITES_pn-core-image-full-cmdline = "${NETTESTSUITE} perl python
logrotate ptest"
-DEFAULT_TEST_SUITES_pn-core-image-x11 = "${MINTESTSUITE}"
-DEFAULT_TEST_SUITES_pn-core-image-lsb = "${NETTESTSUITE} pam parselogs
${PKGMANTESTSUITE} ptest"
-DEFAULT_TEST_SUITES_pn-core-image-sato = "${NETTESTSUITE} connman xorg
parselogs ${PKGMANTESTSUITE} \
-${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'python', '', d)} ptest gi"
-DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "${NETTESTSUITE} buildcpio
buildlzip buildgalculator \
-connman ${DEVTESTSUITE} logrotate perl parselogs python ${PKGMANTESTSUITE}
xorg ptest gi stap"
-DEFAULT_TEST_SUITES_pn-core-image-lsb-dev = "${NETTESTSUITE} pam perl python
parselogs ${PKGMANTESTSUITE} ptest gi"
-DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "${NETTESTSUITE} buildcpio
buildlzip buildgalculator \
-connman ${DEVTESTSUITE} logrotate pam parselogs perl python
${PKGMANTESTSUITE} ptest gi stap"
-DEFAULT_TEST_SUITES_pn-meta-toolchain = "auto"
+BASICTESTSUITE = "ping date df ssh scp python perl apt opkg gi ptest dnf rpm
parselogs logrotate connman systemd oe_syslog pam stap ldd xorg"
+DEVTESTSUITE = "gcc kernelmodule buildcpio buildlzip buildgalculator "
+
+DEFAULT_TEST_SUITES = "${BASICTESTSUITE}"
+DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "${BASICTESTSUITE}
${DEVTESTSUITE}"
+DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "${BASICTESTSUITE} ${DEVTESTSUITE}"
# aarch64 has no graphics
DEFAULT_TEST_SUITES_remove_aarch64 = "xorg"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/12] oeqa/runtime/utils/targetbuildproject: Use a subdir within ~/
Without doing this, the code can and sometimes does try and do "rm ~/"
which I think we'd all prefer it didn't.
Signed-off-by: Richard Purdie
---
meta/lib/oeqa/runtime/utils/targetbuildproject.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/runtime/utils/targetbuildproject.py
b/meta/lib/oeqa/runtime/utils/targetbuildproject.py
index 5af55d736e4..de17ba01f89 100644
--- a/meta/lib/oeqa/runtime/utils/targetbuildproject.py
+++ b/meta/lib/oeqa/runtime/utils/targetbuildproject.py
@@ -7,10 +7,12 @@ class TargetBuildProject(BuildProject):
def __init__(self, target, uri, foldername=None, dl_dir=None):
self.target = target
-self.targetdir = "~/"
+self.targetdir = "~/buildtest/"
BuildProject.__init__(self, uri, foldername, dl_dir=dl_dir)
def download_archive(self):
+self.target.run("mkdir " + self.targetdir + " || true")
+
self._download_archive()
status, output = self.target.copyTo(self.localarchive, self.targetdir)
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/12] oeqa/utils/buildproject: Only clean files if we've done something
We should only be wiping out things on target if the tests have
actually run.
Signed-off-by: Richard Purdie
---
meta/lib/oeqa/utils/buildproject.py | 5 +
1 file changed, 5 insertions(+)
diff --git a/meta/lib/oeqa/utils/buildproject.py
b/meta/lib/oeqa/utils/buildproject.py
index 721f35d996e..7e9b84955f5 100644
--- a/meta/lib/oeqa/utils/buildproject.py
+++ b/meta/lib/oeqa/utils/buildproject.py
@@ -24,9 +24,12 @@ class BuildProject(metaclass=ABCMeta):
self.fname = foldername
else:
self.fname = re.sub(r'\.tar\.bz2$|\.tar\.gz$|\.tar\.xz$', '',
self.archive)
+self.needclean = False
# Download self.archive to self.localarchive
def _download_archive(self):
+
+self.needclean = True
if self.dl_dir and os.path.exists(os.path.join(self.dl_dir,
self.archive)):
shutil.copyfile(os.path.join(self.dl_dir, self.archive),
self.localarchive)
return
@@ -51,5 +54,7 @@ class BuildProject(metaclass=ABCMeta):
return self._run('cd %s; make install %s' % (self.targetdir,
install_args))
def clean(self):
+if not self.needclean:
+ return
self._run('rm -rf %s' % self.targetdir)
subprocess.check_call('rm -f %s' % self.localarchive, shell=True)
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/12] distcc: Handle upstream branch deletion for old releases
distcc upstream dropped the 3.2 branch which we reference in older project
releases
the revisions are there, just the branch is not. In order to be able to continue
to build those old releases, adjust any mirror tarball to contain the missing
branch.
We have updated the newer point releases but the previous tags were failing to
build.
Signed-off-by: Richard Purdie
---
meta/recipes-devtools/distcc/distcc_3.3.2.bb | 24
1 file changed, 24 insertions(+)
diff --git a/meta/recipes-devtools/distcc/distcc_3.3.2.bb
b/meta/recipes-devtools/distcc/distcc_3.3.2.bb
index 0d069631653..a93604bc471 100644
--- a/meta/recipes-devtools/distcc/distcc_3.3.2.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.3.2.bb
@@ -69,3 +69,27 @@ FILES_${PN} = " ${sysconfdir} \
${systemd_unitdir}/system/distcc.service"
FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \
${datadir}/distcc"
+
+
+#
+# distcc upstream dropped the 3.2 branch which we reference in older project
releases
+# the revisions are there, just the branch is not. In order to be able to
continue
+# to build those old releases, adjust any mirror tarball to contain the
missing branch
+#
+fixup_distcc_mirror_tarball () {
+ TBALL=${DL_DIR}/git2_github.com.distcc.distcc.git.tar.gz
+ if [ -f $TBALL ]; then
+ TDIR=`mktemp -d`
+ cd $TDIR
+ tar -xzf $TBALL
+ set +e
+ git rev-parse --verify 3.2
+ if [ "$?" != "0" ]; then
+ git branch 3.2 d8b18df3e9dcbe4f092bed565835d3975e99432c
+ tar -czf $TBALL *
+ fi
+ set -e
+ rm -rf $TDIR/*
+ fi
+}
+do_fetch[postfuncs] += "fixup_distcc_mirror_tarball"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/12] oeqa/runtime/cases: Improve test dependency information
Add the OEHasPackage decorator to a variety of tests so they determine
automatically if they should run against a given image.
To ensure tests can do this we need to move target operations such
as scp commands into the tests and out of the class startup/teardown.
Signed-off-by: Richard Purdie
---
meta/lib/oeqa/runtime/cases/date.py | 2 ++
meta/lib/oeqa/runtime/cases/df.py | 2 ++
meta/lib/oeqa/runtime/cases/ptest.py | 2 ++
meta/lib/oeqa/runtime/cases/python.py | 8 ++--
meta/lib/oeqa/runtime/cases/rpm.py| 26 ++
meta/lib/oeqa/runtime/cases/scp.py| 2 ++
meta/lib/oeqa/runtime/cases/ssh.py| 2 ++
meta/lib/oeqa/runtime/cases/stap.py | 2 ++
meta/lib/oeqa/runtime/cases/xorg.py | 2 ++
9 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/meta/lib/oeqa/runtime/cases/date.py
b/meta/lib/oeqa/runtime/cases/date.py
index ece7338de73..0887b831f42 100644
--- a/meta/lib/oeqa/runtime/cases/date.py
+++ b/meta/lib/oeqa/runtime/cases/date.py
@@ -3,6 +3,7 @@ import re
from oeqa.runtime.case import OERuntimeTestCase
from oeqa.core.decorator.depends import OETestDepends
from oeqa.core.decorator.oeid import OETestID
+from oeqa.runtime.decorator.package import OEHasPackage
class DateTest(OERuntimeTestCase):
@@ -18,6 +19,7 @@ class DateTest(OERuntimeTestCase):
@OETestID(211)
@OETestDepends(['ssh.SSHTest.test_ssh'])
+@OEHasPackage(['coreutils', 'busybox'])
def test_date(self):
(status, output) = self.target.run('date +"%Y-%m-%d %T"')
msg = 'Failed to get initial date, output: %s' % output
diff --git a/meta/lib/oeqa/runtime/cases/df.py
b/meta/lib/oeqa/runtime/cases/df.py
index aecc32d7ce3..e0b6bb839d1 100644
--- a/meta/lib/oeqa/runtime/cases/df.py
+++ b/meta/lib/oeqa/runtime/cases/df.py
@@ -1,11 +1,13 @@
from oeqa.runtime.case import OERuntimeTestCase
from oeqa.core.decorator.depends import OETestDepends
from oeqa.core.decorator.oeid import OETestID
+from oeqa.runtime.decorator.package import OEHasPackage
class DfTest(OERuntimeTestCase):
@OETestID(234)
@OETestDepends(['ssh.SSHTest.test_ssh'])
+@OEHasPackage(['coreutils', 'busybox'])
def test_df(self):
cmd = "df / | sed -n '2p' | awk '{print $4}'"
(status,output) = self.target.run(cmd)
diff --git a/meta/lib/oeqa/runtime/cases/ptest.py
b/meta/lib/oeqa/runtime/cases/ptest.py
index 77ae7b6b863..0972a583eeb 100644
--- a/meta/lib/oeqa/runtime/cases/ptest.py
+++ b/meta/lib/oeqa/runtime/cases/ptest.py
@@ -5,6 +5,7 @@ from oeqa.runtime.case import OERuntimeTestCase
from oeqa.core.decorator.depends import OETestDepends
from oeqa.core.decorator.oeid import OETestID
from oeqa.core.decorator.data import skipIfNotFeature
+from oeqa.runtime.decorator.package import OEHasPackage
from oeqa.utils.logparser import Lparser, Result
class PtestRunnerTest(OERuntimeTestCase):
@@ -52,6 +53,7 @@ class PtestRunnerTest(OERuntimeTestCase):
@OETestID(1600)
@skipIfNotFeature('ptest', 'Test requires ptest to be in DISTRO_FEATURES')
@OETestDepends(['ssh.SSHTest.test_ssh'])
+@OEHasPackage(['ptest-runner'])
@unittest.expectedFailure
def test_ptestrunner(self):
status, output = self.target.run('which ptest-runner', 0)
diff --git a/meta/lib/oeqa/runtime/cases/python.py
b/meta/lib/oeqa/runtime/cases/python.py
index 4419a9f6394..66ab4d25f37 100644
--- a/meta/lib/oeqa/runtime/cases/python.py
+++ b/meta/lib/oeqa/runtime/cases/python.py
@@ -1,16 +1,12 @@
from oeqa.runtime.case import OERuntimeTestCase
from oeqa.core.decorator.depends import OETestDepends
from oeqa.core.decorator.oeid import OETestID
+from oeqa.runtime.decorator.package import OEHasPackage
class PythonTest(OERuntimeTestCase):
-@classmethod
-def setUpClass(cls):
-import unittest
-if "python3-core" not in cls.tc.image_packages:
-raise unittest.SkipTest("Python3 not on target")
-
@OETestID(965)
@OETestDepends(['ssh.SSHTest.test_ssh'])
+@OEHasPackage(['python3-core'])
def test_python3(self):
cmd = "python3 -c \"import codecs; print(codecs.encode('Uryyb, jbeyq',
'rot13'))\""
status, output = self.target.run(cmd)
diff --git a/meta/lib/oeqa/runtime/cases/rpm.py
b/meta/lib/oeqa/runtime/cases/rpm.py
index 1e5e4631d37..0213c4b57e8 100644
--- a/meta/lib/oeqa/runtime/cases/rpm.py
+++ b/meta/lib/oeqa/runtime/cases/rpm.py
@@ -10,11 +10,6 @@ from oeqa.core.utils.path import findFile
class RpmBasicTest(OERuntimeTestCase):
-@classmethod
-def setUpClass(cls):
-if cls.tc.td['PACKAGE_CLASSES'].split()[0] != 'package_rpm':
-cls.skipTest('Tests require image to be build from rpm')
-
@OETestID(960)
@OEHasPackage(['rpm'])
@OETestDepends(['ssh.SSHTest.test_ssh'])
@@ -34,30 +29,25 @@ class RpmInstallRemoveTest(OERuntimeTestCase):
@classmethod
def setUpClass(cls):
-if cls.tc.td['PACKAGE_CLASSES'].split()[0] !=
[OE-core] [PATCH 04/12] oeqa/selftest/recipetool: Fix problems from changing upstream source
The upstream source tarball checksums changed. Use the copy from our source
mirror to avoid failures.
[YOCTO #12979]
Signed-off-by: Richard Purdie
---
meta/lib/oeqa/selftest/cases/recipetool.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py
b/meta/lib/oeqa/selftest/cases/recipetool.py
index cd15df11a93..06f980e1b0e 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -433,12 +433,12 @@ class RecipetoolTests(RecipetoolBase):
temprecipe = os.path.join(self.tempdir, 'recipe')
os.makedirs(temprecipe)
recipefile = os.path.join(temprecipe, 'navit_0.5.0.bb')
-srcuri =
'http://downloads.sourceforge.net/project/navit/v0.5.0/navit-0.5.0.tar.gz'
+srcuri =
'http://downloads.yoctoproject.org/mirror/sources/navit-0.5.0.tar.gz'
result = runCmd('recipetool create -o %s %s' % (temprecipe, srcuri))
self.assertTrue(os.path.isfile(recipefile))
checkvars = {}
checkvars['LICENSE'] = set(['Unknown', 'GPLv2', 'LGPLv2'])
-checkvars['SRC_URI'] =
'http://downloads.sourceforge.net/project/navit/v${PV}/navit-${PV}.tar.gz'
+checkvars['SRC_URI'] =
'http://downloads.yoctoproject.org/mirror/sources/navit-${PV}.tar.gz'
checkvars['SRC_URI[md5sum]'] = '242f398e979a6b8c0f3c802b63435b68'
checkvars['SRC_URI[sha256sum]'] =
'13353481d7fc01a4f64e385dda460b51496366bba0fd2cc85a89a0747910e94d'
checkvars['DEPENDS'] = set(['freetype', 'zlib', 'openssl', 'glib-2.0',
'virtual/libgl', 'virtual/egl', 'gtk+', 'libpng', 'libsdl', 'freeglut',
'dbus-glib', 'fribidi'])
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/12] metadata_scm: Drop orphaned monotone functions
Its been 'a while' since we used monotone, drop these revision
function remnants.
Signed-off-by: Richard Purdie
---
meta/classes/metadata_scm.bbclass | 24
1 file changed, 24 deletions(-)
diff --git a/meta/classes/metadata_scm.bbclass
b/meta/classes/metadata_scm.bbclass
index 658e2f883b0..58bb4c555a2 100644
--- a/meta/classes/metadata_scm.bbclass
+++ b/meta/classes/metadata_scm.bbclass
@@ -12,30 +12,6 @@ def base_detect_branch(d):
def base_get_scmbasepath(d):
return os.path.join(d.getVar('COREBASE'), 'meta')
-def base_get_metadata_monotone_branch(path, d):
-monotone_branch = ""
-try:
-with open("%s/_MTN/options" % path) as f:
-monotone_branch = f.read().strip()
-if monotone_branch.startswith( "database" ):
-monotone_branch_words = monotone_branch.split()
-monotone_branch = monotone_branch_words[
monotone_branch_words.index( "branch" )+1][1:-1]
-except:
-pass
-return monotone_branch
-
-def base_get_metadata_monotone_revision(path, d):
-monotone_revision = ""
-try:
-with open("%s/_MTN/revision" % path) as f:
-monotone_revision = f.read().strip()
-if monotone_revision.startswith( "format_version" ):
-monotone_revision_words = monotone_revision.split()
-monotone_revision = monotone_revision_words[
monotone_revision_words.index( "old_revision" )+1][1:-1]
-except IOError:
-pass
-return monotone_revision
-
def base_get_metadata_svn_revision(path, d):
# This only works with older subversion. For newer versions
# this function will need to be fixed by someone interested
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/12] build-appliance: Drop test which is already automated
The nightly-build-appliance target already tests this particular build.
Signed-off-by: Richard Purdie
---
meta/lib/oeqa/manual/build-appliance.json | 26 ---
1 file changed, 26 deletions(-)
diff --git a/meta/lib/oeqa/manual/build-appliance.json
b/meta/lib/oeqa/manual/build-appliance.json
index b8f89275d08..70f8c72c9bb 100644
--- a/meta/lib/oeqa/manual/build-appliance.json
+++ b/meta/lib/oeqa/manual/build-appliance.json
@@ -1,30 +1,4 @@
[
-{
-"test": {
-"@alias":
"build-appliance.build-appliance.Bitbake_build-appliance-image",
-"author": [
-{
-"email": "alexandru.c.george...@intel.com",
-"name": "alexandru.c.george...@intel.com"
-}
-],
-"execution": {
-"1": {
-"action": "Get poky source code and prepare the build
environment",
-"expected_results": "bitbake build-appliance-image is
successful "
-},
-"2": {
-"action": "Set MACHINE to qemux86 and add the following
line to conf/local.conf : SRCREV_pn-build-appliance-image = \"${AUTOREV}\"",
-"expected_results": ""
-},
-"3": {
-"action": "Run \"bitbake build-appliance-image\" \n \n",
-"expected_results": ""
-}
-},
-"summary": "Bitbake_build-appliance-image"
-}
-},
{
"test": {
"@alias":
"build-appliance.build-appliance.Build_core-image-minimal_with_build-appliance-image",
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] libjitterentropy: add 2.1.2
On 2018/11/9 下午6:30, richard.pur...@linuxfoundation.org wrote: On Fri, 2018-11-09 at 17:12 +0800, Hongxu Jia wrote: From the following kernel commit we know: Fedora has integrated the jitter entropy daemon to work around slow boot problems, especially on VM's that don't support virtio-rng https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=81e69df38e2911b642ec121dec319fad2a4782f3 Do the same thing for Yocto. Signed-off-by: Hongxu Jia I'm not convinced this is going to help. The userspace support comes up quite late and the kernel blocking has already happened before that point when I last saw these issues. This was why I just enabled the virtio rng passthrough everywhere... Yes, if VM support virtio-rng, we indeed do not need it, but for VM not support virtio-rng, it makes sense. Is libjitterentropy actually helping your use cases? Yes, it helps, I use runqemu without virtio-rng on qemumips64 to simulate VM that don't support virtio-rng With libjitterentropy and rng-tools, it takes <60s to init crng (after rngd-tools started successfully) [ 48.967114] random: crng init done Fri Nov 9 14:06:49 2018: Starting random number generator daemon Fri Nov 9 14:06:50 2018: Initalizing available sources Fri Nov 9 14:06:50 2018: Fri Nov 9 14:06:50 2018: Failed to init entropy source hwrng Fri Nov 9 14:06:50 2018: Fri Nov 9 14:07:05 2018: Enabling JITTER rng support Fri Nov 9 14:07:06 2018: Fri Nov 9 14:07:06 2018: Initalizing entropy source jitter Fri Nov 9 14:07:06 2018: Fri Nov 9 14:07:06 2018: . Fri Nov 9 14:07:06 2018: Starting OpenBSD Secure Shell server: sshd Fri Nov 9 14:07:06 2018: done. Fri Nov 9 14:07:07 2018: hwclock: can't open '/dev/misc/rtc': No such file or directory Fri Nov 9 14:07:07 2018: Starting syslogd/klogd: done Nov 9 14:07:07 qemumips64 user.notice kernel: [ 48.967114] random: crng init done Without libjitterentropy and rng-tools, it takes >2minutes to init crng (there are some other virtual device to generate noise for entropy) [ 124.728869] random: crng init done By the way, without virtio-rng, /dev/hwrng is dead on guest, that's the reason why I upgrade rng-tools and integrate libjitterentropy, previously old rng-tools hung minutes in this situation. //Hongxu Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] avahi: add ptest
On Thu, 8 Nov 2018 at 09:44, Stefan Strogin via Openembedded-core
wrote:
> +do_install_ptest () {
> +install -d ${D}${PTEST_PATH}/test/.libs
> +for t in dns-spin-test dns-test hashmap-test
> +do
> +install -m 0755 ${B}/avahi-core/$t ${D}${PTEST_PATH}/test/
> +sed -e 's/^relink_command=\"\(.*\)\"/relink_command=\"\"/' -i
> ${D}${PTEST_PATH}/test/$t
> +install -m 0755 ${B}/avahi-core/.libs/$t
> ${D}${PTEST_PATH}/test/.libs/lt-$t
> +done
> +}
Whilst I really do want to see more test suites, is this really a
useful test suite? hashmap-test is a validation that the hash
implementation works, dns-test is low-level parsing, and dns-spin-test
is basically a way to verify an Avahi bug doesn't regress. This isn't
exactly a full-featured test suite that creates services, ensures
they're browsable, enumerate stuff, etc.
Ross
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for Fix header files to compile libgpg-error-native on ppc64le Power8 build machine
== Series Details == Series: Fix header files to compile libgpg-error-native on ppc64le Power8 build machine Revision: 1 URL : https://patchwork.openembedded.org/series/14828/ 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: * PatchFix header files to compile libgpg-error-native on ppc64le Power8 build machine Issue Shortlog does not follow expected format [test_shortlog_format] Suggested fixCommit shortlog (first line of commit message) should follow the format ": " * PatchFix header files to compile libgpg-error-native on ppc64le Power8 build machine Issue Patch is missing Signed-off-by [test_signed_off_by_presence] Suggested fixSign off the patch (either manually or with "git commit --amend -s") 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
Re: [OE-core] [PATCH 2/7] python3: add tk support
On Fri, 9 Nov 2018 at 01:39, Yu, Mingli wrote: > > Why is this here and not in the manifest? > > It's because we can optionally enable or disable tk via PACKAGECONFIG, > if add it to manifest then we need to always enable tk which is also the > implement in v1. Are you sure? As I understand it there won't be any errors if the contents don't exist. And to be honest if there are, then the manifest tooling should handle that neatly without special-casing. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] libjitterentropy: add 2.1.2
On Fri, 2018-11-09 at 17:12 +0800, Hongxu Jia wrote: > From the following kernel commit we know: Fedora has integrated the > jitter > entropy daemon to work around slow boot problems, especially on VM's > that > don't support virtio-rng > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=81e69df38e2911b642ec121dec319fad2a4782f3 > > Do the same thing for Yocto. > > Signed-off-by: Hongxu Jia I'm not convinced this is going to help. The userspace support comes up quite late and the kernel blocking has already happened before that point when I last saw these issues. This was why I just enabled the virtio rng passthrough everywhere... Is libjitterentropy actually helping your use cases? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] recipetool: Change srcuri mirror to yoctoproject site
From: Mohamad Noor Alim Hussin
This patch resolve bug 12979 due to checksum of navit-0.5.0
has changed from sourceforge. The srcuri mirror was change to
yoctoproject.org.
Signed-off-by: Mohamad Noor Alim Hussin
---
meta/lib/oeqa/selftest/cases/recipetool.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py
b/meta/lib/oeqa/selftest/cases/recipetool.py
index cd15df1..06f980e 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -433,12 +433,12 @@ class RecipetoolTests(RecipetoolBase):
temprecipe = os.path.join(self.tempdir, 'recipe')
os.makedirs(temprecipe)
recipefile = os.path.join(temprecipe, 'navit_0.5.0.bb')
-srcuri =
'http://downloads.sourceforge.net/project/navit/v0.5.0/navit-0.5.0.tar.gz'
+srcuri =
'http://downloads.yoctoproject.org/mirror/sources/navit-0.5.0.tar.gz'
result = runCmd('recipetool create -o %s %s' % (temprecipe, srcuri))
self.assertTrue(os.path.isfile(recipefile))
checkvars = {}
checkvars['LICENSE'] = set(['Unknown', 'GPLv2', 'LGPLv2'])
-checkvars['SRC_URI'] =
'http://downloads.sourceforge.net/project/navit/v${PV}/navit-${PV}.tar.gz'
+checkvars['SRC_URI'] =
'http://downloads.yoctoproject.org/mirror/sources/navit-${PV}.tar.gz'
checkvars['SRC_URI[md5sum]'] = '242f398e979a6b8c0f3c802b63435b68'
checkvars['SRC_URI[sha256sum]'] =
'13353481d7fc01a4f64e385dda460b51496366bba0fd2cc85a89a0747910e94d'
checkvars['DEPENDS'] = set(['freetype', 'zlib', 'openssl', 'glib-2.0',
'virtual/libgl', 'virtual/egl', 'gtk+', 'libpng', 'libsdl', 'freeglut',
'dbus-glib', 'fribidi'])
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] update-rc.d.bbclass: remove preinst and remove -f for postinst
From: Changqing Li
*preinst use "-f remove" to remove any links in the /etc/rcrunlevel.d
but this will make user cannot keep previous config by default after
upgrade
eg: user disable one service before upgrade, after upgrade, service
could be started since during preinst, all link have been deleted, so
postinst may create the link to start service.
remove preinst to keep previous links, so that after upgrade, if any
link existed for the package, postinst will not create new start/stop
links.
(note: patch of support enable/disable function of update-rc.d send
to yocto mail list today)
*remove -f for postinst, previously, recipe keepalived use remove during
postinst, so need this -f, but remove in postinst is not proper, recipe
keepalived have fixed this problem, so remove -f.
Signed-off-by: Changqing Li
---
meta/classes/update-rc.d.bbclass | 28
1 file changed, 4 insertions(+), 24 deletions(-)
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 265c4be..1366fee 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -20,28 +20,14 @@ def use_updatercd(d):
return '[ -n "$D" -o ! -d /run/systemd/system ]'
return 'true'
-updatercd_preinst() {
-if ${@use_updatercd(d)} && [ -z "$D" -a -f "${INIT_D_DIR}/${INITSCRIPT_NAME}"
]; then
- ${INIT_D_DIR}/${INITSCRIPT_NAME} stop || :
-fi
-if ${@use_updatercd(d)} && type update-rc.d >/dev/null 2>/dev/null; then
- if [ -n "$D" ]; then
- OPT="-f -r $D"
- else
- OPT="-f"
- fi
- update-rc.d $OPT ${INITSCRIPT_NAME} remove
-fi
-}
-
PACKAGE_WRITE_DEPS += "update-rc.d-native"
updatercd_postinst() {
if ${@use_updatercd(d)} && type update-rc.d >/dev/null 2>/dev/null; then
if [ -n "$D" ]; then
- OPT="-f -r $D"
+ OPT="-r $D"
else
- OPT="-f -s"
+ OPT="-s"
fi
update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
fi
@@ -79,7 +65,7 @@ python __anonymous() {
PACKAGESPLITFUNCS_prepend = "${@bb.utils.contains('DISTRO_FEATURES',
'sysvinit', 'populate_packages_updatercd ', '', d)}"
PACKAGESPLITFUNCS_remove_class-nativesdk = "populate_packages_updatercd "
-populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm
updatercd_preinst updatercd_postinst"
+populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm
updatercd_postinst"
populate_packages_updatercd[vardepsexclude] += "OVERRIDES"
python populate_packages_updatercd () {
@@ -95,7 +81,7 @@ python populate_packages_updatercd () {
d.appendVar('RDEPENDS_' + pkg, ' %sinitd-functions' % (mlprefix))
def update_rcd_package(pkg):
-bb.debug(1, 'adding update-rc.d calls to preinst/postinst/prerm/postrm
for %s' % pkg)
+bb.debug(1, 'adding update-rc.d calls to postinst/prerm/postrm for %s'
% pkg)
localdata = bb.data.createCopy(d)
overrides = localdata.getVar("OVERRIDES")
@@ -103,12 +89,6 @@ python populate_packages_updatercd () {
update_rcd_auto_depend(pkg)
-preinst = d.getVar('pkg_preinst_%s' % pkg)
-if not preinst:
-preinst = '#!/bin/sh\n'
-preinst += localdata.getVar('updatercd_preinst')
-d.setVar('pkg_preinst_%s' % pkg, preinst)
-
postinst = d.getVar('pkg_postinst_%s' % pkg)
if not postinst:
postinst = '#!/bin/sh\n'
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] libjitterentropy: add 2.1.2
>From the following kernel commit we know: Fedora has integrated the jitter
entropy daemon to work around slow boot problems, especially on VM's that
don't support virtio-rng
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=81e69df38e2911b642ec121dec319fad2a4782f3
Do the same thing for Yocto.
Signed-off-by: Hongxu Jia
---
.../files/0001-fix-do_install-failure-on-oe.patch | 33 ++
.../libjitterentropy/libjitterentropy_2.1.2.bb | 28 ++
2 files changed, 61 insertions(+)
create mode 100644
meta/recipes-support/libjitterentropy/files/0001-fix-do_install-failure-on-oe.patch
create mode 100644
meta/recipes-support/libjitterentropy/libjitterentropy_2.1.2.bb
diff --git
a/meta/recipes-support/libjitterentropy/files/0001-fix-do_install-failure-on-oe.patch
b/meta/recipes-support/libjitterentropy/files/0001-fix-do_install-failure-on-oe.patch
new file mode 100644
index 000..30ff4fe
--- /dev/null
+++
b/meta/recipes-support/libjitterentropy/files/0001-fix-do_install-failure-on-oe.patch
@@ -0,0 +1,33 @@
+From 00cefca0eefecec657969b50cd4e1ed5b057a857 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia
+Date: Thu, 25 Oct 2018 16:30:06 +0800
+Subject: [PATCH] fix do_install failure on oe
+
+- Do not strip at do_install
+
+- Create includedir
+
+Upstream-Status: Pending
+
+Signed-off-by: Hongxu Jia
+---
+ Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 5e31276..76fcbfa 100644
+--- a/Makefile
b/Makefile
+@@ -51,7 +51,8 @@ install:
+ install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/
+ gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
+ install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
+- install -m 0755 -s lib$(NAME).so.$(LIBVERSION)
$(DESTDIR)$(PREFIX)/$(LIBDIR)/
++ install -m 0755 lib$(NAME).so.$(LIBVERSION)
$(DESTDIR)$(PREFIX)/$(LIBDIR)/
++ install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR)/
+ install -m 0644 jitterentropy.h $(DESTDIR)$(PREFIX)/$(INCDIR)/
+ install -m 0644 jitterentropy-base-user.h $(DESTDIR)$(PREFIX)/$(INCDIR)/
+ $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
+--
+2.7.4
+
diff --git a/meta/recipes-support/libjitterentropy/libjitterentropy_2.1.2.bb
b/meta/recipes-support/libjitterentropy/libjitterentropy_2.1.2.bb
new file mode 100644
index 000..3b5b4e4
--- /dev/null
+++ b/meta/recipes-support/libjitterentropy/libjitterentropy_2.1.2.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Hardware RNG based on CPU timing jitter"
+DESCRIPTION = "The Jitter RNG provides a noise source using the CPU execution
timing jitter. \
+It does not depend on any system resource other than a high-resolution time \
+stamp. It is a small-scale, yet fast entropy source that is viable in almost \
+all environments and on a lot of CPU architectures."
+HOMEPAGE = "http://www.chronox.de/jent.html;
+LICENSE = "GPLv2+ | BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e52365752b36cfcd7f9601d80de7d8c6 \
+file://COPYING.gplv2;md5=eb723b61539feef013de476e68b5c50a \
+file://COPYING.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \
+ "
+SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git \
+ file://0001-fix-do_install-failure-on-oe.patch \
+ "
+SRCREV = "f5a80c6f3fcc6deebd0eabf75324f48aed1afbce"
+S = "${WORKDIR}/git"
+
+do_configure[noexec] = "1"
+
+LDFLAGS += "-Wl,-O0"
+
+do_install () {
+oe_runmake install INCDIR="/include" \
+ DESTDIR="${D}" \
+ PREFIX="${exec_prefix}" \
+ LIBDIR="${baselib}"
+}
+
--
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] rng-tools: 5 -> 6.6
- Update SRC_URI, previously upstream is dead, latest update is 2014
- Drop read_error_msg.patch
- Rework do_configure and do_compile
- Enable jitterentropy
License-Update: Upstream changed, but license is still gplv2
Signed-off-by: Hongxu Jia
---
...1-If-the-libc-is-lacking-argp-use-libargp.patch | 10 +--
...rgument-to-control-the-libargp-dependency.patch | 21 +++--
.../rng-tools/rng-tools/read_error_msg.patch | 98 --
.../rng-tools-5-fix-textrels-on-PIC-x86.patch | 35 +---
.../rng-tools/rng-tools/underquote.patch | 27 --
.../rng-tools/{rng-tools_5.bb => rng-tools_6.6.bb} | 25 --
6 files changed, 78 insertions(+), 138 deletions(-)
delete mode 100644
meta/recipes-support/rng-tools/rng-tools/read_error_msg.patch
rename meta/recipes-support/rng-tools/{rng-tools_5.bb => rng-tools_6.6.bb}
(72%)
diff --git
a/meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch
b/meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch
index 4bd9d31..06d1d94 100644
---
a/meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch
+++
b/meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch
@@ -1,7 +1,7 @@
-From 99679fda405e535a282f04a4decc2381154a749f Mon Sep 17 00:00:00 2001
+From 06ba71887f667d45dd231a782a2751f36e8fe025 Mon Sep 17 00:00:00 2001
From: Christopher Larson
Date: Mon, 15 Feb 2016 15:59:58 -0700
-Subject: [PATCH 1/2] If the libc is lacking argp, use libargp
+Subject: [PATCH 1/4] If the libc is lacking argp, use libargp
Patch pulled from Gentoo:
@@ -23,10 +23,10 @@ Signed-off-by: Christopher Larson
1 file changed, 22 insertions(+)
diff --git a/configure.ac b/configure.ac
-index 27a2dba..04fcd25 100644
+index 4e799dc..c4a5dd8 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -82,6 +82,28 @@ AS_IF(
+@@ -135,6 +135,28 @@ AS_IF(
]
)
@@ -56,5 +56,5 @@ index 27a2dba..04fcd25 100644
dnl Configure options
dnl -
--
-2.2.1
+2.7.4
diff --git
a/meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch
b/meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch
index 1c8a79c..be60fe9 100644
---
a/meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch
+++
b/meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch
@@ -1,23 +1,26 @@
-From afc8712a9e6c72fbd03c36f84ecf8703e5d22a8c Mon Sep 17 00:00:00 2001
+From 711e2f76890e3c5b08f64859d9fd913ddbec7d50 Mon Sep 17 00:00:00 2001
From: Christopher Larson
-Date: Mon, 15 Feb 2016 16:11:32 -0700
-Subject: [PATCH 2/2] Add argument to control the libargp dependency
+Date: Mon, 22 Oct 2018 15:26:47 +0800
+Subject: [PATCH 2/4] Add argument to control the libargp dependency
This ensures that the builds are always deterministic. If the argument isn't
passed, the default behavior is to use libargp if the libc doesn't have argp.
Upstream-Status: Pending
Signed-off-by: Christopher Larson
+
+Rebase to 6.6
+Signed-off-by: Hongxu Jia
---
configure.ac | 55 ---
1 file changed, 36 insertions(+), 19 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 04fcd25..11a5321 100644
+index c4a5dd8..dd1c30f 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -32,6 +32,13 @@ AC_ARG_WITH([libgcrypt],
- [with_libgcrypt=check]
+@@ -40,6 +40,13 @@ AC_ARG_WITH([nistbeacon],
+ [with_nistbeacon=check]
)
+AC_ARG_WITH([libargp],
@@ -29,8 +32,8 @@ index 04fcd25..11a5321 100644
+
dnl Make sure anyone changing configure.ac/Makefile.am has a clue
AM_MAINTAINER_MODE
-
-@@ -82,27 +89,37 @@ AS_IF(
+ AM_PROG_AS
+@@ -135,27 +142,37 @@ AS_IF(
]
)
@@ -88,5 +91,5 @@ index 04fcd25..11a5321 100644
dnl -
dnl Configure options
--
-2.2.1
+2.7.4
diff --git a/meta/recipes-support/rng-tools/rng-tools/read_error_msg.patch
b/meta/recipes-support/rng-tools/rng-tools/read_error_msg.patch
deleted file mode 100644
index 8aa13bf..000
--- a/meta/recipes-support/rng-tools/rng-tools/read_error_msg.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-rng-tools: modify 'read error' message
-
-Make the 'read error' message more descriptive.
-
-Copied from https://bugzilla.redhat.com/attachment.cgi?id=1295857
-and modified in one place to apply successfully. Error message during
-bootstrap modified to show device name.
-
-Upstream-Status: pending
-
-Signed-off-by: Joe Slater
-
-
a/rngd.c
-+++ b/rngd.c
-@@ -247,8 +247,11 @@ static void do_loop(int random_step)
- continue; /* failed, no work */
-
- retval = iter->xread(buf, sizeof buf, iter);
-- if (retval)
-+ if (retval) {
-+
[OE-core] [PATCH 0/2] Integrated the jitter entropy daemon to work around slow boot problems for Yocto
The following changes since commit bb06900a1f29fdd4066f6d7e7a961d230c2e9438:
perf: Disable libunwind for ARC & RISCV64 (2018-11-06 12:15:59 +)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib hongxu/add-jitter
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=hongxu/add-jitter
Hongxu Jia (2):
rng-tools: 5 -> 6.6
libjitterentropy: add 2.1.2
.../files/0001-fix-do_install-failure-on-oe.patch | 33
.../libjitterentropy/libjitterentropy_2.1.2.bb | 28 +++
...1-If-the-libc-is-lacking-argp-use-libargp.patch | 10 +--
...rgument-to-control-the-libargp-dependency.patch | 21 +++--
.../rng-tools/rng-tools/read_error_msg.patch | 98 --
.../rng-tools-5-fix-textrels-on-PIC-x86.patch | 35 +---
.../rng-tools/rng-tools/underquote.patch | 27 --
.../rng-tools/{rng-tools_5.bb => rng-tools_6.6.bb} | 25 --
8 files changed, 139 insertions(+), 138 deletions(-)
create mode 100644
meta/recipes-support/libjitterentropy/files/0001-fix-do_install-failure-on-oe.patch
create mode 100644
meta/recipes-support/libjitterentropy/libjitterentropy_2.1.2.bb
delete mode 100644
meta/recipes-support/rng-tools/rng-tools/read_error_msg.patch
rename meta/recipes-support/rng-tools/{rng-tools_5.bb => rng-tools_6.6.bb}
(72%)
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/6] rpcbind: 0.2.4 -> 1.2.5
- Drop backport fixes
0001-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch
pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch
rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch
Signed-off-by: Hongxu Jia
---
...r-all-svc_getargs-calls-with-svc_freeargs.patch | 221 -
...proc_dump-Fixed-typo-in-memory-leak-patch.patch | 30 ---
..._callit_com-Stop-freeing-a-static-pointer.patch | 100 --
.../rpcbind/{rpcbind_0.2.4.bb => rpcbind_1.2.5.bb} | 7 +-
4 files changed, 2 insertions(+), 356 deletions(-)
delete mode 100644
meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch
delete mode 100644
meta/recipes-extended/rpcbind/rpcbind/pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch
delete mode 100644
meta/recipes-extended/rpcbind/rpcbind/rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch
rename meta/recipes-extended/rpcbind/{rpcbind_0.2.4.bb => rpcbind_1.2.5.bb}
(85%)
diff --git
a/meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch
b/meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch
deleted file mode 100644
index bf7aaef..000
---
a/meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From 7ea36eeece56b59f98e469934e4c20b4da043346 Mon Sep 17 00:00:00 2001
-From: Doran Moppert
-Date: Thu, 11 May 2017 11:42:54 -0400
-Subject: [PATCH] rpcbind: pair all svc_getargs() calls with svc_freeargs() to
- avoid memory leak
-
-This patch is to address CVE-2017-8779 "rpcbomb" in rpcbind, discussed
-at [1], [2], [3]. The last link suggests this issue is actually a bug
-in rpcbind, which led me here.
-
-The leak caused by the reproducer at [4] appears to come from
-rpcb_service_4(), in the case where svc_getargs() returns false and the
-function had an early return, rather than passing through the cleanup
-path at done:, as would otherwise occur.
-
-It also addresses a couple of other locations where the same fault seems
-to exist, though I haven't been able to exercise those. I hope someone
-more intimate with rpc(3) can confirm my understanding is correct, and
-that I haven't introduced any new bugs.
-
-Without this patch, using the reproducer (and variants) repeatedly
-against rpcbind with a numBytes argument of 1_000_000_000, /proc/$(pidof
-rpcbind)/status reports VmSize increase of 976564 kB each call, and
-VmRSS increase of around 260 kB every 33 calls - the specific numbers
-are probably an artifact of my rhel/glibc version. With the patch,
-there is a small (~50 kB) VmSize increase with the first message, but
-thereafter both VmSize and VmRSS remain steady.
-
-[1]: http://seclists.org/oss-sec/2017/q2/209
-[2]: https://bugzilla.redhat.com/show_bug.cgi?id=1448124
-[3]: https://sourceware.org/ml/libc-alpha/2017-05/msg00129.html
-[4]: https://github.com/guidovranken/rpcbomb/
-
-
-CVE: CVE-2017-8779
-Upstream-Status: Backport
-
-Signed-off-by: Fan Xin
- src/pmap_svc.c | 56 +-
- src/rpcb_svc.c | 2 +-
- src/rpcb_svc_4.c | 2 +-
- src/rpcb_svc_com.c | 8
- 4 files changed, 57 insertions(+), 11 deletions(-)
-
-diff --git a/src/pmap_svc.c b/src/pmap_svc.c
-index 4c744fe..e926cdc 100644
a/src/pmap_svc.c
-+++ b/src/pmap_svc.c
-@@ -175,6 +175,7 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/,
SVCXPRT *xprt, unsigned long
- long ans;
- uid_t uid;
- char uidbuf[32];
-+ int rc = TRUE;
-
- /*
-* Can't use getpwnam here. We might end up calling ourselves
-@@ -194,7 +195,8 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/,
SVCXPRT *xprt, unsigned long
-
- if (!svc_getargs(xprt, (xdrproc_t) xdr_pmap, (char *))) {
- svcerr_decode(xprt);
-- return (FALSE);
-+ rc = FALSE;
-+ goto done;
- }
- #ifdef RPCBIND_DEBUG
- if (debugging)
-@@ -205,7 +207,8 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/,
SVCXPRT *xprt, unsigned long
-
- if (!check_access(xprt, op, reg.pm_prog, PMAPVERS)) {
- svcerr_weakauth(xprt);
-- return (FALSE);
-+ rc = (FALSE);
-+ goto done;
- }
-
- rpcbreg.r_prog = reg.pm_prog;
-@@ -258,7 +261,16 @@ done_change:
- rpcbs_set(RPCBVERS_2_STAT, ans);
- else
- rpcbs_unset(RPCBVERS_2_STAT, ans);
-- return (TRUE);
-+done:
-+ if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *))) {
-+ if (debugging) {
-+ /*(void) xlog(LOG_DEBUG, "unable to free
arguments\n");*/
-+ if (doabort) {
-+ rpcbind_abort();
-+ }
-+ }
-+ }
-+ return (rc);
- }
-
- /* ARGSUSED */
-@@ -272,15 +284,18 @@
[OE-core] [PATCH 5/6] gpgme: 1.11.1 -> 1.12.0
Rebase 0007-qt-python-Add-variables-to-tests.patch
Rework 0007-qt-python-Add-variables-to-tests.patch ->
0007-python-Add-variables-to-tests.patch
Drop newly added option --disable-lang-qt-test which is merged to
--disable-gpg-test by
upstream commit [26820ba qt: Respect --disable-gpg-test for tests]
Signed-off-by: Hongxu Jia
---
.../gpgme/gpgme/0001-pkgconfig.patch | 8 ++--
...python-gpg-error-config-should-not-be-use.patch | 30 +++--
.../0003-Correctly-install-python-modules.patch| 6 +--
.../gpgme/gpgme/0004-python-import.patch | 2 +-
...g-skip-all-lib-or-usr-lib-directories-in-.patch | 2 +-
.../gpgme/gpgme/0006-fix-build-path-issue.patch| 6 +--
...ch => 0007-python-Add-variables-to-tests.patch} | 52 +-
.../gpgme/{gpgme_1.11.1.bb => gpgme_1.12.0.bb} | 7 ++-
8 files changed, 43 insertions(+), 70 deletions(-)
rename
meta/recipes-support/gpgme/gpgme/{0007-qt-python-Add-variables-to-tests.patch
=> 0007-python-Add-variables-to-tests.patch} (43%)
rename meta/recipes-support/gpgme/{gpgme_1.11.1.bb => gpgme_1.12.0.bb} (93%)
diff --git a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
index ae9a46e..176723c 100644
--- a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
+++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
@@ -1,4 +1,4 @@
-From c452ba58dd2f99d6e624421697417cc018f9a67a Mon Sep 17 00:00:00 2001
+From 6492c952d61bb93a8bf8200c093d7e491456aa5a Mon Sep 17 00:00:00 2001
From: Richard Purdie
Date: Fri, 29 Jun 2018 14:35:41 +0800
Subject: [PATCH 1/7] pkgconfig
@@ -25,10 +25,10 @@ Signed-off-by: Hongxu Jia
create mode 100644 src/gpgme.pc.in
diff --git a/configure.ac b/configure.ac
-index 2a35404..7485cdf 100644
+index af569ac..865bd10 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -886,6 +886,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
+@@ -895,6 +895,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
src/versioninfo.rc
src/gpgme.h)
AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
@@ -37,7 +37,7 @@ index 2a35404..7485cdf 100644
AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in)
AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig.cmake.in)
diff --git a/src/Makefile.am b/src/Makefile.am
-index 0a196e0..cecaf8f 100644
+index 1394c02..8451c3a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,12 +19,14 @@
diff --git
a/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
index 4f5ceda..0d0d0c6 100644
---
a/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
+++
b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
@@ -1,6 +1,6 @@
-From 45d828356efc140a1492befb1e6dc59a9f4e16b5 Mon Sep 17 00:00:00 2001
+From 03819ad1270a279223219c0e70ba631bfe517714 Mon Sep 17 00:00:00 2001
From: Hongxu Jia
-Date: Wed, 31 Jan 2018 10:44:19 +0800
+Date: Wed, 17 Oct 2018 23:32:19 +0800
Subject: [PATCH 2/7] gpgme/lang/python: gpg-error-config should not be used
gpg-error-config was modified by OE to always return an error.
@@ -11,38 +11,40 @@ Upstream-Status: Inappropriate [changes are specific to OE]
Signed-off-by: Mark Hatle
-Rework to 1.10.0
+Rebase to 1.12.0
Signed-off-by: Hongxu Jia
---
- lang/python/setup.py.in | 10 +-
- 1 file changed, 1 insertion(+), 9 deletions(-)
+ lang/python/setup.py.in | 11 +--
+ 1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
-index 2595073..60b5257 100755
+index 65a4be0..11b8413 100755
--- a/lang/python/setup.py.in
+++ b/lang/python/setup.py.in
-@@ -26,7 +26,6 @@ import shutil
- import subprocess
+@@ -30,7 +30,6 @@ import subprocess
+ import sys
# Out-of-tree build of the gpg bindings.
-gpg_error_config = ["gpg-error-config"]
gpgme_config_flags = ["--thread=pthread"]
gpgme_config = ["gpgme-config"] + gpgme_config_flags
gpgme_h = ""
-@@ -157,14 +156,7 @@ class BuildExtFirstHack(build):
+@@ -181,16 +180,8 @@ class BuildExtFirstHack(build):
+ shutil.copy2(source_name, sink_name)
def _generate_errors_i(self):
-
+-
-try:
--subprocess.check_call(gpg_error_config + ['--version'],
-- stdout=devnull)
+-subprocess.check_call(
+-gpg_error_config + ['--version'], stdout=devnull)
-except:
-sys.exit("Could not find gpg-error-config. " +
- "Please install the libgpg-error development package.")
-
--gpg_error_content = self._read_header("gpg-error.h",
getconfig("cflags", config=gpg_error_config))
-+gpg_error_content = self._read_header("gpg-error.h",
os.environ.get('CFLAGS').split())
+
[OE-core] [PATCH 3/6] ncurses: upgrade 6.1 -> 6.1+20180714
Signed-off-by: Hongxu Jia
---
.../ncurses/{ncurses_6.1+20180630.bb => ncurses_6.1+20180714.bb}| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-core/ncurses/{ncurses_6.1+20180630.bb =>
ncurses_6.1+20180714.bb} (86%)
diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20180630.bb
b/meta/recipes-core/ncurses/ncurses_6.1+20180714.bb
similarity index 86%
rename from meta/recipes-core/ncurses/ncurses_6.1+20180630.bb
rename to meta/recipes-core/ncurses/ncurses_6.1+20180714.bb
index 38faf7a..b072869 100644
--- a/meta/recipes-core/ncurses/ncurses_6.1+20180630.bb
+++ b/meta/recipes-core/ncurses/ncurses_6.1+20180714.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 = "d3b29180ae4360d7ab7a41a15e963299fdb72e33"
+SRCREV = "3740e18875f16dfe126484869882fb15c3fd1aea"
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 4/6] man-db: 2.8.3 -> 2.8.4
Signed-off-by: Hongxu Jia
---
meta/recipes-extended/man-db/{man-db_2.8.3.bb => man-db_2.8.4.bb} | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
rename meta/recipes-extended/man-db/{man-db_2.8.3.bb => man-db_2.8.4.bb} (90%)
diff --git a/meta/recipes-extended/man-db/man-db_2.8.3.bb
b/meta/recipes-extended/man-db/man-db_2.8.4.bb
similarity index 90%
rename from meta/recipes-extended/man-db/man-db_2.8.3.bb
rename to meta/recipes-extended/man-db/man-db_2.8.4.bb
index cd8d27c..aa36465 100644
--- a/meta/recipes-extended/man-db/man-db_2.8.3.bb
+++ b/meta/recipes-extended/man-db/man-db_2.8.4.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM =
"file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343
SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \
file://99_mandb \
file://man_db.conf-avoid-multilib-install-file-conflict.patch"
-SRC_URI[md5sum] = "6f3055e18fdd1ce5cbbdb30403991ec7"
-SRC_URI[sha256sum] =
"5932a1ca366e1ec61a3ece1a3afa0e92f2fdc125b61d236f20cc6ff9d80cc4ac"
+SRC_URI[md5sum] = "ab41db551f500e4a595b11203b86c67a"
+SRC_URI[sha256sum] =
"103c185f9d8269b9ee3b8a4cb27912b3aa393e952731ef96fedc880723472bc3"
DEPENDS = "libpipeline gdbm groff-native base-passwd"
RDEPENDS_${PN} += "base-passwd"
@@ -19,6 +19,7 @@ USE_NLS_libc-musl = "no"
inherit gettext pkgconfig autotools
EXTRA_OECONF = "--with-pager=less"
+EXTRA_AUTORECONF += "-I ${S}/gl/m4"
do_install() {
autotools_do_install
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] gnupg: upgrade 2.2.9 -> 2.2.10
Signed-off-by: Hongxu Jia
---
...onfigure.ac-use-a-custom-value-for-the-location-of-.patch | 4 ++--
meta/recipes-support/gnupg/gnupg/relocate.patch | 12 ++--
.../gnupg/{gnupg_2.2.9.bb => gnupg_2.2.10.bb}| 4 ++--
3 files changed, 14 insertions(+), 6 deletions(-)
rename meta/recipes-support/gnupg/{gnupg_2.2.9.bb => gnupg_2.2.10.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 5f1dd30..26ac99e 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 7eb7efb9ce89c66e14c194773c4dcf6478a6ca4d Mon Sep 17 00:00:00 2001
+From e30c1d3f3bb40bfaa83f768b8651f587c9d17e6f 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 59a2e60..12d390b 100644
+index f77317f..749fcaa 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 87ec409..616f32a 100644
--- a/meta/recipes-support/gnupg/gnupg/relocate.patch
+++ b/meta/recipes-support/gnupg/gnupg/relocate.patch
@@ -1,10 +1,18 @@
-Allow the environment to override where gnupg looks for its own files. Useful
in native builds.
+From 5a8258dde5ad17b4a53463d7184cf782a7594977 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
+ own files. Useful in native builds.
Upstream-Status: Inappropriate [OE-specific]
Signed-off-by: Ross Burton
+---
+ common/homedir.c | 16
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
diff --git a/common/homedir.c b/common/homedir.c
-index e9e75d01e..19140aa0d 100644
+index e9e75d0..19140aa 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -760,7 +760,7 @@ gnupg_socketdir (void)
diff --git a/meta/recipes-support/gnupg/gnupg_2.2.9.bb
b/meta/recipes-support/gnupg/gnupg_2.2.10.bb
similarity index 92%
rename from meta/recipes-support/gnupg/gnupg_2.2.9.bb
rename to meta/recipes-support/gnupg/gnupg_2.2.10.bb
index b7d23b8..fba2fdf 100644
--- a/meta/recipes-support/gnupg/gnupg_2.2.9.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.2.10.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] = "52c895a81f514a65e08923736c38654a"
-SRC_URI[sha256sum] =
"6278eaabffa1ebc9fa2ceb3dc53eea9a1505ab02a668a86dd6fec06951af2164"
+SRC_URI[md5sum] = "3ae8bd6246367602e72571f7a6588bcd"
+SRC_URI[sha256sum] =
"799dd37a86a1448732e339bd20440f4f5ee6e69755f6fd7a73ee8af30840c915"
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 1/6] apr: upgrade 1.6.3 -> 1.6.5
Signed-off-by: Hongxu Jia
---
.../apr/0008-apr-fix-ptest-hang-in-teststr.patch | 32 --
.../apr/{apr_1.6.3.bb => apr_1.6.5.bb} | 7 ++---
2 files changed, 3 insertions(+), 36 deletions(-)
delete mode 100644
meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch
rename meta/recipes-support/apr/{apr_1.6.3.bb => apr_1.6.5.bb} (95%)
diff --git
a/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch
b/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch
deleted file mode 100644
index 6809fa6..000
--- a/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 036f90748247417dbfa714b1b912ca7dd4053f04 Mon Sep 17 00:00:00 2001
-From: Changqing Li
-Date: Mon, 23 Jul 2018 14:12:35 +0800
-Subject: [PATCH] apr: fix ptest hang in teststr
-
-ptest hang in teststr since turns into a non-terminating loop,
-fix by below backported patch.
-
-Upstream-Status: Backport[https://github.com/apache/apr/commit/
- 2e8fbff4ecf82d0decf6baf774c209948f2f4998?diff=unified]
-
-Signed-off-by: Changqing Li
- test/teststr.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/teststr.c b/test/teststr.c
-index d9a5054..951a830 100644
a/test/teststr.c
-+++ b/test/teststr.c
-@@ -307,7 +307,7 @@ static void overflow_strfsize(abts_case *tc, void *data)
- for (; off < 9; off += 999) {
- apr_strfsize(off, buf);
- }
--for (off = 1; off < LONG_MAX && off > 0; off *= 2) {
-+for (off = LONG_MAX; off > 1; off /= 2) {
- apr_strfsize(off, buf);
- apr_strfsize(off + 1, buf);
- apr_strfsize(off - 1, buf);
---
-2.7.4
-
diff --git a/meta/recipes-support/apr/apr_1.6.3.bb
b/meta/recipes-support/apr/apr_1.6.5.bb
similarity index 95%
rename from meta/recipes-support/apr/apr_1.6.3.bb
rename to meta/recipes-support/apr/apr_1.6.5.bb
index 7bfb698..c2f5900 100644
--- a/meta/recipes-support/apr/apr_1.6.3.bb
+++ b/meta/recipes-support/apr/apr_1.6.5.bb
@@ -18,11 +18,10 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \
file://0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \
file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \
- file://0008-apr-fix-ptest-hang-in-teststr.patch \
-"
+ "
-SRC_URI[md5sum] = "12f2a349483ad6f12db49ba01fbfdbfa"
-SRC_URI[sha256sum] =
"131f06d16d7aabd097fa992a33eec2b6af3962f93e6d570a9bd4d85e95993172"
+SRC_URI[md5sum] = "ad4add8efdfe87330b88e5e788241775"
+SRC_URI[sha256sum] =
"a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105"
inherit autotools-brokensep lib_package binconfig multilib_header ptest
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6] upgrade 6 recipes
The following changes since commit bb06900a1f29fdd4066f6d7e7a961d230c2e9438:
perf: Disable libunwind for ARC & RISCV64 (2018-11-06 12:15:59 +)
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 (6):
apr: upgrade 1.6.3 -> 1.6.5
gnupg: upgrade 2.2.9 -> 2.2.10
ncurses: upgrade 6.1 -> 6.1+20180714
man-db: 2.8.3 -> 2.8.4
gpgme: 1.11.1 -> 1.12.0
rpcbind: 0.2.4 -> 1.2.5
...ses_6.1+20180630.bb => ncurses_6.1+20180714.bb} | 2 +-
.../man-db/{man-db_2.8.3.bb => man-db_2.8.4.bb}| 5 +-
...r-all-svc_getargs-calls-with-svc_freeargs.patch | 221 -
...proc_dump-Fixed-typo-in-memory-leak-patch.patch | 30 ---
..._callit_com-Stop-freeing-a-static-pointer.patch | 100 --
.../rpcbind/{rpcbind_0.2.4.bb => rpcbind_1.2.5.bb} | 7 +-
.../apr/0008-apr-fix-ptest-hang-in-teststr.patch | 32 ---
.../apr/{apr_1.6.3.bb => apr_1.6.5.bb} | 7 +-
...c-use-a-custom-value-for-the-location-of-.patch | 4 +-
meta/recipes-support/gnupg/gnupg/relocate.patch| 12 +-
.../gnupg/{gnupg_2.2.9.bb => gnupg_2.2.10.bb} | 4 +-
.../gpgme/gpgme/0001-pkgconfig.patch | 8 +-
...python-gpg-error-config-should-not-be-use.patch | 30 +--
.../0003-Correctly-install-python-modules.patch| 6 +-
.../gpgme/gpgme/0004-python-import.patch | 2 +-
...g-skip-all-lib-or-usr-lib-directories-in-.patch | 2 +-
.../gpgme/gpgme/0006-fix-build-path-issue.patch| 6 +-
...ch => 0007-python-Add-variables-to-tests.patch} | 52 ++---
.../gpgme/{gpgme_1.11.1.bb => gpgme_1.12.0.bb} | 7 +-
19 files changed, 66 insertions(+), 471 deletions(-)
rename meta/recipes-core/ncurses/{ncurses_6.1+20180630.bb =>
ncurses_6.1+20180714.bb} (86%)
rename meta/recipes-extended/man-db/{man-db_2.8.3.bb => man-db_2.8.4.bb} (90%)
delete mode 100644
meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch
delete mode 100644
meta/recipes-extended/rpcbind/rpcbind/pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch
delete mode 100644
meta/recipes-extended/rpcbind/rpcbind/rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch
rename meta/recipes-extended/rpcbind/{rpcbind_0.2.4.bb => rpcbind_1.2.5.bb}
(85%)
delete mode 100644
meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch
rename meta/recipes-support/apr/{apr_1.6.3.bb => apr_1.6.5.bb} (95%)
rename meta/recipes-support/gnupg/{gnupg_2.2.9.bb => gnupg_2.2.10.bb} (92%)
rename
meta/recipes-support/gpgme/gpgme/{0007-qt-python-Add-variables-to-tests.patch
=> 0007-python-Add-variables-to-tests.patch} (43%)
rename meta/recipes-support/gpgme/{gpgme_1.11.1.bb => gpgme_1.12.0.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] rng-tools: Fix crazy defaults
Since commit [f1dc9ac rng-tools: Fix crazy defaults] fixed init based on sysvinit, this fix rngd.service based on systemd. Signed-off-by: Hongxu Jia --- meta/recipes-support/rng-tools/rng-tools/rngd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/rng-tools/rng-tools/rngd.service b/meta/recipes-support/rng-tools/rng-tools/rngd.service index cb81024..f0355db 100644 --- a/meta/recipes-support/rng-tools/rng-tools/rngd.service +++ b/meta/recipes-support/rng-tools/rng-tools/rngd.service @@ -5,7 +5,7 @@ After=systemd-udev-settle.service Before=sysinit.target [Service] -ExecStart=@SBINDIR@/rngd -f -r /dev/urandom +ExecStart=@SBINDIR@/rngd -f -r /dev/hwrng SuccessExitStatus=66 [Install] -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] testsdk: fix skipped testcase output "UNKNOWN" status while multiprocess execution
Usually skipped testcase output "SKIPPED"
[snip serial execution]
|RESULTS - buildgalculator.GalculatorTest.test_galculator - Testcase -1:
SKIPPED (0.01s)
|RESULTS - python.PythonTest.test_python3 - Testcase -1: SKIPPED (0.01s)
[snip serial execution]
But if enable multiprocess execution, skipped testcase output "UNKNOWN" status
[snip enable multiprocess execution]
|RESULTS - buildgalculator.GalculatorTest.test_galculator - Testcase -1: UNKNOWN
|RESULTS - python.PythonTest.test_python3 - Testcase -1: UNKNOWN
[snip enable multiprocess execution]
Here is my investigation:
There is a class pairs TestProtocolClient and TestProtocolServer
provided by python3-subunit. The TestProtocolClient generates a
subunit stream of TestResult from a test run, and TestProtocolServer
parses the stream of subunit TestResult.
The class ProtocolTestCase is a unittest.TestCase adapter and it
uses TestProtocolServer to parse the stream of subunit TestResult.
In Yocto testsdk, it forks multiple processes to execute testcases
and use TestProtocolClient to generate TestResult stream; and then
it creates multiple threads to use ProtocolTestCase to parse stream
of subunit TestResult through pipe; finally it passes multiple
ProtocolTestCase as TestCase instance to main process and output
status result.
The problem point is TestProtocolServer parses `skip:' directive
after reading a `test:' directive. Without `test:' directive,
`skip:' directive will be ignored. All above requires SkipTest should
be raised inside a test method rather than setUpClass method.
Throwing SkipTest inside setUp works correctly
Signed-off-by: Hongxu Jia
---
meta/lib/oeqa/sdk/cases/assimp.py | 3 +--
meta/lib/oeqa/sdk/cases/buildcpio.py | 1 +
meta/lib/oeqa/sdk/cases/buildgalculator.py | 3 +--
meta/lib/oeqa/sdk/cases/buildlzip.py | 1 +
meta/lib/oeqa/sdk/cases/perl.py| 3 +--
meta/lib/oeqa/sdk/cases/python.py | 3 +--
6 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/meta/lib/oeqa/sdk/cases/assimp.py
b/meta/lib/oeqa/sdk/cases/assimp.py
index 26c1df0..f5c7547 100644
--- a/meta/lib/oeqa/sdk/cases/assimp.py
+++ b/meta/lib/oeqa/sdk/cases/assimp.py
@@ -12,8 +12,7 @@ class BuildAssimp(OESDKTestCase):
td_vars = ['DATETIME', 'TARGET_OS', 'TARGET_ARCH']
-@classmethod
-def setUpClass(self):
+def setUp(self):
if not (self.tc.hasHostPackage("nativesdk-cmake") or
self.tc.hasHostPackage("cmake-native")):
raise unittest.SkipTest("Needs cmake")
diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py
b/meta/lib/oeqa/sdk/cases/buildcpio.py
index 333dc7c..f348ac5 100644
--- a/meta/lib/oeqa/sdk/cases/buildcpio.py
+++ b/meta/lib/oeqa/sdk/cases/buildcpio.py
@@ -14,6 +14,7 @@ class BuildCpioTest(OESDKTestCase):
self.tc.sdk_dir, self.td['DATETIME'], dl_dir=dl_dir)
self.project.download_archive()
+def setUp(self):
machine = self.td.get("MACHINE")
if not self.tc.hasHostPackage("packagegroup-cross-canadian-%s" %
machine):
raise unittest.SkipTest("SDK doesn't contain a cross-canadian
toolchain")
diff --git a/meta/lib/oeqa/sdk/cases/buildgalculator.py
b/meta/lib/oeqa/sdk/cases/buildgalculator.py
index 050d1b3..9e12b3a 100644
--- a/meta/lib/oeqa/sdk/cases/buildgalculator.py
+++ b/meta/lib/oeqa/sdk/cases/buildgalculator.py
@@ -6,8 +6,7 @@ from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject
class GalculatorTest(OESDKTestCase):
td_vars = ['DATETIME']
-@classmethod
-def setUpClass(self):
+def setUp(self):
if not (self.tc.hasTargetPackage("gtk+3", multilib=True) or \
self.tc.hasTargetPackage("libgtk-3.0", multilib=True)):
raise unittest.SkipTest("GalculatorTest class: SDK don't support
gtk+3")
diff --git a/meta/lib/oeqa/sdk/cases/buildlzip.py
b/meta/lib/oeqa/sdk/cases/buildlzip.py
index b28cc3a..9d137f3 100644
--- a/meta/lib/oeqa/sdk/cases/buildlzip.py
+++ b/meta/lib/oeqa/sdk/cases/buildlzip.py
@@ -15,6 +15,7 @@ class BuildLzipTest(OESDKTestCase):
self.tc.sdk_dir, self.td['DATETIME'], dl_dir=dl_dir)
self.project.download_archive()
+def setUp(self):
machine = self.td.get("MACHINE")
if not (self.tc.hasHostPackage("packagegroup-cross-canadian-%s" %
machine) or
diff --git a/meta/lib/oeqa/sdk/cases/perl.py b/meta/lib/oeqa/sdk/cases/perl.py
index ff50b46..e1d2bc1 100644
--- a/meta/lib/oeqa/sdk/cases/perl.py
+++ b/meta/lib/oeqa/sdk/cases/perl.py
@@ -2,8 +2,7 @@ import unittest
from oeqa.sdk.case import OESDKTestCase
class PerlTest(OESDKTestCase):
-@classmethod
-def setUpClass(self):
+def setUp(self):
if not (self.tc.hasHostPackage("nativesdk-perl") or
self.tc.hasHostPackage("perl-native")):
raise unittest.SkipTest("No perl package in the SDK")
diff --git a/meta/lib/oeqa/sdk/cases/python.py
b/meta/lib/oeqa/sdk/cases/python.py
