[OE-core] [PATCH] meson: update patch status
Signed-off-by: Ross Burton --- ...1-environment.py-detect-windows-also-if-the-system-str.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch b/meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch index 37b5356d77a..2faeda2e711 100644 --- a/meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch +++ b/meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch @@ -4,7 +4,7 @@ Date: Mon, 25 Mar 2019 17:17:06 +0100 Subject: [PATCH] environment.py: detect windows also if the system string contains 'mingw' -Upstream-Status: Pending +Upstream-Status: Backport [fe645a0a9e2da230d2c500af1f5b2db5da1e364d] Signed-off-by: Alexander Kanavin --- -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] meson: fix RDEPENDS
Meson needs python3-pkg-resources to work to add to RDEPENDS. Remove python3-core as this is automatically pulled in by python3-modules. Signed-off-by: Ross Burton --- meta/recipes-devtools/meson/meson.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index 6de109de7fd..c775489d5f6 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -29,6 +29,6 @@ UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"; inherit setuptools3 -RDEPENDS_${PN} = "ninja python3-core python3-modules" +RDEPENDS_${PN} = "ninja python3-modules python3-pkg-resources" FILES_${PN} += "${datadir}/polkit-1" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] insane: add check for perllocal.pod
perlocal.pod is an index file of locally installed modules and so shouldn't be installed by any distribution packages. cpan.bbclass already sets NO_PERLOCAL to stop this file being generated by most Perl recipes, but if a recipe is using MakeMaker directly (such as rrdtool) then they might not be doing this correctly. To avoid multiple packages shipping this file and then failing to install together, add a QA test to check if this file exists and by default emit an error if it does. [ YOCTO #13491 ] Signed-off-by: Ross Burton --- meta/classes/insane.bbclass | 19 ++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 9b886d13805..9605ac2baee 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -34,7 +34,7 @@ ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \ split-strip packages-list pkgv-undefined var-undefined \ version-going-backwards expanded-d invalid-chars \ license-checksum dev-elf file-rdeps configure-unsafe \ -configure-gettext \ +configure-gettext perllocalpod \ " # Add usrmerge QA check based on distro feature ERROR_QA_append = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', ' usrmerge', '', d)}" @@ -795,6 +795,23 @@ def package_qa_check_usrmerge(pkg, d, messages): return False return True +QAPKGTEST[perllocalpod] = "package_qa_check_perllocalpod" +def package_qa_check_perllocalpod(pkg, d, messages): +""" +Check that the recipe didn't ship a perlocal.pod file, which shouldn't be +installed in a distribution package. cpan.bbclass sets NO_PERLLOCAL=1 to +handle this for most recipes. +""" +import glob +pkgd = oe.path.join(d.getVar('PKGDEST'), pkg) +podpath = oe.path.join(pkgd, d.getVar("libdir"), "perl*", "*", "*", "perllocal.pod") + +matches = glob.glob(podpath) +if matches: +matches = [package_qa_clean_path(path, d, pkg) for path in matches] +msg = "%s contains perllocal.pod (%s), should not be installed" % (pkg, " ".join(matches)) +package_qa_add_message(messages, "perllocalpod", msg) + QAPKGTEST[expanded-d] = "package_qa_check_expanded_d" def package_qa_check_expanded_d(package, d, messages): """ -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] oe.svg: Copy artwork from openembedded-classic.
Signed-off-by: Philip Balister --- contrib/artwork/oe.svg | 80 ++ 1 file changed, 80 insertions(+) create mode 100644 contrib/artwork/oe.svg diff --git a/contrib/artwork/oe.svg b/contrib/artwork/oe.svg new file mode 100644 index 00..4af9587094 --- /dev/null +++ b/contrib/artwork/oe.svg @@ -0,0 +1,80 @@ + + +http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" +width="209.104px" height="167.858px" viewBox="0 0 209.104 167.858" enable-background="new 0 0 209.104 167.858" +xml:space="preserve"> + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lib/oe/terminal.py: fix gnome-terminal start behavior
[Bugzilla Bug 13201] -- https://bugzilla.yoctoproject.org/show_bug.cgi?id=13201 Newer versions of gnome-terminal (3.32.0 and up) are not starting as expected for commands e.g. "bitbake -c devshell zlib". This manifests as the instance appearing as a new tab rather than a new window. Fix this (and maintain new window preferred behavior) by changing the "-x" option to "--" as per the warning message, avoiding deprecated options: # Option “--command” is deprecated and might be removed in a later version of gnome-terminal. # Use “-- ” to terminate the options and put the command line to execute after it. Signed-off-by: Trevor Gamblin --- meta/lib/oe/terminal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py index 9bda3efdc7..a1daa2bed6 100644 --- a/meta/lib/oe/terminal.py +++ b/meta/lib/oe/terminal.py @@ -55,7 +55,7 @@ class XTerminal(Terminal): raise UnsupportedTerminal(self.name) class Gnome(XTerminal): -command = 'gnome-terminal -t "{title}" -x {command}' +command = 'gnome-terminal -t "{title}" -- {command}' priority = 2 def __init__(self, sh_cmd, title=None, env=None, d=None): -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for libsolv: Security fix for CVEs: (rev2)
== Series Details == Series: libsolv: Security fix for CVEs: (rev2) Revision: 2 URL : https://patchwork.openembedded.org/series/20084/ 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: * Patch[thud, v2] libsolv: Security fix for CVEs: Issue Missing or incorrectly formatted CVE tag in included patch file [test_cve_tag_format] Suggested fixCorrect or include the CVE tag on cve patch with format: "CVE: CVE--" * Issue A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence] Suggested fixSign off the added patch file (meta/recipes-extended/libsolv/libsolv/0003-Fix-Dereference-of-null-pointer.patch) * Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format] Suggested fixAdd Upstream-Status: to the header of meta/recipes-extended/libsolv/libsolv/0003-Fix-Dereference-of-null-pointer.patch Standard format Upstream-Status: Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where] 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] [thud][PATCH v2] libsolv: Security fix for CVEs:
Signed-off-by: Muminul Islam --- ...0003-Fix-Dereference-of-null-pointer.patch | 26 +++ .../0004-Fix-Add-va_end-before-return.patch | 28 .../libsolv/0005-Fix-Memory-leaks.patch | 151 ++ .../libsolv/0006-Fix-testsolv-segfault.patch | 33 .../libsolv/0007-Fix-testsolv-segfaults.patch | 39 + ...008-Fix-Be-sure-that-NONBLOCK-is-set.patch | 30 ...Don-t-set-values-that-are-never-read.patch | 107 + .../libsolv/libsolv_%.bbappend| 9 ++ 8 files changed, 423 insertions(+) create mode 100644 meta/recipes-extended/libsolv/libsolv/0003-Fix-Dereference-of-null-pointer.patch create mode 100644 meta/recipes-extended/libsolv/libsolv/0004-Fix-Add-va_end-before-return.patch create mode 100644 meta/recipes-extended/libsolv/libsolv/0005-Fix-Memory-leaks.patch create mode 100644 meta/recipes-extended/libsolv/libsolv/0006-Fix-testsolv-segfault.patch create mode 100644 meta/recipes-extended/libsolv/libsolv/0007-Fix-testsolv-segfaults.patch create mode 100644 meta/recipes-extended/libsolv/libsolv/0008-Fix-Be-sure-that-NONBLOCK-is-set.patch create mode 100644 meta/recipes-extended/libsolv/libsolv/0009-Don-t-set-values-that-are-never-read.patch create mode 100644 meta/recipes-extended/libsolv/libsolv_%.bbappend diff --git a/meta/recipes-extended/libsolv/libsolv/0003-Fix-Dereference-of-null-pointer.patch b/meta/recipes-extended/libsolv/libsolv/0003-Fix-Dereference-of-null-pointer.patch new file mode 100644 index 00..34f9518648 --- /dev/null +++ b/meta/recipes-extended/libsolv/libsolv/0003-Fix-Dereference-of-null-pointer.patch @@ -0,0 +1,26 @@ +From c5883b20b7b021ee94111cb72777ab3ba3f50950 Mon Sep 17 00:00:00 2001 +From: Jaroslav Rohel +Date: Fri, 7 Dec 2018 07:05:10 +0100 +Subject: [PATCH] Fix: Dereference of null pointer +Reply-To: muis...@microsoft.com + +--- + ext/repo_repomdxml.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/repo_repomdxml.c b/ext/repo_repomdxml.c +index fd46272b..46d83615 100644 +--- a/ext/repo_repomdxml.c b/ext/repo_repomdxml.c +@@ -181,7 +181,7 @@ startElement(struct solv_xmlparser *xmlp, int state, const char *name, const cha + while (value) + { + char *p = strchr(value, ','); +- if (*p) ++ if (p) + *p++ = 0; + if (*value) + repodata_add_poolstr_array(pd->data, SOLVID_META, REPOSITORY_UPDATES, value); +-- +2.23.0 + diff --git a/meta/recipes-extended/libsolv/libsolv/0004-Fix-Add-va_end-before-return.patch b/meta/recipes-extended/libsolv/libsolv/0004-Fix-Add-va_end-before-return.patch new file mode 100644 index 00..08597db384 --- /dev/null +++ b/meta/recipes-extended/libsolv/libsolv/0004-Fix-Add-va_end-before-return.patch @@ -0,0 +1,28 @@ +From 8e1dba061d7962441f7e06b9a94d0ff24b158c6a Mon Sep 17 00:00:00 2001 +From: Jaroslav Rohel +Date: Tue, 11 Dec 2018 09:50:06 +0100 +Subject: [PATCH] Fix: Add va_end() before return +Reply-To: muis...@microsoft.com + +The va_end() performs cleanup. +If va_end() is not called before a function that calls va_start() returns, +the behavior is undefined. +--- + src/pool.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/pool.c b/src/pool.c +index 383edb2a..be6a4193 100644 +--- a/src/pool.c b/src/pool.c +@@ -1536,6 +1536,7 @@ pool_debug(Pool *pool, int type, const char *format, ...) + vprintf(format, args); + else + vfprintf(stderr, format, args); ++ va_end(args); + return; + } + vsnprintf(buf, sizeof(buf), format, args); +-- +2.23.0 + diff --git a/meta/recipes-extended/libsolv/libsolv/0005-Fix-Memory-leaks.patch b/meta/recipes-extended/libsolv/libsolv/0005-Fix-Memory-leaks.patch new file mode 100644 index 00..933fd6d37a --- /dev/null +++ b/meta/recipes-extended/libsolv/libsolv/0005-Fix-Memory-leaks.patch @@ -0,0 +1,151 @@ +From 98a75959e13699e2ef35b0b011a88a6d224f227e Mon Sep 17 00:00:00 2001 +From: Jaroslav Rohel +Date: Tue, 11 Dec 2018 10:14:04 +0100 +Subject: [PATCH] Fix: Memory leaks +Reply-To: muis...@microsoft.com + +--- + ext/repo_rpmdb.c | 16 + ext/testcase.c| 4 + tools/repo2solv.c | 1 + + 3 files changed, 21 insertions(+) + +diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c +index 9acb4006..0d648208 100644 +--- a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c +@@ -1896,6 +1896,8 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags) + if (fread(lead, 96 + 16, 1, fp) != 1 || getu32(lead) != 0xedabeedb) + { + pool_error(pool, -1, "%s: not a rpm", rpm); ++ solv_chksum_free(leadsigchksumh, NULL); ++ solv_chksum_free(chksumh, NULL); + fclose(fp); + return 0; + } +@@ -1908,12 +1910,16 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags) + if (lead[78] != 0 || lead[79] != 5) + { + pool_error(pool, -1, "%s: not a rpm v5 header", rpm); ++ solv_chksum_free(leadsigchk
[OE-core] ✗ patchtest: failure for ofono: convert recipe to use git
== Series Details == Series: ofono: convert recipe to use git Revision: 1 URL : https://patchwork.openembedded.org/series/20284/ 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 520c6f30cd) 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] [meta][PATCH] ofono: convert recipe to use git
From: Nicola Lunghi ofono has a git repository available. Use that instead of the KERNELORG_MIRROR Signed-off-by: Nicola Lunghi --- meta/recipes-connectivity/ofono/ofono.inc | 4 +++- meta/recipes-connectivity/ofono/ofono_1.30.bb | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc index bbf31c3a9d..63f97a97d7 100644 --- a/meta/recipes-connectivity/ofono/ofono.inc +++ b/meta/recipes-connectivity/ofono/ofono.inc @@ -7,10 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ell" SRC_URI = "\ -${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ +git://git.kernel.org/pub/scm/network/ofono/ofono.git \ file://ofono \ " +S = "${WORKDIR}/git" + inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data INITSCRIPT_NAME = "ofono" diff --git a/meta/recipes-connectivity/ofono/ofono_1.30.bb b/meta/recipes-connectivity/ofono/ofono_1.30.bb index 71c33e1287..37cc0c79d0 100644 --- a/meta/recipes-connectivity/ofono/ofono_1.30.bb +++ b/meta/recipes-connectivity/ofono/ofono_1.30.bb @@ -3,5 +3,4 @@ require ofono.inc SRC_URI_append = " \ file://0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch \ " -SRC_URI[md5sum] = "2b1ce11a4db1f4b5c8cd96eb7e96ba0c" -SRC_URI[sha256sum] = "8079735efc5d7f33be9e792e791f2f7ff75c31ce67d477b994673e32319eec5c" +SRCREV = "c1de25bcb4541ee4c69cbd31baea681025df43ed" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] ethtool, libcap: fix upstream version check
On Wed, Oct 02, 2019 at 11:20:01PM +0300, Adrian Bunk wrote: >... > I sent an email to Fastly support, let's see if they will answer. This is something that has to be fixed at the kernel.org side (see [1]), my ticket for that is Linux Foundation RT #80134. cu Adrian [1] https://www.fastly.com/blog/best-practices-using-vary-header -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta][PATCH] ofono: run oe-stylize over recipe
From: Nicola Lunghi Variable ordering changed slightly and add the SRC_URI to the inc file Signed-off-by: Nicola Lunghi --- meta/recipes-connectivity/ofono/ofono.inc | 32 +++ meta/recipes-connectivity/ofono/ofono_1.30.bb | 6 ++-- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc index bdbb0b5bc6..bbf31c3a9d 100644 --- a/meta/recipes-connectivity/ofono/ofono.inc +++ b/meta/recipes-connectivity/ofono/ofono.inc @@ -1,28 +1,31 @@ -HOMEPAGE = "http://www.ofono.org"; -SUMMARY = "open source telephony" +SUMMARY = "open source telephony" DESCRIPTION = "oFono is a stack for mobile telephony devices on Linux. oFono supports speaking to telephony devices through specific drivers, or with generic AT commands." -LICENSE = "GPLv2" +HOMEPAGE = "http://www.ofono.org"; +LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://src/ofono.h;beginline=1;endline=20;md5=3ce17d5978ef3445def265b98899c2ee" +DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ell" -inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data +SRC_URI = "\ +${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ +file://ofono \ +" -DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ell" +inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data INITSCRIPT_NAME = "ofono" INITSCRIPT_PARAMS = "defaults 22" +SYSTEMD_SERVICE_${PN} = "ofono.service" PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ -" +" PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5" EXTRA_OECONF += "--enable-test --enable-external-ell" -SYSTEMD_SERVICE_${PN} = "ofono.service" - do_install_append() { install -d ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono @@ -30,10 +33,13 @@ do_install_append() { PACKAGES =+ "${PN}-tests" -RDEPENDS_${PN} += "dbus" -RRECOMMENDS_${PN} += "kernel-module-tun mobile-broadband-provider-info" - FILES_${PN} += "${systemd_unitdir}" FILES_${PN}-tests = "${libdir}/${BPN}/test" -RDEPENDS_${PN}-tests = "python3-core python3-dbus" -RDEPENDS_${PN}-tests += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'python3-pygobject', '', d)}" + +RDEPENDS_${PN} += "dbus" +RDEPENDS_${PN}-tests = "\ +python3-core \ +python3-dbus \ +${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'python3-pygobject', '', d)} \ +" +RRECOMMENDS_${PN} += "kernel-module-tun mobile-broadband-provider-info" diff --git a/meta/recipes-connectivity/ofono/ofono_1.30.bb b/meta/recipes-connectivity/ofono/ofono_1.30.bb index c916cb1b22..71c33e1287 100644 --- a/meta/recipes-connectivity/ofono/ofono_1.30.bb +++ b/meta/recipes-connectivity/ofono/ofono_1.30.bb @@ -1,9 +1,7 @@ require ofono.inc -SRC_URI = "\ - ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ - file://ofono \ - file://0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch \ +SRC_URI_append = " \ +file://0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch \ " SRC_URI[md5sum] = "2b1ce11a4db1f4b5c8cd96eb7e96ba0c" SRC_URI[sha256sum] = "8079735efc5d7f33be9e792e791f2f7ff75c31ce67d477b994673e32319eec5c" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Fix #13560 - Partition numbering is broken for MBR primary partition #4
Thanks a lot! I'll try to make git send-email work next time, this one suffered due to manual copying :( On Thu, Oct 3, 2019 at 6:59 PM Richard Purdie wrote: > > On Thu, 2019-10-03 at 18:36 +0300, Michael Cooper wrote: > > Bug: When wks describes extra partitions that aren't in the partition > > table (e.g. boot loader) and exactly four primary MBR partitions, the > > last partition gets added to fstab as partition #5 instead of #4. > > > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13560 > > > > Signed-off-by: Michael Cooper > > --- > > scripts/lib/wic/plugins/imager/direct.py | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > Thanks, I've queued this. > > For reference, your patch arrived line wrapped. It was simple enough I > could edit that out by hand (been doing this too long, clearly!). > > I also tweaked the shortlog to match our guidelines and tweaked the bug > number reference to the standard [YOCTO #13560]. I just mention these > so you can sort next time, thanks for the patch! > > Cheers, > > Richard > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for Fix #13560 - Partition numbering is broken for MBR primary partition #4
== Series Details == Series: Fix #13560 - Partition numbering is broken for MBR primary partition #4 Revision: 1 URL : https://patchwork.openembedded.org/series/20282/ 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 cannot be parsed correctly due to malformed diff lines [test_mbox_format] Suggested fixCreate the series again using git-format-patch and ensure it can be applied using git am Diff line@@ -325,7 +326,7 @@ class PartitionedImage(): * 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 520c6f30cd) * PatchFix #13560 - Partition numbering is broken for MBR primary partition #4 Issue Shortlog does not follow expected format [test_shortlog_format] Suggested fixCommit shortlog (first line of commit message) should follow the format ": " 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] Fix #13560 - Partition numbering is broken for MBR primary partition #4
On Thu, 2019-10-03 at 18:36 +0300, Michael Cooper wrote: > Bug: When wks describes extra partitions that aren't in the partition > table (e.g. boot loader) and exactly four primary MBR partitions, the > last partition gets added to fstab as partition #5 instead of #4. > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13560 > > Signed-off-by: Michael Cooper > --- > scripts/lib/wic/plugins/imager/direct.py | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Thanks, I've queued this. For reference, your patch arrived line wrapped. It was simple enough I could edit that out by hand (been doing this too long, clearly!). I also tweaked the shortlog to match our guidelines and tweaked the bug number reference to the standard [YOCTO #13560]. I just mention these so you can sort next time, thanks for the patch! Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Fix #13560 - Partition numbering is broken for MBR primary partition #4
Bug: When wks describes extra partitions that aren't in the partition table (e.g. boot loader) and exactly four primary MBR partitions, the last partition gets added to fstab as partition #5 instead of #4. https://bugzilla.yoctoproject.org/show_bug.cgi?id=13560 Signed-off-by: Michael Cooper --- scripts/lib/wic/plugins/imager/direct.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index 3ce6ad55b8..2441cc33ad 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -316,6 +316,7 @@ class PartitionedImage(): # Size of a sector used in calculations self.sector_size = SECTOR_SIZE self.native_sysroot = native_sysroot +num_real_partitions = len([p for p in self.partitions if not p.no_table]) # calculate the real partition number, accounting for partitions not # in the partition table and logical partitions @@ -325,7 +326,7 @@ class PartitionedImage(): part.realnum = 0 else: realnum += 1 -if self.ptable_format == 'msdos' and realnum > 3 and len(partitions) > 4: +if self.ptable_format == 'msdos' and realnum > 3 and num_real_partitions > 4: part.realnum = realnum + 1 continue part.realnum = realnum -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [master][PATCH] gen-lockedsig-cache: Replace glob lookup with hash to filename lookup
On Wed, 2019-10-02 at 16:25 +0100, richard.pur...@linuxfoundation.org wrote: > I've queued such a patch in master-next and am testing, its an > improvement but I'm worried its not resolving the problem. > > Options are to prune the sstate cache, or to teach the code to > generate > the full filenames (would mean refactoring)... > > We could give you access to the autobuilder to help reproduce the > problem but I think its clear where the delays are... We've cleaned out the sstate on the autobuilder to try and reduce the impact of this issue as this patch, whilst helping, didn't solve the problem. I'm wondering about a different approach. Just to elaborate on what teaching the code would entail, as well as using the 'hashfn' data as part of the hash validate function in from runqueue.py: sq_data['hashfn'][tid] = self.rqdata.dataCaches[mc].hashfn[taskfn] we could inject that data into BB_TASKDEPDATA. If we did that, the oecore code could probably create the full sstate tasknames for the tasks it needs using logic extracted out of sstate_checkhashes() from sstate.bbclass. This would mean the script wouldn't have to guess at filenames, it could access them directly. Worth some further thought... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/6] YOCTO #12937 - Consistent naming scheme for deployed artifacts
On Thu, 2019-10-03 at 10:27 +0200, Martin Jansa wrote: > Any feedback on this or does it have to wait for 3.1? This is the kind of change we need to make early in the release since it means the release scripts, release engineering and potentially QA all need to update. It was late enough in M3 and we had enough other issues that I didn't really want to go here then. Please do remind me early in 3.1 to get this sorted. > At least the last patch is a fix for regression already included in > 3.0. Thanks, it applied with offset fuzz so I'll queue it. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/6] YOCTO #12937 - Consistent naming scheme for deployed artifacts
Any feedback on this or does it have to wait for 3.1? At least the last patch is a fix for regression already included in 3.0. On Fri, Aug 23, 2019 at 8:01 AM Martin Jansa wrote: > Let me explain a bit what these changes do for us in LGE. > > We have jenkins jobs for CI as well for official releases. > > All built artifacts are moved from jenkins builder to fileserver after > the build. > > Each jobs have some identifier which is then included in the filenames > of all relevant build artifacts, e.g. CI jobs will add e.g. lgsvl-verf-12 > to show where it was created and what build created it (12 is > BUILD_NUMBER from jenkins, verf is type of build, lgsvl is location). > > To do this you can already use IMAGE_VERSION_SUFFIX variable and add > this as a suffix to current artifact names. But that has some bad > limitations. > > A) If you keep IMAGE_VERSION_SUFFIX in do_deploy signatures, then > the artifacts will be rebuilt even when the deploy sstate archive in > cache is identical except tha filename. We had this for a while, but > all CI jobs were slow, because of rebuilding kernel every single time. > > B) If you vardepexclude IMAGE_VERSION_SUFFIX from the tasks which use > it, you get faster CI builds, but with inconsistent artifact names when > kernel deploy sstate is reused, e.g. image will have lgsvl-verf-12 > but all kernel artifacts will end with lgsvl-verf-11, when the kernel > do_deploy was reused from previously built sstate-cache > > It gets even worse with B) when you have some other tooling (like > runtime testing farm) which is tasked to flash image and kernel from > lgsvl-verf-12 and it fails to find kernel image to flash, because it's > named differently. > > C) Using version-less artifacts and just storing them in different > directories might work better, but then it would make sense to include > IMAGE_VERSION_SUFFIX in DEPLOY_DIR_IMAGE and remove it from the actual > files inside (with version-less symlinks pointing to them). But this is > a bit problematic when the individual images are usually downloaded by > BFUs over http (and they end with various identically named files for > which they don't remember from where they came). > > So this was the motivation why we have this in webOS. > > The difference for you (most people shouldn't even notice): > > 1) hard links instead of symlinks in DEPLOY_DIR_IMAGE, because now the >version is in the *_LINK_* variables and you don't want symlink with >version release-1 pointing to file created with release-2 build. > > 2) do_deploy, do_rootfs can still be reused from sstate, it will restore >the version-less artifact and then just quicky add another hardlink with >new filename (do_deploy_links task). > > 3) we're using this for couple years (badly hacked into OE, because we > didn't >want to overlay all relevant .bbclasses, but still needed to inject > do_deploy_links >task dependency in multiple places) and the only issue I've noticed was > with >one our proprietary IMAGE_FSTYPE format which was appending to image > file in >DEPLOY_DIR_IMAGE if it existed before, instead of overwritting it from > scratch - >to fix that I've just changed fstype function to remove the file before > creating >it again. > > 4) Examples: >All show "ls -laih DEPLOY_DIR_IMAGE | sort" to show the symlinks and > hardlinks > >TMPDIR is removed between each example, except the e) and f), but > sstate-cache >is kept in all cases and reused where possible > >MODULE_TARBALL_DEPLOY = "1" is added to local.conf to have more than > just 1 >kernel image as artifact from kernel (e.g. rpi MACHINEs have a lot of > them with >all the dtds). > > a) Current master with default values: > > $ ls -laih qemux86-64-master-default/ | sort > 47054849 drwxr-xr-x 13 bitbake bitbake 4.0K Aug 16 16:37 .. > 50735788 -rw-r--r-- 1 bitbake bitbake 612K Aug 15 17:16 > grub-efi-bootx64.efi > 50735796 drwxr-xr-x 2 bitbake bitbake 4.0K Aug 16 14:23 . > 50741892 -rwxr-xr-x 1 bitbake bitbake 95K Aug 15 17:16 > systemd-bootx64.efi > 52067796 -rw-r--r-- 1 bitbake bitbake 7.6M Aug 16 14:22 > bzImage--5.0.19+git2+c2e34d9ab2_00638cdd8f-r0.17-qemux86-64-20190816141126.bin > 52067797 lrwxrwxrwx 1 bitbake bitbake 78 Aug 16 14:22 > bzImage-qemux86-64.bin -> > bzImage--5.0.19+git2+c2e34d9ab2_00638cdd8f-r0.17-qemux86-64-20190816141126.bin > 52067798 lrwxrwxrwx 1 bitbake bitbake 78 Aug 16 14:22 bzImage -> > bzImage--5.0.19+git2+c2e34d9ab2_00638cdd8f-r0.17-qemux86-64-20190816141126.bin > 52067799 -rw-r--r-- 1 bitbake bitbake 7.0M Aug 16 14:22 > modules--5.0.19+git2+c2e34d9ab2_00638cdd8f-r0.17-qemux86-64-20190816141126.tgz > 52068116 lrwxrwxrwx 1 bitbake bitbake 78 Aug 16 14:22 > modules-qemux86-64.tgz -> > modules--5.0.19+git2+c2e34d9ab2_00638cdd8f-r0.17-qemux86-64-20190816141126.tgz > 52068127 -rw-r--r-- 1 bitbake bitbake 1.3K Aug 16 14:23 > core-image-minimal-qemux86-64-20190816141126.qemuboot.conf > 52068128 lrwxrwxrwx 1 bitbake bi
Re: [OE-core] [PATCH] testimage.bbclass: Add kernel provider and version to testresult
On Thu, 2019-10-03 at 07:35 +0800, Yeoh Ee Peng wrote: > In running QA testing, we sometime need to select custom provider > for > virtual/kernel and version. To track the selected virtual/kernel > provider > and version used during test, we need to add these information to > testresult. > > This patch add the virtual/kernel and version into the testresult > configuration section. > > Example of virtual/kernel and version added to testresult > configuration: >- "KERNEL_PROVIDER_VERSION": "linux-intel_4.19" > > Signed-off-by: Yeoh Ee Peng > --- > meta/classes/testimage.bbclass | 20 ++-- > 1 file changed, 18 insertions(+), 2 deletions(-) My reply last time this was posted: http://lists.openembedded.org/pipermail/openembedded-core/2019-September/287138.html still applies. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core