Re: [OE-core] [PATCH] linux-yocto/4.19: update to v4.19.61
On Fri, Aug 2, 2019 at 3:58 PM Khem Raj wrote: > On Fri, Aug 2, 2019 at 5:55 AM Bruce Ashfield > wrote: > > > > > > > > On Thu, Aug 1, 2019 at 11:09 PM Khem Raj wrote: > >> > >> instead of posting whole shortlog to commit perhaps pointing to ko git > >> log is going to save us some bits in git history > >> something like > >> > >> > https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/log/?h=linux-4.19.y&qt=range&q=5dd6139a0aa2..7250956f6eaf > >> > > > > I'm going to keep the shortlog summary. > > > > It makes it both searchable, and it is in response to a request for that > info to be in the logs years ago now. It has served me well so far, so I'll > keep up the practice. The bit of text in git history isn't going to hurt > anyone. > > > Not a big deal but a nudge. > The logs have to be readable and when it starts going across page > boundary, For repo level searches probably doing it in kernel repo is > more appropriate than in OE core. Sometimes it can get to where people > stop bothering because we are adding automated > logs. Every bit we add to git metadata does increate the repo size ( > its at 207M at this time) > Nudge taken :D I've just had multiple requests to include that info, which came along the lines of "why would I upgrade" or "what does this fix" and is a particular CVE in the -stable release. Having to click a link and get a summary in any other way has shown to make it less easy to find that info. But if things do bloat out in the repo, I'll revisit. Bruce > > > Bruce > > > > > >> > >> > >> On Thu, Aug 1, 2019 at 7:33 PM wrote: > >> > > >> > From: Bruce Ashfield > >> > > >> > Integrating the korg -stable commits that comprise the following > >> > changes: > >> > > >> >7250956f6eaf Linux 4.19.61 > >> >025eb12bb4b0 dm bufio: fix deadlock with loop device > >> >404f59e265ac dt-bindings: allow up to four clocks for orion-mdio > >> >03e6a668ea1f net: mvmdio: allow up to four clocks to be specified > for orion-mdio > >> >dd87cc633ba5 blkcg: update blkcg_print_stat() to handle larger > outputs > >> >73efdc5d7d3b blk-iolatency: clear use_delay when io.latency is set > to zero > >> >1ab644bd02ab blk-throttle: fix zero wait time for iops throttled > group > >> >91da712ff592 usb: Handle USB3 remote wakeup for LPM enabled > devices correctly > >> >152ddf9f0458 Bluetooth: Add SMP workaround Microsoft Surface > Precision Mouse bug > >> >98318cd31b95 intel_th: msu: Fix single mode with disabled IOMMU > >> >d6328d7c1a71 mtd: spinand: read returns badly if the last page has > bitflips > >> >94f1db42a968 mtd: rawnand: mtk: Correct low level time calculation > of r/w cycle > >> >30c6b34759f6 eCryptfs: fix a couple type promotion bugs > >> >92e23f5fc049 mmc: sdhci-msm: fix mutex while in spinlock > >> >01982f7bcc9d powerpc/pseries: Fix oops in hotplug memory notifier > >> >e725502b8548 powerpc/powernv/npu: Fix reference leak > >> >1e3b61cbc30d powerpc/watchpoint: Restore NV GPRs while returning > from exception > >> >237ac0d73b55 powerpc/32s: fix suspend/resume when IBATs 4-7 are > used > >> >7961981718d6 parisc: Fix kernel panic due invalid values in IAOQ0 > or IAOQ1 > >> >a6a0daa775e8 parisc: Ensure userspace privilege for ptraced > processes in regset functions > >> >ef5c2e165ab0 crypto: caam - limit output IV to CBC to work around > CTR mode DMA issue > >> >376b80276d84 gpu: ipu-v3: ipu-ic: Fix saturation bit offset in > TPMEM > >> >ef30c0739439 xfs: abort unaligned nowait directio early > >> >669c867972c0 xfs: serialize unaligned dio writes against all other > dio writes > >> >d61d885b17b0 xfs: fix reporting supported extra file attributes > for statx() > >> >f614ef7a34b0 xfs: reserve blocks for ifree transaction during log > recovery > >> >424543a53ae0 xfs: don't ever put nlink > 0 inodes on the unlinked > list > >> >3a895cc066c0 xfs: rename m_inotbt_nores to m_finobt_nores > >> >2ab62234e823 xfs: don't overflow xattr listent buffer > >> >1dc8b13cc66d xfs: flush removing page cache in > xfs_reflink_remap_prep > >> >788920d12b95 xfs: fix pagecache truncation prior to reflink > >> >41f64437f030 include/asm-generic/bug.h: fix "cut here" for WARN_ON > for __WARN_TAINT architectures > >> >afa3e571cde3 coda: pass the host file in vma->vm_file on mmap > >> >2c0222b48e77 libnvdimm/pfn: fix fsdax-mode namespace info-block > zero-fields > >> >656d06dab4d6 HID: wacom: correct touch resolution x/y typo > >> >1c871b4006b2 HID: wacom: generic: Correct pad syncing > >> >46f71a15abe7 HID: wacom: generic: only switch the mode on devices > with LEDs > >> >cb4c2b94f629 IB/mlx5: Report correctly tag matching rendezvous > capability > >> >4bd953241d81 Btrfs: add missing inode version, ctime and mtime > updates when punching hole > >> >fffedf5cf67e Btrfs: fix fsync not persisting dentry deletions due > to inode evictions > >> >110850ff
Re: [OE-core] [PATCH][RFC] libx11-diet: remove
On 8/2/19 4:44 PM, Ross Burton wrote:
This doesn't appear to be used anymore, as saving a few hundred k at the expense
of only using ASCII is quite the compromise in the modern world.
Seconded!
../Randy
Signed-off-by: Ross Burton
---
meta/conf/distro/include/maintainers.inc | 1 -
.../xorg-lib/libx11-diet_1.6.8.bb | 16 -
.../xorg-lib/libx11/X18NCMSstubs.patch| 536 --
.../xorg-lib/libx11/fix-disable-xlocale.patch | 33 --
.../libx11/fix-utf8-wrong-define.patch| 31 -
5 files changed, 617 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.6.8.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch
delete mode 100644
meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch
delete mode 100644
meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index d9ef9bf1fdb..2ede6df96ff 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -405,7 +405,6 @@ RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal
"
RECIPE_MAINTAINER_pn-libvorbis = "Tanu Kaskinen "
RECIPE_MAINTAINER_pn-libwebp = "Alexander Kanavin "
RECIPE_MAINTAINER_pn-libx11 = "Armin Kuster "
-RECIPE_MAINTAINER_pn-libx11-diet = "Armin Kuster "
RECIPE_MAINTAINER_pn-libxau = "Armin Kuster "
RECIPE_MAINTAINER_pn-libxcb = "Armin Kuster "
RECIPE_MAINTAINER_pn-libxcomposite = "Armin Kuster "
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.8.bb
b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.8.bb
deleted file mode 100644
index 9c773a09dd8..000
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.8.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require libx11.inc
-
-DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \
-this version."
-
-SRC_URI += "file://X18NCMSstubs.patch \
-file://fix-disable-xlocale.patch \
-file://fix-utf8-wrong-define.patch \
- "
-
-RPROVIDES_${PN}-dev = "libx11-dev"
-RPROVIDES_${PN}-locale = "libx11-locale"
-
-EXTRA_OECONF += "--disable-xlocale"
-
-PACKAGECONFIG ??= ""
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch
b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch
deleted file mode 100644
index c1172147a6e..000
--- a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch
+++ /dev/null
@@ -1,536 +0,0 @@
-From 62005ad019d6afb81da100b3113292a16472d241 Mon Sep 17 00:00:00 2001
-From: Changqing Li
-Date: Mon, 10 Sep 2018 09:08:27 +0800
-Subject: [PATCH] Stub out x18n
-
-Update patch to version 1.6.6
-Signed-off-by: Changqing Li
-Upstream-Status: Inappropriate [configuration]
- src/Makefile.am| 5 +-
- src/X18NCMSstubs.c | 426 +
- src/imConv.c | 5 +-
- src/locking.c | 4 +
- 4 files changed, 438 insertions(+), 2 deletions(-)
- create mode 100644 src/X18NCMSstubs.c
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index f8c476d..cdbcbbd 100644
a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -336,13 +336,16 @@ if THRSTUBS
- libX11_la_SOURCES+=UIThrStubs.c
- endif
-
-+libX11_la_SOURCES+=X18NCMSstubs.c
-+
- x11datadir = @X11_DATADIR@
- x11data_DATA = XErrorDB
-
- EXTRA_DIST = \
- $(x11data_DATA) \
- os2Stubs.c \
-- UIThrStubs.c
-+ UIThrStubs.c \
-+ X18NCMSstubs.c
-
- libX11_xcb_la_SOURCES = x11_xcb.c Xxcbint.h
- libX11_xcb_la_LDFLAGS = -version-number 1:0:0 -no-undefined
-diff --git a/src/X18NCMSstubs.c b/src/X18NCMSstubs.c
-new file mode 100644
-index 000..429cb31
/dev/null
-+++ b/src/X18NCMSstubs.c
-@@ -0,0 +1,426 @@
-+ /* - Provides stubs and dummy funcs needed when Xcms and XLocale stuff
removed
-+ *
-+ * Copyright © 2003 Matthew Allum
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Matthew Allum not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Keith Packard and Compaq makes no
-+ * representations about the suitability of this software for any purpose. It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
-+ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
[OE-core] ✗ patchtest: failure for "libxx86misc: remove this now r..." and 8 more
== Series Details == Series: "libxx86misc: remove this now r..." and 8 more Revision: 1 URL : https://patchwork.openembedded.org/series/19059/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Upstream-Status is Inappropriate, but no reason was provided [test_upstream_status_presence_format] Suggested fixInclude a brief reason why fix-libtool.patch is inappropriate Current Upstream-Status: Inappropriate Standard format Upstream-Status: Inappropriate [reason] If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for libx11-diet: remove
== Series Details == Series: libx11-diet: remove Revision: 1 URL : https://patchwork.openembedded.org/series/19060/ 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 fc634c41e4) 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 5/9] libxx86dga: remove obsolete client libary
No modern drivers nor applications use DGA, so remove the client library. Signed-off-by: Ross Burton --- meta/conf/distro/include/maintainers.inc | 1 - .../xorg-lib/libxxf86dga_1.1.5.bb | 19 --- 2 files changed, 20 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.5.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 0bb4a57248f..d9ef9bf1fdb 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -442,7 +442,6 @@ RECIPE_MAINTAINER_pn-libxt = "Armin Kuster " RECIPE_MAINTAINER_pn-libxtst = "Armin Kuster " RECIPE_MAINTAINER_pn-libxv = "Armin Kuster " RECIPE_MAINTAINER_pn-libxvmc = "Armin Kuster " -RECIPE_MAINTAINER_pn-libxxf86dga = "Armin Kuster " RECIPE_MAINTAINER_pn-libxxf86vm = "Armin Kuster " RECIPE_MAINTAINER_pn-libyaml = "Alexander Kanavin " RECIPE_MAINTAINER_pn-lighttpd = "Alexander Kanavin " diff --git a/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.5.bb b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.5.bb deleted file mode 100644 index e1cb3456588..000 --- a/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.5.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-lib-common.inc - -SUMMARY = "XFree86-DGA: XFree86 Direct Graphics Access extension library" - -DESCRIPTION = "libXxf86dga provides the XFree86-DGA extension, which \ -allows direct graphics access to a framebuffer-like region, and also \ -allows relative mouse reporting, et al. It is mainly used by games and \ -emulators for games." - -LIC_FILES_CHKSUM = "file://COPYING;md5=abb99ac125f84f424a4278153988e32f" - -DEPENDS += "libxext" - -PE = "1" - -SRC_URI[md5sum] = "0ddeafc13b33086357cfa96fae41ee8e" -SRC_URI[sha256sum] = "2b98bc5f506c6140d4eddd3990842d30f5dae733b64f198a504f07461bdb7203" - -XORG_PN = "libXxf86dga" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/9] xorgproto: update to 2019.1
From: Oleksandr Kravchuk
Signed-off-by: Oleksandr Kravchuk
Signed-off-by: Ross Burton
---
.../0001-Remove-libdir-specification.patch| 468 --
...orgproto_2018.4.bb => xorgproto_2019.1.bb} | 6 +-
2 files changed, 2 insertions(+), 472 deletions(-)
delete mode 100644
meta/recipes-graphics/xorg-proto/xorgproto/0001-Remove-libdir-specification.patch
rename meta/recipes-graphics/xorg-proto/{xorgproto_2018.4.bb =>
xorgproto_2019.1.bb} (65%)
diff --git
a/meta/recipes-graphics/xorg-proto/xorgproto/0001-Remove-libdir-specification.patch
b/meta/recipes-graphics/xorg-proto/xorgproto/0001-Remove-libdir-specification.patch
deleted file mode 100644
index 48296f7844e..000
---
a/meta/recipes-graphics/xorg-proto/xorgproto/0001-Remove-libdir-specification.patch
+++ /dev/null
@@ -1,468 +0,0 @@
-Upstream-Status: Submitted
-
-https://cgit.freedesktop.org/xorg/proto/xorgproto/commit/?id=91c1c8e1490c970379efb16784003426faec806e
-
-From 6feb974e0deb3355908c30e07293d82a3f6996ed Mon Sep 17 00:00:00 2001
-From: Jeremy Puhlman
-Date: Mon, 11 Jun 2018 16:42:43 +
-Subject: [PATCH] Remove libdir specification.
-
-Currently the pc files define libdir, however they are installed into
-/usr/share, which means they should be architecture agnostic. In a
-multilib system, xorg-proto built for each multilib abi, the value of
-libdir is going to be different. These should either be installed in
-/pkgconfig or they shouldn't define libdir, espeically since
-they don't actually use the definition. This specifically causes an
-issue when trying to install both abis at the same time, since they are
-not binary identical, something like rpm will complain that they
-
- applewmproto.pc.in | 1 -
- bigreqsproto.pc.in | 1 -
- compositeproto.pc.in | 1 -
- damageproto.pc.in | 1 -
- dmxproto.pc.in | 1 -
- dri2proto.pc.in| 1 -
- dri3proto.pc.in| 1 -
- evieproto.pc.in| 1 -
- fixesproto.pc.in | 1 -
- fontcacheproto.pc.in | 1 -
- fontsproto.pc.in | 1 -
- glproto.pc.in | 1 -
- inputproto.pc.in | 1 -
- kbproto.pc.in | 1 -
- lg3dproto.pc.in| 1 -
- presentproto.pc.in | 1 -
- printproto.pc.in | 1 -
- randrproto.pc.in | 1 -
- recordproto.pc.in | 1 -
- renderproto.pc.in | 1 -
- resourceproto.pc.in| 1 -
- scrnsaverproto.pc.in | 1 -
- trapproto.pc.in| 1 -
- videoproto.pc.in | 1 -
- windowswmproto.pc.in | 1 -
- xcalibrateproto.pc.in | 1 -
- xcmiscproto.pc.in | 1 -
- xextproto.pc.in| 1 -
- xf86bigfontproto.pc.in | 1 -
- xf86dgaproto.pc.in | 1 -
- xf86driproto.pc.in | 1 -
- xf86miscproto.pc.in| 1 -
- xf86rushproto.pc.in| 1 -
- xf86vidmodeproto.pc.in | 1 -
- xineramaproto.pc.in| 1 -
- xproto.pc.in | 1 -
- xproxymngproto.pc.in | 1 -
- 37 files changed, 37 deletions(-)
-
-diff --git a/applewmproto.pc.in b/applewmproto.pc.in
-index 17841ac..3227b21 100644
a/applewmproto.pc.in
-+++ b/applewmproto.pc.in
-@@ -1,6 +1,5 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
- includedir=@includedir@
-
- Name: AppleWMProto
-diff --git a/bigreqsproto.pc.in b/bigreqsproto.pc.in
-index 94577ed..e21bb59 100644
a/bigreqsproto.pc.in
-+++ b/bigreqsproto.pc.in
-@@ -1,6 +1,5 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
- includedir=@includedir@
-
- Name: BigReqsProto
-diff --git a/compositeproto.pc.in b/compositeproto.pc.in
-index da429c7..b0dada1 100644
a/compositeproto.pc.in
-+++ b/compositeproto.pc.in
-@@ -1,6 +1,5 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
- includedir=@includedir@
-
- Name: CompositeExt
-diff --git a/damageproto.pc.in b/damageproto.pc.in
-index 6fd9ef1..bfd5244 100644
a/damageproto.pc.in
-+++ b/damageproto.pc.in
-@@ -1,6 +1,5 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
- includedir=@includedir@
-
- Name: DamageProto
-diff --git a/dmxproto.pc.in b/dmxproto.pc.in
-index e82ee7d..d140e1c 100644
a/dmxproto.pc.in
-+++ b/dmxproto.pc.in
-@@ -1,6 +1,5 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
- includedir=@includedir@
-
- Name: DMXProto
-diff --git a/dri2proto.pc.in b/dri2proto.pc.in
-index cb5b171..fa9d24d 100644
a/dri2proto.pc.in
-+++ b/dri2proto.pc.in
-@@ -1,6 +1,5 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
- includedir=@includedir@
-
- Name: DRI2Proto
-diff --git a/dri3proto.pc.in b/dri3proto.pc.in
-index e42d60e..20da358 100644
a/dri3proto.pc.in
-+++ b/dri3proto.pc.in
-@@ -1,6 +1,5 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
- includedir=@includedir@
-
- Name: DRI3Proto
-diff --git a/evieproto.pc.in b/evieproto.pc.in
-index 64e0ec4..fd5442b 100644
a/evieproto.pc.in
-+++ b/evieproto.pc.in
-@@ -1,6 +1,5 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
- includedir=@includedir@
-
- Name: EvIEExt
-diff --git a/fixesproto
[OE-core] [PATCH 9/9] libx11: update to 1.6.8
Fix the build when the host doesn't have libc.a installed by reverting an
upstream commit, and cherry-pick a build fix from master.
Drop a redundant sed, the expression it removes doesn't exist anymore.
Move most patches to libx11.inc so that they're applied to both libx11 and
libx11-diet.
Signed-off-by: Ross Burton
---
...x11-diet_1.6.7.bb => libx11-diet_1.6.8.bb} | 0
meta/recipes-graphics/xorg-lib/libx11.inc | 8 +++-
.../xorg-lib/libx11/fix-libtool.patch | 35
.../xorg-lib/libx11/no-host-x.patch | 40 +++
.../recipes-graphics/xorg-lib/libx11_1.6.7.bb | 13 --
.../recipes-graphics/xorg-lib/libx11_1.6.8.bb | 7
6 files changed, 88 insertions(+), 15 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libx11-diet_1.6.7.bb =>
libx11-diet_1.6.8.bb} (100%)
create mode 100644 meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb
create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.8.bb
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb
b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.8.bb
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb
rename to meta/recipes-graphics/xorg-lib/libx11-diet_1.6.8.bb
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc
b/meta/recipes-graphics/xorg-lib/libx11.inc
index ea2ebfb8b95..994c33a8efc 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -10,8 +10,12 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:"
PE = "1"
-SRC_URI[md5sum] = "034fdd6cc5393974d88aec6f5bc96162"
-SRC_URI[sha256sum] =
"910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348"
+SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \
+file://fix-libtool.patch \
+file://no-host-x.patch"
+
+SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f"
+SRC_URI[sha256sum] =
"b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5"
PROVIDES = "virtual/libx11"
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch
b/meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch
new file mode 100644
index 000..678b7aff445
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch
@@ -0,0 +1,35 @@
+Passing -all-static to libtool is done to avoid libtool wrappers on Windows,
but
+it means that the build host needs to have libc.a installed. This isn't the
+case for a lot of distributions out of the box, so revert this commit.
+
+Filed a bug upstream to get a proper fix:
https://gitlab.freedesktop.org/xorg/lib/libx11/issues/100
+
+Upstream-Status: Inappropriate
+Signed-off-by: Ross Burton
+
+From b9f74dc5e714115057a5a1789b4de202d6f58547 Mon Sep 17 00:00:00 2001
+From: Ross Burton
+Date: Fri, 2 Aug 2019 00:39:39 +0100
+Subject: [PATCH 2/2] Revert "Avoid using libtool wrapper for makekeys"
+
+This reverts commit 4645e219133458781e3fb48eaea6a74cccb1b9aa.
+---
+ src/util/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/util/Makefile.am b/src/util/Makefile.am
+index 37314370..a051567a 100644
+--- a/src/util/Makefile.am
b/src/util/Makefile.am
+@@ -10,7 +10,7 @@ AM_CPPFLAGS = \
+ CC = @CC_FOR_BUILD@
+ CPPFLAGS = @CPPFLAGS_FOR_BUILD@
+ CFLAGS = @CFLAGS_FOR_BUILD@
+-LDFLAGS = @LDFLAGS_FOR_BUILD@ -all-static
++LDFLAGS = @LDFLAGS_FOR_BUILD@
+ LIBS =
+ EXEEXT = @EXEEXT_FOR_BUILD@
+
+--
+2.20.1
+
diff --git a/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch
b/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch
new file mode 100644
index 000..803f8b408cb
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch
@@ -0,0 +1,40 @@
+Upstream-Status: Backport
+Signed-off-by: Ross Burton
+
+From cf2ef27831173c5ed6f98be3c39caff18fd4e7f1 Mon Sep 17 00:00:00 2001
+From: Adam Jackson
+Date: Mon, 17 Jun 2019 13:36:08 -0400
+Subject: [PATCH 1/2] makekeys: Detach ourselves from X headers entirely
+
+Subsequent to a121b7b0c210efe10bf93453b29050282324c906 we are no longer
+building makekeys with enough -I/foo/bar to find the X11 headers, so if
+they're not in a system include path, things fail. Since this utility is
+only needed at build time, there's no real reason to demand the X
+headers be installed for both the build and target machines if cross-
+compiling, we can just assume a vaguely ANSI environment instead.
+
+Tested-by: Niclas Zeising
+Reviewed-by: Keith Packard
+Reviewed-by: Matt Turner
+---
+ src/util/makekeys.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
+index bcb5b7d5..07563315 100644
+--- a/src/util/makekeys.c
b/src/util/makekeys.c
+@@ -35,8 +35,10 @@ from The Open Group.
+ #include
+ #include
+ #include
++#include
++#include
+
+-#include "../Xresinternal.h"
++
[OE-core] [PATCH 6/9] xserver-xorg: remove embedded build path in the source
The generated source file sdksyms.c has a comment with the absolute build path,
which means xserver-xorg-src contains this build path. This is both potential
build information leakage and a source of unreproducibility, so remove the
comment.
Signed-off-by: Ross Burton
---
.../xserver-xorg/sdksyms-no-build-path.patch | 22 +++
.../xorg-xserver/xserver-xorg_1.20.4.bb | 1 +
2 files changed, 23 insertions(+)
create mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
diff --git
a/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
b/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
new file mode 100644
index 000..54d128cb39e
--- /dev/null
+++
b/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
@@ -0,0 +1,22 @@
+sdksyms.sh: don't embed the build path
+
+This script generates a header that has a comment containing the build path for
+no real reason. As this source can end up deployed on targets in debug
packages
+this means there is both potentially sensitive information leakage about the
+build environment, and a source of change for reproducible builds.
+
+Upstream-Status: Submitted
[https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253]
+Signed-off-by: Ross Burton
+
+diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
+index 39e33711d..cdb3794b9 100755
+--- a/hw/xfree86/sdksyms.sh
b/hw/xfree86/sdksyms.sh
+@@ -308,7 +308,6 @@ BEGIN {
+ print(" * These symbols are referenced to ensure they");
+ print(" * will be available in the X Server binary.");
+ print(" */");
+-printf("/* topdir=%s */\n", topdir);
+ print("_X_HIDDEN void *xorg_symbols[] = {");
+
+ printf("sdksyms.c:") > "sdksyms.dep";
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb
b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb
index d7c5e6b3550..abc4656b0f8 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb
@@ -4,6 +4,7 @@ SRC_URI +=
"file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat
file://pkgconfig.patch \
file://0001-test-xtest-Initialize-array-with-braces.patch \
file://0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch \
+file://sdksyms-no-build-path.patch \
"
SRC_URI[md5sum] = "c4841cc24b79420205d082fe82e0a650"
SRC_URI[sha256sum] =
"fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/9] xserver-xorg: update to 1.20.5
From: Oleksandr Kravchuk
Signed-off-by: Oleksandr Kravchuk
Signed-off-by: Ross Burton
---
.../{xserver-xorg_1.20.4.bb => xserver-xorg_1.20.5.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.4.bb =>
xserver-xorg_1.20.5.bb} (89%)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb
b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.5.bb
similarity index 89%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.5.bb
index abc4656b0f8..3de6d22e573 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.5.bb
@@ -6,8 +6,8 @@ SRC_URI +=
"file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat
file://0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch \
file://sdksyms-no-build-path.patch \
"
-SRC_URI[md5sum] = "c4841cc24b79420205d082fe82e0a650"
-SRC_URI[sha256sum] =
"fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee"
+SRC_URI[md5sum] = "c9fc7e21e11286dbedd22c00df652130"
+SRC_URI[sha256sum] =
"a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d"
# These extensions are now integrated into the server, so declare the migration
# path for in-place upgrades.
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][RFC] libx11-diet: remove
This doesn't appear to be used anymore, as saving a few hundred k at the expense
of only using ASCII is quite the compromise in the modern world.
Signed-off-by: Ross Burton
---
meta/conf/distro/include/maintainers.inc | 1 -
.../xorg-lib/libx11-diet_1.6.8.bb | 16 -
.../xorg-lib/libx11/X18NCMSstubs.patch| 536 --
.../xorg-lib/libx11/fix-disable-xlocale.patch | 33 --
.../libx11/fix-utf8-wrong-define.patch| 31 -
5 files changed, 617 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.6.8.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch
delete mode 100644
meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch
delete mode 100644
meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index d9ef9bf1fdb..2ede6df96ff 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -405,7 +405,6 @@ RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal
"
RECIPE_MAINTAINER_pn-libvorbis = "Tanu Kaskinen "
RECIPE_MAINTAINER_pn-libwebp = "Alexander Kanavin "
RECIPE_MAINTAINER_pn-libx11 = "Armin Kuster "
-RECIPE_MAINTAINER_pn-libx11-diet = "Armin Kuster "
RECIPE_MAINTAINER_pn-libxau = "Armin Kuster "
RECIPE_MAINTAINER_pn-libxcb = "Armin Kuster "
RECIPE_MAINTAINER_pn-libxcomposite = "Armin Kuster "
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.8.bb
b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.8.bb
deleted file mode 100644
index 9c773a09dd8..000
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.8.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require libx11.inc
-
-DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \
-this version."
-
-SRC_URI += "file://X18NCMSstubs.patch \
-file://fix-disable-xlocale.patch \
-file://fix-utf8-wrong-define.patch \
- "
-
-RPROVIDES_${PN}-dev = "libx11-dev"
-RPROVIDES_${PN}-locale = "libx11-locale"
-
-EXTRA_OECONF += "--disable-xlocale"
-
-PACKAGECONFIG ??= ""
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch
b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch
deleted file mode 100644
index c1172147a6e..000
--- a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch
+++ /dev/null
@@ -1,536 +0,0 @@
-From 62005ad019d6afb81da100b3113292a16472d241 Mon Sep 17 00:00:00 2001
-From: Changqing Li
-Date: Mon, 10 Sep 2018 09:08:27 +0800
-Subject: [PATCH] Stub out x18n
-
-Update patch to version 1.6.6
-Signed-off-by: Changqing Li
-Upstream-Status: Inappropriate [configuration]
- src/Makefile.am| 5 +-
- src/X18NCMSstubs.c | 426 +
- src/imConv.c | 5 +-
- src/locking.c | 4 +
- 4 files changed, 438 insertions(+), 2 deletions(-)
- create mode 100644 src/X18NCMSstubs.c
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index f8c476d..cdbcbbd 100644
a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -336,13 +336,16 @@ if THRSTUBS
- libX11_la_SOURCES+=UIThrStubs.c
- endif
-
-+libX11_la_SOURCES+=X18NCMSstubs.c
-+
- x11datadir = @X11_DATADIR@
- x11data_DATA = XErrorDB
-
- EXTRA_DIST = \
- $(x11data_DATA) \
- os2Stubs.c \
-- UIThrStubs.c
-+ UIThrStubs.c \
-+ X18NCMSstubs.c
-
- libX11_xcb_la_SOURCES = x11_xcb.c Xxcbint.h
- libX11_xcb_la_LDFLAGS = -version-number 1:0:0 -no-undefined
-diff --git a/src/X18NCMSstubs.c b/src/X18NCMSstubs.c
-new file mode 100644
-index 000..429cb31
/dev/null
-+++ b/src/X18NCMSstubs.c
-@@ -0,0 +1,426 @@
-+ /* - Provides stubs and dummy funcs needed when Xcms and XLocale stuff
removed
-+ *
-+ * Copyright © 2003 Matthew Allum
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Matthew Allum not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Keith Packard and Compaq makes no
-+ * representations about the suitability of this software for any purpose. It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
-+ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include
-+#include
[OE-core] [PATCH 4/9] xdpyinfo: don't depend on DGA
DGA (Direct Graphics Access) is an obsolete extension that neither modern X drivers nor applications support. We'll remove the client library, so remove the optional dependency on DGA in xdpyinfo. Signed-off-by: Ross Burton --- meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb index a09e220f9d0..2d10b7acca7 100644 --- a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb +++ b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb @@ -9,7 +9,7 @@ clients and the server, and the different types of screens and visuals \ that are available." LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3" -DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxi libxrender libxinerama libdmx libxau libxcomposite" +DEPENDS += "libxtst libxext libxxf86vm libxi libxrender libxinerama libdmx libxau libxcomposite" PE = "1" SRC_URI += "file://disable-xkb.patch" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/9] xserver-xorg: clean up xorgproto dependencies
xorgproto is mentioned in the PACKAGECONFIG build dependencies because in the
past it was many separate *proto recipes. Now they're all in one recipe, which
is in DEPENDS, so we don't need to depend on it several times.
Signed-off-by: Ross Burton
---
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 615ad6d9bda..fc05c6a76ea 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -27,9 +27,8 @@ inherit autotools pkgconfig
inherit distro_features_check
REQUIRED_DISTRO_FEATURES = "x11"
-PROTO_DEPS = "xorgproto"
LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile
libpciaccess"
-DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util"
+DEPENDS = "xorgproto ${LIB_DEPS} font-util"
# Split out some modules and extensions from the main package
# These aren't needed for basic operations and only take up space:
@@ -128,18 +127,18 @@ PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \
"
PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
-PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xorgproto virtual/mesa"
-PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,xorgproto"
+PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,virtual/mesa"
+PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2"
# DRI3 requires xshmfence to also be enabled
-PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,xorgproto"
-PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,xorgproto virtual/libgl
virtual/libx11"
+PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3"
+PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/libgl virtual/libx11"
PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy
virtual/libgbm,libegl"
PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind"
PACKAGECONFIG[xshmfence] =
"--enable-xshmfence,--disable-xshmfence,libxshmfence"
PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native
docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
PACKAGECONFIG[systemd-logind] =
"--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,"
PACKAGECONFIG[systemd] =
"--with-systemd-daemon,--without-systemd-daemon,systemd"
-PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xorgproto"
+PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama"
PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland
wayland-native wayland-protocols libepoxy"
# Xorg requires a SHA1 implementation, pick one
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/9] xserver-xorg: add PACKAGECONFIG for DGA
Ideally we'd disable this as no real world client applications actually use DGA
these days, but some drivers (for example fbdev and cirrus) still need DGA
enabled in the server to build.
Signed-off-by: Ross Burton
---
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index fc05c6a76ea..44315f59dc0 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -120,13 +120,14 @@ EXTRA_OECONF += "--with-fop=no \
"
OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"
-PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \
+PACKAGECONFIG ??= "dga dri2 udev ${XORG_CRYPTO} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
'${OPENGL_PKGCONFIGS}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland',
'xwayland', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd
systemd-logind', '', d)} \
"
PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
+PACKAGECONFIG[dga] = "--enable-dga,--disable-dga"
PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,virtual/mesa"
PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2"
# DRI3 requires xshmfence to also be enabled
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/9] libxx86misc: remove this now redundant library
The extension this client library is for was removed from the X server over a decade ago: commit 22e64108ec63ba9891f8df237913ef9ca731 Author: Daniel Stone Date: Wed Jul 16 06:25:26 2008 +0300 XFree86: Remove XFree86-Misc extension Its last remaining purpose in life has been destroyed by input properties. Au revoir: it's been fun, by which I mean awful. Remove the obsolete dependencies from xset and xdpyinfo, and delete libxx86misc entirely. Signed-off-by: Ross Burton enter the commit message for your changes. Lines starting --- meta/conf/distro/include/distro_alias.inc | 1 - meta/conf/distro/include/maintainers.inc | 1 - .../xorg-app/xdpyinfo_1.3.2.bb| 2 +- meta/recipes-graphics/xorg-app/xset_1.2.4.bb | 2 +- .../xorg-lib/libxxf86misc_1.0.4.bb| 19 --- 5 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.4.bb diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index b0656953eb3..ab6ebdb899a 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -195,7 +195,6 @@ DISTRO_PN_ALIAS_pn-libxft = "Mandriva=libxft Debian=libxft2 Ubuntu=libxft2" DISTRO_PN_ALIAS_pn-libxi = "Ubuntu=libxi Fedora=libXi" DISTRO_PN_ALIAS_pn-libxkbcommon = "Fedora=libxkbcommon Debian=libxkbcommon" DISTRO_PN_ALIAS_pn-libxscrnsaver = "Fedora=libXScrnSaver Ubuntu=libxss1 Mandriva=libxscrnsaver" -DISTRO_PN_ALIAS_pn-libxxf86misc = "Mandriva=libxxf86misc Fedora=libXxf86misc" DISTRO_PN_ALIAS_pn-linux-dummy = "Intel" DISTRO_PN_ALIAS_pn-linux-firmware = "Fedora=linux-firmware Ubuntu=linux-firmware" DISTRO_PN_ALIAS_pn-linux-libc-headers = "Debian=linux-kernel-headers Ubuntu=linux-kernel-headers" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 77af8b6dad8..0bb4a57248f 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -443,7 +443,6 @@ RECIPE_MAINTAINER_pn-libxtst = "Armin Kuster " RECIPE_MAINTAINER_pn-libxv = "Armin Kuster " RECIPE_MAINTAINER_pn-libxvmc = "Armin Kuster " RECIPE_MAINTAINER_pn-libxxf86dga = "Armin Kuster " -RECIPE_MAINTAINER_pn-libxxf86misc = "Armin Kuster " RECIPE_MAINTAINER_pn-libxxf86vm = "Armin Kuster " RECIPE_MAINTAINER_pn-libyaml = "Alexander Kanavin " RECIPE_MAINTAINER_pn-lighttpd = "Alexander Kanavin " diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb index af04bb6e3ab..a09e220f9d0 100644 --- a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb +++ b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb @@ -9,7 +9,7 @@ clients and the server, and the different types of screens and visuals \ that are available." LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3" -DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxau libxcomposite" +DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxi libxrender libxinerama libdmx libxau libxcomposite" PE = "1" SRC_URI += "file://disable-xkb.patch" diff --git a/meta/recipes-graphics/xorg-app/xset_1.2.4.bb b/meta/recipes-graphics/xorg-app/xset_1.2.4.bb index 5748837fd5b..e21120e7886 100644 --- a/meta/recipes-graphics/xorg-app/xset_1.2.4.bb +++ b/meta/recipes-graphics/xorg-app/xset_1.2.4.bb @@ -7,7 +7,7 @@ preference options of the display." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d" -DEPENDS += "libxext libxxf86misc libxmu libxau" +DEPENDS += "libxext libxmu libxau" PE = "1" SRC_URI += "file://disable-xkb.patch" diff --git a/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.4.bb b/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.4.bb deleted file mode 100644 index 45b0673e732..000 --- a/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.4.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "XFree86-Misc: XFree86 miscellaneous extension library" - -DESCRIPTION = "The XFree86-Misc extension, provides a means to access \ -input device configuration settings specific to the XFree86/Xorg DDX." - -require xorg-lib-common.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=27c91ecc435bd3d2bfad868914c94b45" - -DEPENDS += "libxext" -PROVIDES = "xxf86misc" - -PE = "1" - -XORG_PN = "libXxf86misc" - -SRC_URI[md5sum] = "37ad70f8b53b94b550f9290be97fbe2d" -SRC_URI[sha256sum] = "a89c03e2b0f16239d67a2031b9003f31b5a686106bbdb3c797fb88ae472af380" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] linux-yocto/4.19: update to v4.19.61
On Fri, Aug 2, 2019 at 5:55 AM Bruce Ashfield wrote: > > > > On Thu, Aug 1, 2019 at 11:09 PM Khem Raj wrote: >> >> instead of posting whole shortlog to commit perhaps pointing to ko git >> log is going to save us some bits in git history >> something like >> >> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/log/?h=linux-4.19.y&qt=range&q=5dd6139a0aa2..7250956f6eaf >> > > I'm going to keep the shortlog summary. > > It makes it both searchable, and it is in response to a request for that info > to be in the logs years ago now. It has served me well so far, so I'll keep > up the practice. The bit of text in git history isn't going to hurt anyone. > Not a big deal but a nudge. The logs have to be readable and when it starts going across page boundary, For repo level searches probably doing it in kernel repo is more appropriate than in OE core. Sometimes it can get to where people stop bothering because we are adding automated logs. Every bit we add to git metadata does increate the repo size ( its at 207M at this time) > Bruce > > >> >> >> On Thu, Aug 1, 2019 at 7:33 PM wrote: >> > >> > From: Bruce Ashfield >> > >> > Integrating the korg -stable commits that comprise the following >> > changes: >> > >> >7250956f6eaf Linux 4.19.61 >> >025eb12bb4b0 dm bufio: fix deadlock with loop device >> >404f59e265ac dt-bindings: allow up to four clocks for orion-mdio >> >03e6a668ea1f net: mvmdio: allow up to four clocks to be specified for >> > orion-mdio >> >dd87cc633ba5 blkcg: update blkcg_print_stat() to handle larger outputs >> >73efdc5d7d3b blk-iolatency: clear use_delay when io.latency is set to >> > zero >> >1ab644bd02ab blk-throttle: fix zero wait time for iops throttled group >> >91da712ff592 usb: Handle USB3 remote wakeup for LPM enabled devices >> > correctly >> >152ddf9f0458 Bluetooth: Add SMP workaround Microsoft Surface Precision >> > Mouse bug >> >98318cd31b95 intel_th: msu: Fix single mode with disabled IOMMU >> >d6328d7c1a71 mtd: spinand: read returns badly if the last page has >> > bitflips >> >94f1db42a968 mtd: rawnand: mtk: Correct low level time calculation of >> > r/w cycle >> >30c6b34759f6 eCryptfs: fix a couple type promotion bugs >> >92e23f5fc049 mmc: sdhci-msm: fix mutex while in spinlock >> >01982f7bcc9d powerpc/pseries: Fix oops in hotplug memory notifier >> >e725502b8548 powerpc/powernv/npu: Fix reference leak >> >1e3b61cbc30d powerpc/watchpoint: Restore NV GPRs while returning from >> > exception >> >237ac0d73b55 powerpc/32s: fix suspend/resume when IBATs 4-7 are used >> >7961981718d6 parisc: Fix kernel panic due invalid values in IAOQ0 or >> > IAOQ1 >> >a6a0daa775e8 parisc: Ensure userspace privilege for ptraced processes >> > in regset functions >> >ef5c2e165ab0 crypto: caam - limit output IV to CBC to work around CTR >> > mode DMA issue >> >376b80276d84 gpu: ipu-v3: ipu-ic: Fix saturation bit offset in TPMEM >> >ef30c0739439 xfs: abort unaligned nowait directio early >> >669c867972c0 xfs: serialize unaligned dio writes against all other dio >> > writes >> >d61d885b17b0 xfs: fix reporting supported extra file attributes for >> > statx() >> >f614ef7a34b0 xfs: reserve blocks for ifree transaction during log >> > recovery >> >424543a53ae0 xfs: don't ever put nlink > 0 inodes on the unlinked list >> >3a895cc066c0 xfs: rename m_inotbt_nores to m_finobt_nores >> >2ab62234e823 xfs: don't overflow xattr listent buffer >> >1dc8b13cc66d xfs: flush removing page cache in xfs_reflink_remap_prep >> >788920d12b95 xfs: fix pagecache truncation prior to reflink >> >41f64437f030 include/asm-generic/bug.h: fix "cut here" for WARN_ON for >> > __WARN_TAINT architectures >> >afa3e571cde3 coda: pass the host file in vma->vm_file on mmap >> >2c0222b48e77 libnvdimm/pfn: fix fsdax-mode namespace info-block >> > zero-fields >> >656d06dab4d6 HID: wacom: correct touch resolution x/y typo >> >1c871b4006b2 HID: wacom: generic: Correct pad syncing >> >46f71a15abe7 HID: wacom: generic: only switch the mode on devices with >> > LEDs >> >cb4c2b94f629 IB/mlx5: Report correctly tag matching rendezvous >> > capability >> >4bd953241d81 Btrfs: add missing inode version, ctime and mtime updates >> > when punching hole >> >fffedf5cf67e Btrfs: fix fsync not persisting dentry deletions due to >> > inode evictions >> >110850fffeb0 Btrfs: fix data loss after inode eviction, renaming it, >> > and fsync it >> >6b71c62ea9da PCI: qcom: Ensure that PERST is asserted for at least 100 >> > ms >> >529e71cae929 PCI: Do not poll for PME if the device is in D3cold >> >4d8504004c86 PCI: hv: Fix a use-after-free bug in hv_eject_device_work() >> >f0ff76a42ef5 intel_th: pci: Add Ice Lake NNPI support >> >66a13b5e4e9c drm/edid: parse CEA blocks embedded in DisplayID >> >9854e06842bc perf/x86/amd/uncore: Set the thread mask
Re: [OE-core] [PATCH v2] pseudo: Upgrade to latest to fix openat() with a directory symlink [NAK]
On Fri, 2 Aug 2019 12:07:33 -0500 Seebs wrote: > Note that there's no lstat, and no AT_SYMLINK_NOFOLLOW. Which is to > say, these stats will be following the symlink even though O_NOFOLLOW > was set. I can probably patch this in a bit. Followup: Patch applied to master, but also in addition to fixing the stat calls, I had to use `flags&O_NOFOLLOW` rather than `flags|O_NOFOLLOW`. I am sort of amazed at how much DIDN'T break right away with that one. -s -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] pseudo: Upgrade to latest to fix openat() with a directory symlink [NAK]
On Fri, 2 Aug 2019 11:27:45 -0500 Jason Wessel wrote: > The sequence of openat() followed by an fstat() on the opened file > handle, will erase the pseudo uid entry for the symlink, as shown by > the following lstat() in test 5. The culprit appears to be the > fstat(), but it could be something much more complex than that... > The next step is to figure out why the recent change to openat() to > address test case 1, caused this new problem. I suspect I know that one, although I'm not sure I know the details. Pseudo will destroy entries of incompatible directory-entry types; for instance, if it has the same path listed as both a plain file and a directory. But consider, from openat.c: #ifdef PSEUDO_NO_REAL_AT_FUNCTIONS rc = real___xstat64(_STAT_VER, path, &buf); #else rc = real___fxstatat64(_STAT_VER, dirfd, path, &buf, 0); #endif Note that there's no lstat, and no AT_SYMLINK_NOFOLLOW. Which is to say, these stats will be following the symlink even though O_NOFOLLOW was set. I can probably patch this in a bit. -s -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ✗ patchtest: failure for meson: add a backported patch to address vala cross-compilation errors
On Fri, 2 Aug 2019 at 18:31, Patchwork wrote: > > * 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 fc634c41e4) > This is intended; the patch is sent on top of meson patches already in master-next. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] pseudo: Upgrade to latest to fix openat() with a directory symlink [NAK]
It took a while to narrow this down to a concise test case, and I am not
exactly sure what is going on in pseudo. The C app is created based on
mimicking exactly the python code that causes the failure, so that bitbake can
be entirely removed from the picture.
If you use the master branch of pseudo with the C app below, it will something
like the following but with a different owner uid if yours is not 5002.
===
Test 1 good
Test 2 good
Test 3 good
Test 4 good
Test 5 failed... tlink is owned by 5002 and not 0
===
The sequence of openat() followed by an fstat() on the opened file handle, will
erase the pseudo uid entry for the symlink, as shown by the following lstat()
in test 5. The culprit appears to be the fstat(), but it could be something
much more complex than that... The next step is to figure out why the recent
change to openat() to address test case 1, caused this new problem.
test case app.c
#include
#include
#include
#include
#include
#include
#include
int main()
{
/* Tested with: gcc -Wall -o app app.c ; pseudo ./app */
system("rm -rf tdir tlink");
system("mkdir tdir");
system("ln -s tdir tlink");
DIR *dir = opendir(".");
int dfd = dirfd(dir);
int target_dfd = openat (dfd, "tlink", O_RDONLY | O_NONBLOCK | O_DIRECTORY
| O_CLOEXEC | O_NOFOLLOW);
if (target_dfd == -1) {
printf("Test 1 good\n");
} else {
printf("Test 1 failed\n");
close(target_dfd);
}
target_dfd = openat (dfd, "tlink", O_RDONLY | O_NONBLOCK | O_DIRECTORY
| O_CLOEXEC);
if (target_dfd == -1) {
printf("Test 2 failed\n");
} else {
printf("Test 2 good\n");
close(target_dfd);
}
/* Test 3 make sure the owner of the link is root */
struct stat sbuf;
if (!lstat("tlink", &sbuf) && sbuf.st_uid == 0) {
printf("Test 3 good\n");
} else {
printf("Test 3 failed\n");
}
/* Test 4 tests open with the "rb" flag, owner should not change */
int ofd = openat(dfd,"./tlink", O_RDONLY|O_CLOEXEC);
if (ofd >= 0) {
if (fstat(ofd, &sbuf) != 0)
printf("ERROR in fstat test 4\n");
else if (sbuf.st_uid == 0)
printf("Test 4 good\n");
close(ofd);
} else {
printf("Test 4 failed with openat()\n");
}
/* In pseudo, after the fstat above, it seems the db is corrupted */
if (!lstat("tlink", &sbuf) && sbuf.st_uid == 0)
printf("Test 5 good\n");
else
printf("Test 5 failed... tlink is owned by %i and not 0\n",
sbuf.st_uid);
return 0;
}
On 8/1/19 6:57 PM, Seebs wrote:
On Thu, 1 Aug 2019 16:37:26 -0500
Jason Wessel wrote:
It seems to have caused really odd problems with the oe link
management that were not there previously, such as:
WARNING: pinentry-1.1.0-r0 do_package_qa: QA Issue:
pinentry: /usr/bin/pinentry is owned by uid 5002, which is the same
as the user running bitbake. This may be due to host contamination
[host-user-contaminated]
I'll continue to look into the problem.
There's a possibility that the right flag is something like
(flags&O_NOFOLLOW)&&!(flags&O_PATH)
or something like that. There's a handful of references to this in
wrapfuncs.in in ports/unix and ports/linux.
-s
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for meson: add a backported patch to address vala cross-compilation errors
== Series Details == Series: meson: add a backported patch to address vala cross-compilation errors Revision: 1 URL : https://patchwork.openembedded.org/series/19056/ 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 fc634c41e4) 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] Hash Equivalency - What this means for developer productivity
On Fri, 2019-08-02 at 16:53 +0100, Richard Purdie wrote: > With the patches in master-next and this configuration in local.conf: > > BB_HASHSERVE = "localhost:0" > BB_SIGNATURE_HANDLER = "OEEquivHash" > > $ bitbake core-image-sato > $ bitbake m4-native -c install -f > $ bitbake core-image-sato > > will result in do_populate_sysroot of m4-native running, it will see > the output matches the previous build and it will then skip to the > rootfs generation pulling all the other pieces from sstate. > > Note that for this to work, m4-native has to have previously built > with the hashserv running, otherwise it has nothing to compare its > output to. > > I think this should be a "big deal" for many developers, reducing > unneeded rebuilds and hence speeding up development. I should have mentioned, this code relies on reproducibile builds as its comparing the binary output. The more reproducibile builds are, the more likely sstate reuse will happen. This is one reason reproducibile builds are important! We may want to look at more interesting comparison mechanisms in the future like the APIs exposed by libraries. Having support for matching "equivalent" binaries in the core is the key first step to these things though. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] meson: add a backported patch to address vala cross-compilation errors
Signed-off-by: Alexander Kanavin
---
meta/recipes-devtools/meson/meson.inc | 1 +
.../meson/meson/vala-cross-compile.patch | 50 +++
2 files changed, 51 insertions(+)
create mode 100644 meta/recipes-devtools/meson/meson/vala-cross-compile.patch
diff --git a/meta/recipes-devtools/meson/meson.inc
b/meta/recipes-devtools/meson/meson.inc
index b9a05967f46..662368e2196 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -15,6 +15,7 @@ SRC_URI =
"https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
file://0001-mesonbuild-environment.py-do-not-determine-whether-a.patch \
file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
+ file://vala-cross-compile.patch \
"
SRC_URI[sha256sum] =
"f27b7a60f339ba66fe4b8f81f0d1072e090a08eabbd6aa287683b2c2b9dd2d82"
SRC_URI[md5sum] = "48787e391ec5c052799a3dd491f73909"
diff --git a/meta/recipes-devtools/meson/meson/vala-cross-compile.patch
b/meta/recipes-devtools/meson/meson/vala-cross-compile.patch
new file mode 100644
index 000..816f810c054
--- /dev/null
+++ b/meta/recipes-devtools/meson/meson/vala-cross-compile.patch
@@ -0,0 +1,50 @@
+From 77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d Mon Sep 17 00:00:00 2001
+From: James Westman
+Date: Mon, 24 Jun 2019 12:04:12 -0500
+Subject: [PATCH] Fix two errors when cross-compiling with Vala
+
+- AttributeError: 'ValaCompiler' object has no attribute 'get_program_dirs'
+
+ Fixed by adding a `get_program_dirs()` function to the base Compiler
+ class, to match `get_library_dirs()`
+
+- KeyError: 'vala_COMPILER'
+
+ Fixed by creating the Vala compile rules for all machines, not just
+ the build machine.
+
+Upstream-Status: Backport
[https://github.com/mesonbuild/meson/commit/77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d]
+Signed-off-by: Alexander Kanavin
+---
+ mesonbuild/backend/ninjabackend.py | 3 +--
+ mesonbuild/compilers/compilers.py | 3 +++
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/mesonbuild/backend/ninjabackend.py
b/mesonbuild/backend/ninjabackend.py
+index a454e6ab5f..b830e377e4 100644
+--- a/mesonbuild/backend/ninjabackend.py
b/mesonbuild/backend/ninjabackend.py
+@@ -1653,8 +1653,7 @@ def generate_compile_rule_for(self, langname, compiler):
+ self.generate_cs_compile_rule(compiler)
+ return
+ if langname == 'vala':
+-if
self.environment.machines.matches_build_machine(compiler.for_machine):
+-self.generate_vala_compile_rules(compiler)
++self.generate_vala_compile_rules(compiler)
+ return
+ if langname == 'rust':
+ self.generate_rust_compile_rules(compiler)
+diff --git a/mesonbuild/compilers/compilers.py
b/mesonbuild/compilers/compilers.py
+index 5855de71c8..86c1e33407 100644
+--- a/mesonbuild/compilers/compilers.py
b/mesonbuild/compilers/compilers.py
+@@ -1117,6 +1117,9 @@ def find_library(self, *args, **kwargs):
+ def get_library_dirs(self, *args, **kwargs):
+ return ()
+
++def get_program_dirs(self, *args, **kwargs):
++return ()
++
+ def has_multi_arguments(self, args, env) -> Tuple[bool, bool]:
+ raise EnvironmentException(
+ 'Language {} does not support has_multi_arguments.'.format(
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/8] meson: update 0.50.1 -> 0.51.1
Thanks, I have just sent a patch that fixes the error.
Alex
On Thu, 1 Aug 2019 at 16:33, Khem Raj wrote:
> Alexander
>
> Either this or the next patch in this series seems to be causing
>
> https://errors.yoctoproject.org/Errors/Details/256700/
>
> On Tue, Jul 30, 2019 at 8:55 AM Alexander Kanavin
> wrote:
> >
> > Drop backports.
> >
> > Rebase other patches.
> >
> > Signed-off-by: Alexander Kanavin
> > ---
> > meta/recipes-devtools/meson/meson.inc | 6 +-
> > .../0001-Make-CPU-family-warnings-fatal.patch | 10 +-
> > ...etect-windows-also-if-the-system-str.patch | 14 +-
> > ...onment.py-check-environment-for-vari.patch | 20 +-
> > ...onment.py-do-not-determine-whether-a.patch | 10 +-
> > ...pport-building-allarch-recipes-again.patch | 6 +-
> > .../meson/meson/0003-native_bindir.patch | 32 +--
> > ...ld-allow-multiple-cross-file-options.patch | 185 --
> > .../load-configs-generalise-search-path.patch | 53 -
> > .../{meson_0.50.1.bb => meson_0.51.1.bb} | 0
> > ...on_0.50.1.bb => nativesdk-meson_0.51.1.bb} | 0
> > 11 files changed, 49 insertions(+), 287 deletions(-)
> > delete mode 100644
> meta/recipes-devtools/meson/meson/0007-mesonbuild-allow-multiple-cross-file-options.patch
> > delete mode 100644
> meta/recipes-devtools/meson/meson/load-configs-generalise-search-path.patch
> > rename meta/recipes-devtools/meson/{meson_0.50.1.bb => meson_0.51.1.bb}
> (100%)
> > rename meta/recipes-devtools/meson/{nativesdk-meson_0.50.1.bb =>
> nativesdk-meson_0.51.1.bb} (100%)
> >
> > diff --git a/meta/recipes-devtools/meson/meson.inc
> b/meta/recipes-devtools/meson/meson.inc
> > index 6a723683cc0..b9a05967f46 100644
> > --- a/meta/recipes-devtools/meson/meson.inc
> > +++ b/meta/recipes-devtools/meson/meson.inc
> > @@ -11,15 +11,13 @@ SRC_URI = "
> https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
> >
> file://0001-python-module-do-not-manipulate-the-environment-when.patch \
> > file://disable-rpath-handling.patch \
> > file://cross-prop-default.patch \
> > - file://load-configs-generalise-search-path.patch \
> > -
> file://0007-mesonbuild-allow-multiple-cross-file-options.patch \
> >
> file://0001-environment.py-detect-windows-also-if-the-system-str.patch \
> >
> file://0001-mesonbuild-environment.py-do-not-determine-whether-a.patch \
> >
> file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
> >
> file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
> > "
> > -SRC_URI[sha256sum] =
> "f68f56d60c80a77df8fc08fa1016bc5831605d4717b622c96212573271e14ecc"
> > -SRC_URI[md5sum] = "24a6527796115828d2ebc75880e18d62"
> > +SRC_URI[sha256sum] =
> "f27b7a60f339ba66fe4b8f81f0d1072e090a08eabbd6aa287683b2c2b9dd2d82"
> > +SRC_URI[md5sum] = "48787e391ec5c052799a3dd491f73909"
> >
> > SRC_URI_append_class-native = " \
> > file://0001-Make-CPU-family-warnings-fatal.patch \
> > diff --git
> a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
> b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
> > index adde1e271f1..444fc081686 100644
> > ---
> a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
> > +++
> b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
> > @@ -1,4 +1,4 @@
> > -From 4b4b3d4932d928f05dbd74d730a3c8a5ac371e1d Mon Sep 17 00:00:00 2001
> > +From f70fee13e4dbc757cd8153cd42d92fa9394fb542 Mon Sep 17 00:00:00 2001
> > From: Ross Burton
> > Date: Tue, 3 Jul 2018 13:59:09 +0100
> > Subject: [PATCH] Make CPU family warnings fatal
> > @@ -12,10 +12,10 @@ Signed-off-by: Ross Burton
> > 2 files changed, 2 insertions(+), 4 deletions(-)
> >
> > diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
> > -index 5309ef4..3f0a399 100644
> > +index 03c6346..86b350b 100644
> > --- a/mesonbuild/envconfig.py
> > +++ b/mesonbuild/envconfig.py
> > -@@ -178,7 +178,7 @@ class MachineInfo:
> > +@@ -186,7 +186,7 @@ class MachineInfo:
> >
> > cpu_family = literal['cpu_family']
> > if cpu_family not in known_cpu_families:
> > @@ -25,10 +25,10 @@ index 5309ef4..3f0a399 100644
> > endian = literal['endian']
> > if endian not in ('little', 'big'):
> > diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
> > -index 3031a82..ecd18d0 100644
> > +index 0cfdf9c..40aa189 100644
> > --- a/mesonbuild/environment.py
> > +++ b/mesonbuild/environment.py
> > -@@ -242,9 +242,7 @@ def detect_cpu_family(compilers):
> > +@@ -262,9 +262,7 @@ def detect_cpu_family(compilers: CompilersDict) ->
> str:
> > trial = 'parisc'
> >
> > if trial not in known_cpu_families:
> > 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 f6043190a
[OE-core] Hash Equivalency - What this means for developer productivity
This has been talked about in a lot of the project meetings but I wanted to ensure its on the mailing list too. master-next (and hopefully soon, master) now contain patches which enable "hash equivalency" support in runqueue in bitbake. That doesn't sound so interesting until I explain what this means. Currently, if I do: $ bitbake core-image-sato then: $ bitbake m4-native -c install -f this would mean that core-image-sato would rebuild, nearly from scratch. The task stamp for all tasks onward from m4-native would change. With the patches in master-next and this configuration in local.conf: BB_HASHSERVE = "localhost:0" BB_SIGNATURE_HANDLER = "OEEquivHash" $ bitbake core-image-sato $ bitbake m4-native -c install -f $ bitbake core-image-sato will result in do_populate_sysroot of m4-native running, it will see the output matches the previous build and it will then skip to the rootfs generation pulling all the other pieces from sstate. Note that for this to work, m4-native has to have previously built with the hashserv running, otherwise it has nothing to compare its output to. I think this should be a "big deal" for many developers, reducing unneded rebuilds and hence speeding up development. As with any new feature, there are likely going to be some some teething issues but I'm very opitmistic about some of the benefits this should bring! Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] systemd-boot:grub-efi:wic: add variable APPENDS for multiple boot configuration
On Fri, 2019-08-02 at 20:33 +0800, chee.yang@intel.com wrote: > From: Chee Yang Lee > > introduce new variable APPENDS to define multiple > boot configuration for systemd-boot and grub-efi. > > APPENDS set the different in kernel option for each .conf > file(for systemd-boot) or menuentry(for grub-efi). > Include the differences in the title. > Separate each configuration with ";". > > e.g.: > APPEND = "console=tty0 rootwait" > APPENDS = " i915.enable_guc=0; i915.enable_guc=2" > > for systemd-boot, above setting will produce 2 .conf, > boot-1.conf and boot-2.conf which set with below title and option: > > boot-1.conf - > title boot-1 i915.enable_guc=0 > option console=tty0 rootwait i915.enable_guc=0 > > boot-2.conf - > title boot-2 i915.enable_guc=2 > option console=tty0 rootwait i915.enable_guc=2 > > > also update oeqa/selftest/wic testcase to fit the new variable. APPEND was a horrible choice of variable name. Lets not compound the problem by adding new versions of it! Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] kill-bb: Add it for killing abnormal bitbake processes
On Fri, 2019-08-02 at 11:21 +0100, Ross Burton wrote: > On 02/08/2019 11:24, Robert Yang wrote: > > There might be processes left after Ctr-C, e.g.: > > $ rm -f tmp/cache/default-glibc/qemux86/x86_64/ > > $ bitbake -p > > > > Press 'Ctrl-C' multiple times during parsing, then bitbake > > processes may not > > exit, and the worse is that we can't start bitbake again, we can't > > always > > reproduce this, but sometime. We can only use "ps ux" to find the > > processes and > > kill them one by one. This tool can kill all of them easily. > I've noticed this, and also noticed that it got a lot worse recently. > > But let's fix bitbake instead of adding tools to work around it? Heh. As someone who spends a lot of time trying to debug this, I must admit I could use such a script so I'm torn on this one! Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/8] sstatesig: Adpat to recent bitbake hash equiv runqueue changes
Upstream bitbake now hanes preserving the unihash data itself, drop
this usage of persist_data which was extremely problematic due to
concurrent task access issues, particulary on loaded systems.
Signed-off-by: Richard Purdie
---
meta/lib/oe/sstatesig.py | 2 --
1 file changed, 2 deletions(-)
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index eff5adfc602..f1a5af69c5e 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -277,8 +277,6 @@ class
SignatureGeneratorOEEquivHash(bb.siggen.SignatureGeneratorUniHashMixIn, Si
self.method = data.getVar('SSTATE_HASHEQUIV_METHOD')
if not self.method:
bb.fatal("OEEquivHash requires SSTATE_HASHEQUIV_METHOD to be set")
-self.unihashes = bb.persist_data.persist('SSTATESIG_UNIHASH_CACHE_v1_'
+ self.method.replace('.', '_'), data)
-
# Insert these classes into siggen's namespace so it can see and select them
bb.siggen.SignatureGeneratorOEBasic = SignatureGeneratorOEBasic
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/8] sstatesig: Updates to match bitbake siggen changes
Update the metadata to correspond to the bitbake siggen task specification
format change. This standardises on ":" everywhere rather than
the "." delimiter that was being used in some places.
This is an API breaking change but means we now have a consistent format
being used throughout the codebase without compatibility APIs.
Signed-off-by: Richard Purdie
---
meta/lib/oe/copy_buildsystem.py | 2 +-
meta/lib/oe/sstatesig.py| 54 ++---
2 files changed, 23 insertions(+), 33 deletions(-)
diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py
index 246ff582503..cb663b21c66 100644
--- a/meta/lib/oe/copy_buildsystem.py
+++ b/meta/lib/oe/copy_buildsystem.py
@@ -174,7 +174,7 @@ class BuildSystem(object):
def generate_locked_sigs(sigfile, d):
bb.utils.mkdirhier(os.path.dirname(sigfile))
depd = d.getVar('BB_TASKDEPDATA', False)
-tasks = ['%s.%s' % (v[2], v[1]) for v in depd.values()]
+tasks = ['%s:%s' % (v[2], v[1]) for v in depd.values()]
bb.parse.siggen.dump_lockedsigs(sigfile, tasks)
def prune_lockedsigs(excluded_tasks, excluded_targets, lockedsigs,
pruned_output):
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 80aafa0c2d1..ee4f28e5eff 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -59,7 +59,7 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep,
depname, dataCache):
# is machine specific.
# Therefore if we're not a kernel or a module recipe (inheriting the
kernel classes)
# and we reccomend a kernel-module, we exclude the dependency.
-depfn = dep.rsplit(".", 1)[0]
+depfn = dep.rsplit(":", 1)[0]
if dataCache and isKernel(depfn) and not isKernel(fn):
for pkg in dataCache.runrecs[fn]:
if " ".join(dataCache.runrecs[fn][pkg]).find("kernel-module-") !=
-1:
@@ -142,8 +142,10 @@ class
SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash):
self.dump_lockedsigs(sigfile)
return super(bb.siggen.SignatureGeneratorBasicHash,
self).dump_sigs(dataCache, options)
-def get_taskhash(self, fn, task, deps, dataCache):
-h = super(bb.siggen.SignatureGeneratorBasicHash,
self).get_taskhash(fn, task, deps, dataCache)
+def get_taskhash(self, tid, deps, dataCache):
+h = super(bb.siggen.SignatureGeneratorBasicHash,
self).get_taskhash(tid, deps, dataCache)
+
+(mc, _, task, fn) = bb.runqueue.split_tid_mcfn(tid)
recipename = dataCache.pkg_fn[fn]
self.lockedpnmap[fn] = recipename
@@ -153,34 +155,23 @@ class
SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash):
if recipename in self.unlockedrecipes:
unlocked = True
else:
-def get_mc(tid):
-tid = tid.rsplit('.', 1)[0]
-if tid.startswith('mc:'):
-elems = tid.split(':')
-return elems[1]
def recipename_from_dep(dep):
-# The dep entry will look something like
-# /path/path/recipename.bb.task, virtual:native:/p/foo.bb.task,
-# ...
-
-fn = dep.rsplit('.', 1)[0]
+fn = bb.runqueue.fn_from_tid(dep)
return dataCache.pkg_fn[fn]
-mc = get_mc(fn)
# If any unlocked recipe is in the direct dependencies then the
# current recipe should be unlocked as well.
-depnames = [ recipename_from_dep(x) for x in deps if mc ==
get_mc(x)]
+depnames = [ recipename_from_dep(x) for x in deps if mc ==
bb.runqueue.mc_from_tid(x)]
if any(x in y for y in depnames for x in self.unlockedrecipes):
self.unlockedrecipes[recipename] = ''
unlocked = True
if not unlocked and recipename in self.lockedsigs:
if task in self.lockedsigs[recipename]:
-k = fn + "." + task
h_locked = self.lockedsigs[recipename][task][0]
var = self.lockedsigs[recipename][task][1]
-self.lockedhashes[k] = h_locked
-self.taskhash[k] = h_locked
+self.lockedhashes[tid] = h_locked
+self.taskhash[tid] = h_locked
#bb.warn("Using %s %s %s" % (recipename, task, h))
if h != h_locked:
@@ -192,36 +183,35 @@ class
SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash):
return h
def dump_sigtask(self, fn, task, stampbase, runtime):
-k = fn + "." + task
-if k in self.lockedhashes:
+tid = fn + ":" + task
+if tid in self.lockedhashes:
return
super(bb.siggen.SignatureGeneratorBasicHash, self).dump_sigtask(fn,
task, stampbase, runtime)
def dump_lockedsigs(self, sigfile, taskfilter=None):
types = {}
-for k in self.runtaskdeps:
+for tid in self.runtaskdeps:
[OE-core] [PATCH 6/8] sstatesig: Update to handle BB_HASHSERVE
Update the code to handle BB_HASHSERV, an autostarted bitbake internal hash
equivalency server suited to local developer usage.
Signed-off-by: Richard Purdie
---
meta/conf/bitbake.conf | 2 +-
meta/lib/oe/sstatesig.py | 8 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 140f45b895b..ddcac09c5c7 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -885,7 +885,7 @@ BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH
BBPATH BBSERVER DL_DI
WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \
BB_WORKERCONTEXT BB_LIMITEDDEPS BB_UNIHASH extend_recipe_sysroot
DEPLOY_DIR \
SSTATE_HASHEQUIV_METHOD SSTATE_HASHEQUIV_SERVER
SSTATE_HASHEQUIV_REPORT_TASKDATA \
-SSTATE_HASHEQUIV_OWNER CCACHE_TOP_DIR"
+SSTATE_HASHEQUIV_OWNER CCACHE_TOP_DIR BB_HASHSERVE"
BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \
SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \
PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index f1a5af69c5e..3f926e3e515 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -271,9 +271,13 @@ class
SignatureGeneratorOEEquivHash(bb.siggen.SignatureGeneratorUniHashMixIn, Si
def init_rundepcheck(self, data):
super().init_rundepcheck(data)
-self.server = data.getVar('SSTATE_HASHEQUIV_SERVER')
+autostart = data.getVar('BB_HASHSERVE')
+if autostart:
+self.server = "http://"; + autostart
+else:
+self.server = data.getVar('SSTATE_HASHEQUIV_SERVER')
if not self.server:
-bb.fatal("OEEquivHash requires SSTATE_HASHEQUIV_SERVER to be set")
+bb.fatal("OEEquivHash requires SSTATE_HASHEQUIV_SERVER or
BB_HASHSERVE to be set")
self.method = data.getVar('SSTATE_HASHEQUIV_METHOD')
if not self.method:
bb.fatal("OEEquivHash requires SSTATE_HASHEQUIV_METHOD to be set")
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/8] sstate/sstatesig: Update to new form of BB_HASHCHECK_FUNCTION
Bitbake has updated to a cleaned up form of BB_HASHCHECK_FUNCTION,
adapt to this cleanup. This is an API breaking change.
Signed-off-by: Richard Purdie
---
meta/classes/sstate.bbclass | 80 ++---
meta/lib/oe/sstatesig.py| 13 +++---
2 files changed, 45 insertions(+), 48 deletions(-)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index ee029196dad..aa5841446c9 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -813,29 +813,26 @@ sstate_unpack_package () {
BB_HASHCHECK_FUNCTION = "sstate_checkhashes"
-def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d, siginfo=False,
*, sq_unihash=None):
-
-ret = []
-missed = []
+def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, **kwargs):
+found = set()
+missed = set()
extension = ".tgz"
if siginfo:
extension = extension + ".siginfo"
def gethash(task):
-if sq_unihash is not None:
-return sq_unihash[task]
-return sq_hash[task]
+return sq_data['unihash'][task]
def getpathcomponents(task, d):
# Magic data from BB_HASHFILENAME
-splithashfn = sq_hashfn[task].split(" ")
+splithashfn = sq_data['hashfn'][task].split(" ")
spec = splithashfn[1]
if splithashfn[0] == "True":
extrapath = d.getVar("NATIVELSBSTRING") + "/"
else:
extrapath = ""
-
-tname = sq_task[task][3:]
+
+tname = bb.runqueue.taskname_from_tid(task)[3:]
if tname in ["fetch", "unpack", "patch", "populate_lic",
"preconfigure"] and splithashfn[2]:
spec = splithashfn[2]
@@ -844,18 +841,18 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash,
sq_hashfn, d, siginfo=False, *,
return spec, extrapath, tname
-for task in range(len(sq_fn)):
+for tid in sq_data['hash']:
-spec, extrapath, tname = getpathcomponents(task, d)
+spec, extrapath, tname = getpathcomponents(tid, d)
-sstatefile = d.expand("${SSTATE_DIR}/" + extrapath +
generate_sstatefn(spec, gethash(task), d) + "_" + tname + extension)
+sstatefile = d.expand("${SSTATE_DIR}/" + extrapath +
generate_sstatefn(spec, gethash(tid), d) + "_" + tname + extension)
if os.path.exists(sstatefile):
bb.debug(2, "SState: Found valid sstate file %s" % sstatefile)
-ret.append(task)
+found.add(tid)
continue
else:
-missed.append(task)
+missed.add(tid)
bb.debug(2, "SState: Looked for but didn't find file %s" %
sstatefile)
mirrors = d.getVar("SSTATE_MIRRORS")
@@ -885,7 +882,7 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn,
d, siginfo=False, *,
thread_worker.connection_cache.close_connections()
def checkstatus(thread_worker, arg):
-(task, sstatefile) = arg
+(tid, sstatefile) = arg
localdata2 = bb.data.createCopy(localdata)
srcuri = "file://" + sstatefile
@@ -897,22 +894,22 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash,
sq_hashfn, d, siginfo=False, *,
connection_cache=thread_worker.connection_cache)
fetcher.checkstatus()
bb.debug(2, "SState: Successful fetch test for %s" % srcuri)
-ret.append(task)
-if task in missed:
-missed.remove(task)
+found.add(tid)
+if tid in missed:
+missed.remove(tid)
except:
-missed.append(task)
+missed.add(tid)
bb.debug(2, "SState: Unsuccessful fetch test for %s" % srcuri)
pass
bb.event.fire(bb.event.ProcessProgress(msg, len(tasklist) -
thread_worker.tasks.qsize()), d)
tasklist = []
-for task in range(len(sq_fn)):
-if task in ret:
+for tid in sq_data['hash']:
+if tid in found:
continue
-spec, extrapath, tname = getpathcomponents(task, d)
-sstatefile = d.expand(extrapath + generate_sstatefn(spec,
gethash(task), d) + "_" + tname + extension)
-tasklist.append((task, sstatefile))
+spec, extrapath, tname = getpathcomponents(tid, d)
+sstatefile = d.expand(extrapath + generate_sstatefn(spec,
gethash(tid), d) + "_" + tname + extension)
+tasklist.append((tid, sstatefile))
if tasklist:
msg = "Checking sstate mirror object availability"
@@ -933,38 +930,37 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash,
sq_hashfn, d, siginfo=False, *,
bb.event.fire(bb.event.ProcessFinished(msg), d)
# Likely checking an individual task hash again for multiconfig sharing of
sstate tasks so skip reporting
-if len(sq_fn) == 1:
-return ret
+if len(sq_dat
[OE-core] [PATCH 4/8] sstatesig: Add debug for incorrect hash server settings
If the hash server settings are incorrect, show the user useful
error messages instead of tracebacks.
Signed-off-by: Richard Purdie
---
meta/lib/oe/sstatesig.py | 4
1 file changed, 4 insertions(+)
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 35d48f328de..eff5adfc602 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -272,7 +272,11 @@ class
SignatureGeneratorOEEquivHash(bb.siggen.SignatureGeneratorUniHashMixIn, Si
def init_rundepcheck(self, data):
super().init_rundepcheck(data)
self.server = data.getVar('SSTATE_HASHEQUIV_SERVER')
+if not self.server:
+bb.fatal("OEEquivHash requires SSTATE_HASHEQUIV_SERVER to be set")
self.method = data.getVar('SSTATE_HASHEQUIV_METHOD')
+if not self.method:
+bb.fatal("OEEquivHash requires SSTATE_HASHEQUIV_METHOD to be set")
self.unihashes = bb.persist_data.persist('SSTATESIG_UNIHASH_CACHE_v1_'
+ self.method.replace('.', '_'), data)
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/8] sstatesig: Move unihash siggen code to bitbake
This code is closely tied with the hash server in bitbake and also means
we can't relibably test the hashserv runqueue functionality without OE
metadata. Moving this to bitbake as a MixIn class makes most sense
and encourages code collaboration and reuse as well as enabling easier
and more accurate testing of the APIs.
Signed-off-by: Richard Purdie
---
meta/lib/oe/sstatesig.py | 163 +--
1 file changed, 1 insertion(+), 162 deletions(-)
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 13af16e473c..35d48f328de 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -266,7 +266,7 @@ class
SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash):
if error_msgs:
bb.fatal("\n".join(error_msgs))
-class SignatureGeneratorOEEquivHash(SignatureGeneratorOEBasicHash):
+class SignatureGeneratorOEEquivHash(bb.siggen.SignatureGeneratorUniHashMixIn,
SignatureGeneratorOEBasicHash):
name = "OEEquivHash"
def init_rundepcheck(self, data):
@@ -275,167 +275,6 @@ class
SignatureGeneratorOEEquivHash(SignatureGeneratorOEBasicHash):
self.method = data.getVar('SSTATE_HASHEQUIV_METHOD')
self.unihashes = bb.persist_data.persist('SSTATESIG_UNIHASH_CACHE_v1_'
+ self.method.replace('.', '_'), data)
-def get_taskdata(self):
-return (self.server, self.method) + super().get_taskdata()
-
-def set_taskdata(self, data):
-self.server, self.method = data[:2]
-super().set_taskdata(data[2:])
-
-def __get_task_unihash_key(self, task):
-# TODO: The key only *needs* to be the taskhash, the task is just
-# convenient
-return '%s:%s' % (task, self.taskhash[task])
-
-def get_stampfile_hash(self, task):
-if task in self.taskhash:
-# If a unique hash is reported, use it as the stampfile hash. This
-# ensures that if a task won't be re-run if the taskhash changes,
-# but it would result in the same output hash
-unihash = self.unihashes.get(self.__get_task_unihash_key(task))
-if unihash is not None:
-return unihash
-
-return super().get_stampfile_hash(task)
-
-def get_unihash(self, task):
-import urllib
-import json
-
-taskhash = self.taskhash[task]
-
-key = self.__get_task_unihash_key(task)
-
-# TODO: This cache can grow unbounded. It probably only needs to keep
-# for each task
-unihash = self.unihashes.get(key)
-if unihash is not None:
-return unihash
-
-# In the absence of being able to discover a unique hash from the
-# server, make it be equivalent to the taskhash. The unique "hash" only
-# really needs to be a unique string (not even necessarily a hash), but
-# making it match the taskhash has a few advantages:
-#
-# 1) All of the sstate code that assumes hashes can be the same
-# 2) It provides maximal compatibility with builders that don't use
-#an equivalency server
-# 3) The value is easy for multiple independent builders to derive the
-#same unique hash from the same input. This means that if the
-#independent builders find the same taskhash, but it isn't reported
-#to the server, there is a better chance that they will agree on
-#the unique hash.
-unihash = taskhash
-
-try:
-url = '%s/v1/equivalent?%s' % (self.server,
-urllib.parse.urlencode({'method': self.method, 'taskhash':
self.taskhash[task]}))
-
-request = urllib.request.Request(url)
-response = urllib.request.urlopen(request)
-data = response.read().decode('utf-8')
-
-json_data = json.loads(data)
-
-if json_data:
-unihash = json_data['unihash']
-# A unique hash equal to the taskhash is not very interesting,
-# so it is reported it at debug level 2. If they differ, that
-# is much more interesting, so it is reported at debug level 1
-bb.debug((1, 2)[unihash == taskhash], 'Found unihash %s in
place of %s for %s from %s' % (unihash, taskhash, task, self.server))
-else:
-bb.debug(2, 'No reported unihash for %s:%s from %s' % (task,
taskhash, self.server))
-except urllib.error.URLError as e:
-bb.warn('Failure contacting Hash Equivalence Server %s: %s' %
(self.server, str(e)))
-except (KeyError, json.JSONDecodeError) as e:
-bb.warn('Poorly formatted response from %s: %s' % (self.server,
str(e)))
-
-self.unihashes[key] = unihash
-return unihash
-
-def report_unihash(self, path, task, d):
-import urllib
-import json
-import tempfile
-import base64
-import importlib
-
-taskh
[OE-core] [PATCH 1/8] sanity.conf: Require bitbake 1.43.1
We depend on a number of bitbake API changes, bump the min bitbake
version requirement.
Signed-off-by: Richard Purdie
---
meta/conf/sanity.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf
index 45e67525182..92e1886990f 100644
--- a/meta/conf/sanity.conf
+++ b/meta/conf/sanity.conf
@@ -3,7 +3,7 @@
# See sanity.bbclass
#
# Expert users can confirm their sanity with "touch conf/sanity.conf"
-BB_MIN_VERSION = "1.39.1"
+BB_MIN_VERSION = "1.43.1"
SANITY_ABIFILE = "${TMPDIR}/abi_version"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/8] classes/lib: Remove bb.build.FuncFailed
Whilst seemingly a good idea, this exception doesn't really serve any purpose
that bb.fatal() doesn't cover. Wrapping exceptions within exceptions isn't
pythonic.
Its not used in many places, lets clean up those and remove usage of it
entirely. It may ultimately be dropped form bitbake entirely.
Signed-off-by: Richard Purdie
---
meta/classes/go.bbclass | 18 +++---
meta/classes/image.bbclass | 7 ++-
meta/lib/oe/gpg_sign.py | 5 ++---
meta/lib/oe/useradd.py | 2 +-
meta/lib/oe/utils.py| 2 +-
meta/lib/oeqa/targetcontrol.py | 4 ++--
meta/lib/oeqa/utils/commands.py | 4 ++--
7 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass
index f303a15eaf3..e40e55689dd 100644
--- a/meta/classes/go.bbclass
+++ b/meta/classes/go.bbclass
@@ -71,17 +71,13 @@ python go_do_unpack() {
if len(src_uri) == 0:
return
-try:
-fetcher = bb.fetch2.Fetch(src_uri, d)
-for url in fetcher.urls:
-if fetcher.ud[url].type == 'git':
-if fetcher.ud[url].parm.get('destsuffix') is None:
-s_dirname = os.path.basename(d.getVar('S'))
-fetcher.ud[url].parm['destsuffix'] =
os.path.join(s_dirname, 'src',
-
d.getVar('GO_IMPORT')) + '/'
-fetcher.unpack(d.getVar('WORKDIR'))
-except bb.fetch2.BBFetchException as e:
-raise bb.build.FuncFailed(e)
+fetcher = bb.fetch2.Fetch(src_uri, d)
+for url in fetcher.urls:
+if fetcher.ud[url].type == 'git':
+if fetcher.ud[url].parm.get('destsuffix') is None:
+s_dirname = os.path.basename(d.getVar('S'))
+fetcher.ud[url].parm['destsuffix'] = os.path.join(s_dirname,
'src', d.getVar('GO_IMPORT')) + '/'
+fetcher.unpack(d.getVar('WORKDIR'))
}
go_list_packages() {
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 682858dc957..7fa4ff20bd3 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -305,11 +305,8 @@ fakeroot python do_image_qa () {
bb.build.exec_func(cmd, d)
except oe.utils.ImageQAFailed as e:
qamsg = qamsg + '\tImage QA function %s failed: %s\n' % (e.name,
e.description)
-except bb.build.FuncFailed as e:
-qamsg = qamsg + '\tImage QA function %s failed' % e.name
-if e.logfile:
-qamsg = qamsg + ' (log file is located at %s)' % e.logfile
-qamsg = qamsg + '\n'
+except Exception as e:
+qamsg = qamsg + '\tImage QA function %s failed\n' % cmd
if qamsg:
imgname = d.getVar('IMAGE_NAME')
diff --git a/meta/lib/oe/gpg_sign.py b/meta/lib/oe/gpg_sign.py
index 2fd8c3b1ac3..d7624804d53 100644
--- a/meta/lib/oe/gpg_sign.py
+++ b/meta/lib/oe/gpg_sign.py
@@ -89,8 +89,7 @@ class LocalSigner(object):
(_, stderr) = job.communicate(passphrase.encode("utf-8"))
if job.returncode:
-raise bb.build.FuncFailed("GPG exited with code %d: %s" %
- (job.returncode,
stderr.decode("utf-8")))
+bb.fatal("GPG exited with code %d: %s" % (job.returncode,
stderr.decode("utf-8")))
except IOError as e:
bb.error("IO error (%s): %s" % (e.errno, e.strerror))
@@ -108,7 +107,7 @@ class LocalSigner(object):
ver_str = subprocess.check_output(cmd).split()[2].decode("utf-8")
return tuple([int(i) for i in ver_str.split("-")[0].split('.')])
except subprocess.CalledProcessError as e:
-raise bb.build.FuncFailed("Could not get gpg version: %s" % e)
+bb.fatal("Could not get gpg version: %s" % e)
def verify(self, sig_file):
diff --git a/meta/lib/oe/useradd.py b/meta/lib/oe/useradd.py
index bedfe0ecb53..8fc77568ff9 100644
--- a/meta/lib/oe/useradd.py
+++ b/meta/lib/oe/useradd.py
@@ -14,7 +14,7 @@ class myArgumentParser(argparse.ArgumentParser):
error(message)
def error(self, message):
-raise bb.build.FuncFailed(message)
+bb.fatal(message)
def split_commands(params):
params = re.split('''[ \t]*;[ \t]*(?=(?:[^'"]|'[^']*'|"[^"]*")*$)''',
params.strip())
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index d686ce1bf61..652b2be145e 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -486,7 +486,7 @@ def write_ld_so_conf(d):
f.write(d.getVar("base_libdir") + '\n')
f.write(d.getVar("libdir") + '\n')
-class ImageQAFailed(bb.build.FuncFailed):
+class ImageQAFailed(Exception):
def __init__(self, description, name=None, logfile=None):
self.description = description
self.name = name
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index 15e617c95a9..1445e3ecfb9 100644
--- a/meta/lib/oeqa/targetcontrol.
Re: [OE-core] RFC: exposing information about the SRC_URI(s)/branch via buildhistory (or similar mechanism)
> > I've patched our tree so that SRC_URI, LICENSE and CVE_PRODUCT are > > archived in buildhistory. SRC_URI has many uses and changes and > > patches can be easily identified. Same with LICENSE, any changes > > trigger a review. CVE_PRODUCT is exported so that we can do QA check > > to make sure mapping from CVE_PRODUCT for non CLOSED licenses exists > > to NVD database product names (maintaining a white list of recipes > > which don't have any CVEs yet). > > I think this supports my point about being more interested in patches > allowing people to extend/customise buildhistory than just adding X. > > Whilst we want to have good defaults, there are always going to be > niche cases for people wanting to extend it... Agreed. Then we can implement our BRANCH scheme without polluting the core code with it. Chris -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] RFC: exposing information about the SRC_URI(s)/branch via buildhistory (or similar mechanism)
On Fri, 2019-08-02 at 07:37 +, mikko.rap...@bmw.de wrote: > Hi, > > On Thu, Aug 01, 2019 at 04:51:38PM +, chris.laplante--- via > Openembedded-core wrote: > > > I'm interesting in adding SRC_URI support to buildhistory (or a > > similar mechanism), and would like to get some input. > > Yes to this. > > Also would be nice if there was an easy way to add bitbake variables > to buildhistory. > > I've patched our tree so that SRC_URI, LICENSE and CVE_PRODUCT are > archived in buildhistory. SRC_URI has many uses and changes and > patches can be easily identified. Same with LICENSE, any changes > trigger a review. CVE_PRODUCT is exported so that we can do QA check > to make sure mapping from CVE_PRODUCT for non CLOSED licenses exists > to NVD database product names (maintaining a white list of recipes > which don't have any CVEs yet). I think this supports my point about being more interested in patches allowing people to extend/customise buildhistory than just adding X. Whilst we want to have good defaults, there are always going to be niche cases for people wanting to extend it... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] RFC: exposing information about the SRC_URI(s)/branch via buildhistory (or similar mechanism)
> I'd be curious to see the patches. > It's definitely something we could use here; we used to have nightly > build checking the build using AUTOREV as well. > > On Fri, Aug 2, 2019 at 3:43 AM wrote: > > > > Hi, > > > > On Thu, Aug 01, 2019 at 04:51:38PM +, chris.laplante--- via > > Openembedded-core wrote: > > > > > I'm interesting in adding SRC_URI support to buildhistory (or a similar > > > mechanism), and would like to get some input. > > > > Yes to this. > > > > Also would be nice if there was an easy way to add bitbake variables to > > buildhistory. > > > > I've patched our tree so that SRC_URI, LICENSE and CVE_PRODUCT are archived > > in buildhistory. SRC_URI has many uses and changes and patches can > > be easily identified. Same with LICENSE, any changes trigger a review. > > CVE_PRODUCT is exported so that we can do QA check to make sure mapping > > from CVE_PRODUCT for non CLOSED licenses exists to NVD database product > > names (maintaining a white list of recipes which don't have any CVEs yet). > > > > We've also changed the SDK name to be stable across builds and added > > DISTRO to the path. In our case IMAGE_NAME and SDK_NAME will include > > git tree tag and hash if tree is dirty, which changes buildhistory SDK paths > > for every build with different input. > > > > I could submit the patches if there is interest in them. I like the idea of including LICENSE and CVE_PRODUCT as well. I will look into to making it extensible via a variable, e.g. BUILDHISTORY_PACKAGE_EXTRA_VARIABLES or something. Chris -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] RFC: exposing information about the SRC_URI(s)/branch via buildhistory (or similar mechanism)
I'd be curious to see the patches. It's definitely something we could use here; we used to have nightly build checking the build using AUTOREV as well. On Fri, Aug 2, 2019 at 3:43 AM wrote: > > Hi, > > On Thu, Aug 01, 2019 at 04:51:38PM +, chris.laplante--- via > Openembedded-core wrote: > > > I'm interesting in adding SRC_URI support to buildhistory (or a similar > > mechanism), and would like to get some input. > > Yes to this. > > Also would be nice if there was an easy way to add bitbake variables to > buildhistory. > > I've patched our tree so that SRC_URI, LICENSE and CVE_PRODUCT are archived > in buildhistory. SRC_URI has many uses and changes and patches can > be easily identified. Same with LICENSE, any changes trigger a review. > CVE_PRODUCT is exported so that we can do QA check to make sure mapping > from CVE_PRODUCT for non CLOSED licenses exists to NVD database product > names (maintaining a white list of recipes which don't have any CVEs yet). > > We've also changed the SDK name to be stable across builds and added > DISTRO to the path. In our case IMAGE_NAME and SDK_NAME will include > git tree tag and hash if tree is dirty, which changes buildhistory SDK paths > for every build with different input. > > I could submit the patches if there is interest in them. > > Cheers, > > -Mikko > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libnss-nis:upgrade 3.0 -> 3.1
On Fri, Aug 02, 2019 at 10:34:35AM +0800, Zang Ruochen wrote:
> -libnss-nis/0001-nis-hosts-Remove-use-of-RES_USE_INET6.patch
> Removed since this is included in 3.1.
>
> Signed-off-by: Zang Ruochen
> ---
> meta/recipes-extended/libnss-nis/libnss-nis.bb | 5 +-
> ...001-nis-hosts-Remove-use-of-RES_USE_INET6.patch | 162
> -
> 2 files changed, 2 insertions(+), 165 deletions(-)
> delete mode 100644
> meta/recipes-extended/libnss-nis/libnss-nis/0001-nis-hosts-Remove-use-of-RES_USE_INET6.patch
>
> diff --git a/meta/recipes-extended/libnss-nis/libnss-nis.bb
> b/meta/recipes-extended/libnss-nis/libnss-nis.bb
> index 4fbd4b1..a1d914e 100644
> --- a/meta/recipes-extended/libnss-nis/libnss-nis.bb
> +++ b/meta/recipes-extended/libnss-nis/libnss-nis.bb
> @@ -13,12 +13,11 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
> SECTION = "libs"
> DEPENDS += "libtirpc libnsl2"
>
> -PV = "3.0+git${SRCPV}"
> +PV = "3.1+git${SRCPV}"
>
> -SRCREV = "d4aea48657a8e90d7922574b8021ee03915a36cb"
> +SRCREV = "062f31999b35393abf7595cb89dfc9590d5a42ad"
>...
This is the actual release and not a git snapshot after 3.0,
please set PV = "3.1".
Thanks
Adrian
--
"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
Re: [OE-core] [PATCH] linux-yocto/4.19: update to v4.19.61
On Thu, Aug 1, 2019 at 11:09 PM Khem Raj wrote: > instead of posting whole shortlog to commit perhaps pointing to ko git > log is going to save us some bits in git history > something like > > > https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/log/?h=linux-4.19.y&qt=range&q=5dd6139a0aa2..7250956f6eaf > > I'm going to keep the shortlog summary. It makes it both searchable, and it is in response to a request for that info to be in the logs years ago now. It has served me well so far, so I'll keep up the practice. The bit of text in git history isn't going to hurt anyone. Bruce > > On Thu, Aug 1, 2019 at 7:33 PM wrote: > > > > From: Bruce Ashfield > > > > Integrating the korg -stable commits that comprise the following > > changes: > > > >7250956f6eaf Linux 4.19.61 > >025eb12bb4b0 dm bufio: fix deadlock with loop device > >404f59e265ac dt-bindings: allow up to four clocks for orion-mdio > >03e6a668ea1f net: mvmdio: allow up to four clocks to be specified for > orion-mdio > >dd87cc633ba5 blkcg: update blkcg_print_stat() to handle larger outputs > >73efdc5d7d3b blk-iolatency: clear use_delay when io.latency is set to > zero > >1ab644bd02ab blk-throttle: fix zero wait time for iops throttled group > >91da712ff592 usb: Handle USB3 remote wakeup for LPM enabled devices > correctly > >152ddf9f0458 Bluetooth: Add SMP workaround Microsoft Surface > Precision Mouse bug > >98318cd31b95 intel_th: msu: Fix single mode with disabled IOMMU > >d6328d7c1a71 mtd: spinand: read returns badly if the last page has > bitflips > >94f1db42a968 mtd: rawnand: mtk: Correct low level time calculation of > r/w cycle > >30c6b34759f6 eCryptfs: fix a couple type promotion bugs > >92e23f5fc049 mmc: sdhci-msm: fix mutex while in spinlock > >01982f7bcc9d powerpc/pseries: Fix oops in hotplug memory notifier > >e725502b8548 powerpc/powernv/npu: Fix reference leak > >1e3b61cbc30d powerpc/watchpoint: Restore NV GPRs while returning from > exception > >237ac0d73b55 powerpc/32s: fix suspend/resume when IBATs 4-7 are used > >7961981718d6 parisc: Fix kernel panic due invalid values in IAOQ0 or > IAOQ1 > >a6a0daa775e8 parisc: Ensure userspace privilege for ptraced processes > in regset functions > >ef5c2e165ab0 crypto: caam - limit output IV to CBC to work around CTR > mode DMA issue > >376b80276d84 gpu: ipu-v3: ipu-ic: Fix saturation bit offset in TPMEM > >ef30c0739439 xfs: abort unaligned nowait directio early > >669c867972c0 xfs: serialize unaligned dio writes against all other > dio writes > >d61d885b17b0 xfs: fix reporting supported extra file attributes for > statx() > >f614ef7a34b0 xfs: reserve blocks for ifree transaction during log > recovery > >424543a53ae0 xfs: don't ever put nlink > 0 inodes on the unlinked list > >3a895cc066c0 xfs: rename m_inotbt_nores to m_finobt_nores > >2ab62234e823 xfs: don't overflow xattr listent buffer > >1dc8b13cc66d xfs: flush removing page cache in xfs_reflink_remap_prep > >788920d12b95 xfs: fix pagecache truncation prior to reflink > >41f64437f030 include/asm-generic/bug.h: fix "cut here" for WARN_ON > for __WARN_TAINT architectures > >afa3e571cde3 coda: pass the host file in vma->vm_file on mmap > >2c0222b48e77 libnvdimm/pfn: fix fsdax-mode namespace info-block > zero-fields > >656d06dab4d6 HID: wacom: correct touch resolution x/y typo > >1c871b4006b2 HID: wacom: generic: Correct pad syncing > >46f71a15abe7 HID: wacom: generic: only switch the mode on devices > with LEDs > >cb4c2b94f629 IB/mlx5: Report correctly tag matching rendezvous > capability > >4bd953241d81 Btrfs: add missing inode version, ctime and mtime > updates when punching hole > >fffedf5cf67e Btrfs: fix fsync not persisting dentry deletions due to > inode evictions > >110850fffeb0 Btrfs: fix data loss after inode eviction, renaming it, > and fsync it > >6b71c62ea9da PCI: qcom: Ensure that PERST is asserted for at least > 100 ms > >529e71cae929 PCI: Do not poll for PME if the device is in D3cold > >4d8504004c86 PCI: hv: Fix a use-after-free bug in > hv_eject_device_work() > >f0ff76a42ef5 intel_th: pci: Add Ice Lake NNPI support > >66a13b5e4e9c drm/edid: parse CEA blocks embedded in DisplayID > >9854e06842bc perf/x86/amd/uncore: Set the thread mask for F17h L3 PMCs > >82c46f7b0918 perf/x86/amd/uncore: Do not set 'ThreadMask' and > 'SliceMask' for non-L3 PMCs > >a847a5225432 perf/x86/intel: Fix spurious NMI on fixed counter > >0d4c0bb70665 x86/boot: Fix memory leak in default_get_smp_config() > >b52807e607f1 9p/virtio: Add cleanup path in p9_virtio_init > >1253882d64d0 9p/xen: Add cleanup path in p9_trans_xen_init > >007e5aaf287c xen/events: fix binding user event channels to cpus > >e380170b3b3a dm zoned: fix zone state management race > >1e4247d7958b padata: use smp_mb in padata_reorder to avoid orphaned
Re: [OE-core] [PATCH] image.bbclass: exclude deploy-${PN}-image-complete from rm_work
On Fri, 2019-08-02 at 17:12 +0800, liu.min...@gmail.com wrote:
> From: Ming Liu
>
> The results in ${IMGDEPLOYDIR} generated by a image task could be
> used by later image tasks.
No they shouldn't.
> , hence they should be excluded by rm_work. Or else when a image task
> gets rerun but one of its dependent image task does not, then the
> results generated by this dependent image task would not be there in
> ${IMGDEPLOYDIR}.
Nothing should be poking into IMGDEPLOYDIR outside of the image tasks.
do_image_complete[sstate-inputdirs] = "${IMGDEPLOYDIR}"
do_image_complete[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}"
anything else should be after do_image_complete and be referencing
DEPLOY_DIR_IMAGE.
Cheers,
Richard
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] systemd-boot:grub-efi:wic: add variable APPENDS for multiple boot configuration
From: Chee Yang Lee
introduce new variable APPENDS to define multiple
boot configuration for systemd-boot and grub-efi.
APPENDS set the different in kernel option for each .conf
file(for systemd-boot) or menuentry(for grub-efi).
Include the differences in the title.
Separate each configuration with ";".
e.g.:
APPEND = "console=tty0 rootwait"
APPENDS = " i915.enable_guc=0; i915.enable_guc=2"
for systemd-boot, above setting will produce 2 .conf,
boot-1.conf and boot-2.conf which set with below title and option:
boot-1.conf -
title boot-1 i915.enable_guc=0
option console=tty0 rootwait i915.enable_guc=0
boot-2.conf -
title boot-2 i915.enable_guc=2
option console=tty0 rootwait i915.enable_guc=2
also update oeqa/selftest/wic testcase to fit the new variable.
Signed-off-by: Chee Yang Lee
---
meta/classes/grub-efi-cfg.bbclass | 46 +++---
meta/classes/image_types_wic.bbclass | 2 +-
meta/classes/systemd-boot-cfg.bbclass | 75 +--
meta/lib/oeqa/selftest/cases/wic.py | 2 +-
scripts/lib/wic/plugins/source/bootimg-efi.py | 86 +++
5 files changed, 118 insertions(+), 93 deletions(-)
diff --git a/meta/classes/grub-efi-cfg.bbclass
b/meta/classes/grub-efi-cfg.bbclass
index f661a69..811c78f 100644
--- a/meta/classes/grub-efi-cfg.bbclass
+++ b/meta/classes/grub-efi-cfg.bbclass
@@ -89,29 +89,31 @@ python build_efi_cfg() {
for label in labels.split():
localdata = d.createCopy()
+initrd = localdata.getVar('INITRD')
+append = localdata.getVar('APPEND')
+appends = localdata.getVar('APPENDS') if localdata.getVar('APPENDS')
else ""
for btype in btypes:
-cfgfile.write('\nmenuentry \'%s%s\'{\n' % (label, btype[0]))
-lb = label
-if label == "install":
-lb = "install-efi"
-kernel = localdata.getVar('KERNEL_IMAGETYPE')
-cfgfile.write('linux /%s LABEL=%s' % (kernel, lb))
-
-cfgfile.write(' %s' % replace_rootfs_uuid(d, root))
-
-append = localdata.getVar('APPEND')
-initrd = localdata.getVar('INITRD')
-
-if append:
-append = replace_rootfs_uuid(d, append)
-cfgfile.write(' %s' % (append))
-
-cfgfile.write(' %s' % btype[1])
-cfgfile.write('\n')
-
-if initrd:
-cfgfile.write('initrd /initrd')
-cfgfile.write('\n}\n')
+for apd in appends.split(';'):
+cfgfile.write('\nmenuentry \'%s%s %s\'{\n' % (label,
btype[0],apd))
+lb = label
+if label == "install":
+lb = "install-efi"
+kernel = localdata.getVar('KERNEL_IMAGETYPE')
+cfgfile.write('linux /%s LABEL=%s' % (kernel, lb))
+
+cfgfile.write(' %s' % replace_rootfs_uuid(d, root))
+
+ap = append + apd
+if ap:
+append = replace_rootfs_uuid(d, ap)
+cfgfile.write(' %s' % (ap))
+
+cfgfile.write(' %s' % btype[1])
+cfgfile.write('\n')
+
+if initrd:
+cfgfile.write('initrd /initrd')
+cfgfile.write('\n}\n')
cfgfile.close()
}
diff --git a/meta/classes/image_types_wic.bbclass
b/meta/classes/image_types_wic.bbclass
index 519aeb1..4f2bdcc 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -3,7 +3,7 @@
WICVARS ?= "\
BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME
IMAGE_BOOT_FILES \
IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE
ISODIR RECIPE_SYSROOT_NATIVE \
- ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS \
+ ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS
APPENDS \
KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE
INITRAMFS_LINK_NAME"
inherit ${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1',
'kernel-artifact-names', '', d)}
diff --git a/meta/classes/systemd-boot-cfg.bbclass
b/meta/classes/systemd-boot-cfg.bbclass
index b3e0e6a..fddbfad 100644
--- a/meta/classes/systemd-boot-cfg.bbclass
+++ b/meta/classes/systemd-boot-cfg.bbclass
@@ -19,6 +19,12 @@ python build_efi_cfg() {
bb.debug(1, "No labels, nothing to do")
return
+#remove conf file from previous build
+files = os.listdir(s)
+for file in files:
+if file.endswith(".conf"):
+os.unlink(file)
+
cfile = d.getVar('SYSTEMD_BOOT_CFG')
cdir = os.path.dirname(cfile)
if not os.path.exists(cdir):
@@ -37,35 +43,44 @@ python build_efi_cfg() {
cfgfile.write('timeout 10\n')
cfgfile.close()
+appends = d.getVar('APPENDS') if d.getVar('APPENDS') else ""
+
for label in labels.split():
-localdat
[OE-core] ✗ patchtest: failure for add variable APPENDS for multiple boot configuration
== Series Details == Series: add variable APPENDS for multiple boot configuration Revision: 1 URL : https://patchwork.openembedded.org/series/19050/ 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: * Patchadd variable APPENDS for multiple boot configuration Issue Shortlog does not follow expected format [test_shortlog_format] Suggested fixCommit shortlog (first line of commit message) should follow the format ": " * Patchadd variable APPENDS for multiple boot configuration 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
[OE-core] [PATCH] add variable APPENDS for multiple boot configuration
From: Chee Yang Lee
This patch introduce new variable APPENDS to define multiple
boot configuration for systemd-boot and grub-efi.
APPENDS set the different in kernel option for each .conf
file(for systemd-boot) or menuentry(for grub-efi).
Include the differences in the title.
Separate each configuration with ";".
e.g.:
APPEND = "console=tty0 rootwait"
APPENDS = " i915.enable_guc=0; i915.enable_guc=2"
for systemd-boot, above setting will produce 2 .conf,
boot-1.conf and boot-2.conf which set with below title and option:
boot-1.conf -
title boot-1 i915.enable_guc=0
option console=tty0 rootwait i915.enable_guc=0
boot-2.conf -
title boot-2 i915.enable_guc=2
option console=tty0 rootwait i915.enable_guc=2
This patch also update oeqa/selftest/wic testcase.
---
meta/classes/grub-efi-cfg.bbclass | 46 +++---
meta/classes/image_types_wic.bbclass | 2 +-
meta/classes/systemd-boot-cfg.bbclass | 75 +--
meta/lib/oeqa/selftest/cases/wic.py | 2 +-
scripts/lib/wic/plugins/source/bootimg-efi.py | 86 +++
5 files changed, 118 insertions(+), 93 deletions(-)
diff --git a/meta/classes/grub-efi-cfg.bbclass
b/meta/classes/grub-efi-cfg.bbclass
index f661a69..811c78f 100644
--- a/meta/classes/grub-efi-cfg.bbclass
+++ b/meta/classes/grub-efi-cfg.bbclass
@@ -89,29 +89,31 @@ python build_efi_cfg() {
for label in labels.split():
localdata = d.createCopy()
+initrd = localdata.getVar('INITRD')
+append = localdata.getVar('APPEND')
+appends = localdata.getVar('APPENDS') if localdata.getVar('APPENDS')
else ""
for btype in btypes:
-cfgfile.write('\nmenuentry \'%s%s\'{\n' % (label, btype[0]))
-lb = label
-if label == "install":
-lb = "install-efi"
-kernel = localdata.getVar('KERNEL_IMAGETYPE')
-cfgfile.write('linux /%s LABEL=%s' % (kernel, lb))
-
-cfgfile.write(' %s' % replace_rootfs_uuid(d, root))
-
-append = localdata.getVar('APPEND')
-initrd = localdata.getVar('INITRD')
-
-if append:
-append = replace_rootfs_uuid(d, append)
-cfgfile.write(' %s' % (append))
-
-cfgfile.write(' %s' % btype[1])
-cfgfile.write('\n')
-
-if initrd:
-cfgfile.write('initrd /initrd')
-cfgfile.write('\n}\n')
+for apd in appends.split(';'):
+cfgfile.write('\nmenuentry \'%s%s %s\'{\n' % (label,
btype[0],apd))
+lb = label
+if label == "install":
+lb = "install-efi"
+kernel = localdata.getVar('KERNEL_IMAGETYPE')
+cfgfile.write('linux /%s LABEL=%s' % (kernel, lb))
+
+cfgfile.write(' %s' % replace_rootfs_uuid(d, root))
+
+ap = append + apd
+if ap:
+append = replace_rootfs_uuid(d, ap)
+cfgfile.write(' %s' % (ap))
+
+cfgfile.write(' %s' % btype[1])
+cfgfile.write('\n')
+
+if initrd:
+cfgfile.write('initrd /initrd')
+cfgfile.write('\n}\n')
cfgfile.close()
}
diff --git a/meta/classes/image_types_wic.bbclass
b/meta/classes/image_types_wic.bbclass
index 519aeb1..4f2bdcc 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -3,7 +3,7 @@
WICVARS ?= "\
BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME
IMAGE_BOOT_FILES \
IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE
ISODIR RECIPE_SYSROOT_NATIVE \
- ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS \
+ ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS
APPENDS \
KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE
INITRAMFS_LINK_NAME"
inherit ${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1',
'kernel-artifact-names', '', d)}
diff --git a/meta/classes/systemd-boot-cfg.bbclass
b/meta/classes/systemd-boot-cfg.bbclass
index b3e0e6a..fddbfad 100644
--- a/meta/classes/systemd-boot-cfg.bbclass
+++ b/meta/classes/systemd-boot-cfg.bbclass
@@ -19,6 +19,12 @@ python build_efi_cfg() {
bb.debug(1, "No labels, nothing to do")
return
+#remove conf file from previous build
+files = os.listdir(s)
+for file in files:
+if file.endswith(".conf"):
+os.unlink(file)
+
cfile = d.getVar('SYSTEMD_BOOT_CFG')
cdir = os.path.dirname(cfile)
if not os.path.exists(cdir):
@@ -37,35 +43,44 @@ python build_efi_cfg() {
cfgfile.write('timeout 10\n')
cfgfile.close()
+appends = d.getVar('APPENDS') if d.getVar('APPENDS') else ""
+
for label in labels.split():
-localdata = d.createCopy()
-
-entr
Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain
ping
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org
> [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of
> Lei, Maohui
> Sent: Tuesday, June 04, 2019 4:30 PM
> To: Richard Purdie
> Cc: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain
>
> Hi Richard
>
> This patch is necessary for dnf-nativesdk which has been merged. But this
> patch
> is still ignored.
> Do you have any comment about this patch?
>
> Best regards.
> Lei Maohui
>
>
> > -Original Message-
> > From: openembedded-core-boun...@lists.openembedded.org
> > [mailto:openembedded- core-boun...@lists.openembedded.org] On Behalf
> > Of Lei, Maohui
> > Sent: Tuesday, May 28, 2019 1:08 PM
> > To: Richard Purdie; openembedded-core@lists.openembedded.org
> > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in
> > toolchain
> >
> > ping
> >
> > > -Original Message-
> > > From: openembedded-core-boun...@lists.openembedded.org
> > > [mailto:openembedded- core-boun...@lists.openembedded.org] On Behalf
> > > Of Lei, Maohui
> > > Sent: Tuesday, May 14, 2019 2:31 PM
> > > To: openembedded-core@lists.openembedded.org
> > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in
> > > toolchain
> > >
> > > Hi,
> > >
> > > This patch hasn't been merged yet. Are there any suggestions?
> > >
> > > Best regards
> > > Lei
> > >
> > > > -Original Message-
> > > > From: openembedded-core-boun...@lists.openembedded.org
> > [mailto:openembedded-
> > > > core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui
> > > > Sent: Wednesday, May 08, 2019 11:36 AM
> > > > To: openembedded-core@lists.openembedded.org
> > > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in
> > toolchain
> > > >
> > > > Ping
> > > >
> > > > > -Original Message-
> > > > > From: openembedded-core-boun...@lists.openembedded.org
> > > [mailto:openembedded-
> > > > > core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui
> > > > > Sent: Friday, April 26, 2019 1:56 PM
> > > > > To: openembedded-core@lists.openembedded.org
> > > > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work
> > > > > in
> > > toolchain
> > > > >
> > > > > Hi,
> > > > >
> > > > > I noticed that " dnf: Enable nativesdk " has been merged into
> > > > > master-next.
> > > > This
> > > > > patch is necessary for dnf-nativesdk, so please merge too.
> > > > >
> > > > > Best regards
> > > > > Lei
> > > > >
> > > > >
> > > > > > -Original Message-
> > > > > > From: openembedded-core-boun...@lists.openembedded.org
> > > > [mailto:openembedded-
> > > > > > core-boun...@lists.openembedded.org] On Behalf Of Zheng,
> > > > > > Ruoqin
> > > > > > Sent: Friday, April 19, 2019 10:55 AM
> > > > > > To: openembedded-core@lists.openembedded.org
> > > > > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm
> > > > > > work in
> > > > toolchain
> > > > > >
> > > > > > ping
> > > > > >
> > > > > > --
> > > > > > Zheng Ruoqin
> > > > > > Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
> > > > > > ADDR.: No.6 Wenzhu Road, Software Avenue,
> > > > > >Nanjing, 210012, China
> > > > > > MAIL : zhengrq.f...@cn.fujistu.com
> > > > > >
> > > > > >
> > > > > > > -Original Message-
> > > > > > > From: Zheng, Ruoqin
> > > > > > > Sent: Saturday, April 13, 2019 10:37 PM
> > > > > > > To: openembedded-core@lists.openembedded.org
> > > > > > > Cc: Zheng, Ruoqin
> > > > > > > Subject: [OE-core][PATCH] toolchain-scripts: make rpm work
> > > > > > > in
> > toolchain
> > > > > > >
> > > > > > > Rpm need to read the arch info, but $script did not provide
> > > > > > > it, so
> > add
> > > it.
> > > > > > >
> > > > > > > Signed-off-by: Zheng Ruoqin
> > > > > > > ---
> > > > > > > meta/classes/toolchain-scripts.bbclass | 1 +
> > > > > > > 1 file changed, 1 insertion(+)
> > > > > > >
> > > > > > > diff --git a/meta/classes/toolchain-scripts.bbclass
> > > > > b/meta/classes/toolchain-
> > > > > > > scripts.bbclass
> > > > > > > index 1a2ec4f..de50b7e 100644
> > > > > > > --- a/meta/classes/toolchain-scripts.bbclass
> > > > > > > +++ b/meta/classes/toolchain-scripts.bbclass
> > > > > > > @@ -101,6 +101,7 @@ toolchain_shared_env_script () {
> > > > > > > echo 'export CPPFLAGS="${TARGET_CPPFLAGS}"' >> $script
> > > > > > > echo 'export KCFLAGS="--sysroot=$SDKTARGETSYSROOT"' >>
> $script
> > > > > > > echo 'export
> OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >>
> > > > > > > $script
> > > > > > > + echo 'export MACHINE_ARCH=${MACHINE_ARCH}' >> $script
> > > > > > > echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >>
> $script
>
Re: [OE-core] [PATCH 1/1] kill-bb: Add it for killing abnormal bitbake processes
On Fri, Aug 02, 2019 at 11:21:24AM +0100, Ross Burton wrote: > On 02/08/2019 11:24, Robert Yang wrote: > > There might be processes left after Ctr-C, e.g.: > > $ rm -f tmp/cache/default-glibc/qemux86/x86_64/ > > $ bitbake -p > > > > Press 'Ctrl-C' multiple times during parsing, then bitbake processes may not > > exit, and the worse is that we can't start bitbake again, we can't always > > reproduce this, but sometime. We can only use "ps ux" to find the processes > > and > > kill them one by one. This tool can kill all of them easily. > I've noticed this, and also noticed that it got a lot worse recently. > > But let's fix bitbake instead of adding tools to work around it? I run builds in lxc containers for this and host contamination reasons. Several build tools can also escape the bitbake environment and keep running in the build machine if bitbake itself ends or gets killed, so the problems are not only with bitbake. -Mikko -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] kill-bb: Add it for killing abnormal bitbake processes
On 02/08/2019 11:24, Robert Yang wrote: There might be processes left after Ctr-C, e.g.: $ rm -f tmp/cache/default-glibc/qemux86/x86_64/ $ bitbake -p Press 'Ctrl-C' multiple times during parsing, then bitbake processes may not exit, and the worse is that we can't start bitbake again, we can't always reproduce this, but sometime. We can only use "ps ux" to find the processes and kill them one by one. This tool can kill all of them easily. I've noticed this, and also noticed that it got a lot worse recently. But let's fix bitbake instead of adding tools to work around it? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] kill-bb: Add it for killing abnormal bitbake processes
The following changes since commit fc634c41e4b3fbaf29dc0104ae6b15757e77f60a: Apache-2.0-with-LLVM-exception: Add new license file (2019-07-31 23:02:56 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/kill-bb http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/kill-bb Robert Yang (1): kill-bb: Add it for killing abnormal bitbake processes scripts/kill-bb | 35 +++ 1 file changed, 35 insertions(+) create mode 100755 scripts/kill-bb -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] kill-bb: Add it for killing abnormal bitbake processes
There might be processes left after Ctr-C, e.g.:
$ rm -f tmp/cache/default-glibc/qemux86/x86_64/
$ bitbake -p
Press 'Ctrl-C' multiple times during parsing, then bitbake processes may not
exit, and the worse is that we can't start bitbake again, we can't always
reproduce this, but sometime. We can only use "ps ux" to find the processes and
kill them one by one. This tool can kill all of them easily.
Signed-off-by: Robert Yang
---
scripts/kill-bb | 35 +++
1 file changed, 35 insertions(+)
create mode 100755 scripts/kill-bb
diff --git a/scripts/kill-bb b/scripts/kill-bb
new file mode 100755
index 000..0875b2c
--- /dev/null
+++ b/scripts/kill-bb
@@ -0,0 +1,35 @@
+#!/usr/bin/env python3
+#
+# Kill bitbake processes if the process' cwd == cwd
+#
+# Copyright (c) 2019 Wind River Systems, Inc.
+#
+# SPDX-License-Identifier: GPL-2.0-only
+#
+
+import os
+import sys
+import re
+
+pids = [pid for pid in os.listdir('/proc') if pid.isdigit()]
+
+bb_pids = []
+cwd =os.getcwd()
+for pid in pids:
+cmdline_path = os.path.join('/proc', pid, 'cmdline')
+pid_cwd = os.path.join('/proc', pid, 'cwd')
+if os.path.exists(cmdline_path) and os.path.exists(pid_cwd):
+pid_cwd = os.readlink(pid_cwd)
+with open(cmdline_path, 'r') as f:
+cmdline = f.read()
+# Kill the bitbake process if its cwd == cwd
+if re.match('python3.*/bitbake/bin/bitbake', cmdline) and pid_cwd
== cwd:
+bb_pids.append(pid)
+
+if not bb_pids:
+print('No bitbake processes found in current working dir')
+sys.exit(0)
+
+for pid in bb_pids:
+print('Killing %s' % pid)
+os.kill(int(pid), 9)
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3] weston: change to use meson build system
From: Ming Liu
The changes include:
- Drop all autotools related patches.
- Move weston-launch setuid-install to do_install task since it's not
supported yet by meson build.
- Drop cairo-glesv2 package config, it's not supported by meson build,
the recommended value is hard-coded to cairo-image for now in weston
source.
- Introduce remoting package config, to give this option a explicit
value, or else the build would run into gstreamer missing error since
it defaults to be true but gstreamer is not in depends list.
- Default to headless backend if neither x11 nor wayland is in
DISTRO_FEATURES.
To be noticed, the packages built from meson would not be identical
with those built from autotools, for instance, libz dependency has been
dropped from meson build, and systemd-notify is always built in meson
when systemd packageconfig is enabled, which in autotools, it's
optional, and so on, it's not easy to list all the differences, but
you could get them by comparing the pkgdata directories built by meson
and autotools.
Signed-off-by: Stefan Agner
Signed-off-by: Ming Liu
---
.../wayland/weston/0001-make-error-portable.patch | 34
...ch-Provide-a-default-version-that-doesn-t.patch | 93 ++
meta/recipes-graphics/wayland/weston_6.0.1.bb | 49 ++--
3 files changed, 102 insertions(+), 74 deletions(-)
diff --git
a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
index 0eb3d95..acea9db 100644
--- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
+++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
@@ -9,27 +9,14 @@ kind of systemsi e.g. musl.
Upstream-Status: Submitted
Signed-off-by: Khem Raj
-
+Signed-off-by: Ming Liu
---
- configure.ac | 2 ++
libweston/weston-error.h | 20
libweston/weston-launch.c | 2 +-
- 3 files changed, 23 insertions(+), 1 deletion(-)
+ meson.build | 1 +
+ 3 files changed, 22 insertions(+), 1 deletion(-)
create mode 100644 libweston/weston-error.h
-diff --git a/configure.ac b/configure.ac
-index c05ad01..6da6e04 100644
a/configure.ac
-+++ b/configure.ac
-@@ -126,6 +126,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
- [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile weston")],
- [[#include ]])
-
-+AC_CHECK_HEADERS([error.h])
-+
- AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate])
-
- # check for libdrm as a build-time dependency only
diff --git a/libweston/weston-error.h b/libweston/weston-error.h
new file mode 100644
index 000..2089d02
@@ -76,3 +63,18 @@ index bf73e0d..9064439 100644
#define DRM_MAJOR 226
+diff --git a/meson.build b/meson.build
+index 2155b7b..baa52d9 100644
+--- a/meson.build
b/meson.build
+@@ -94,6 +94,7 @@ foreach func : optional_libc_funcs
+ endforeach
+
+ optional_system_headers = [
++ 'error.h',
+ 'linux/sync_file.h'
+ ]
+ foreach hdr : optional_system_headers
+--
+2.7.4
+
diff --git
a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
b/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
index a2f61bf..81cc025 100644
---
a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
+++
b/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
@@ -15,44 +15,46 @@ Upstream-Status: Pending
Signed-off-by: Tom Hochstein
Signed-off-by: Jussi Kukkonen
Signed-off-by: Denys Dmytriyenko
-
+Signed-off-by: Ming Liu
---
- configure.ac | 9 +++--
+ libweston/meson.build | 16
libweston/weston-launch.c | 20
- 2 files changed, 27 insertions(+), 2 deletions(-)
+ meson_options.txt | 7 +++
+ 3 files changed, 39 insertions(+), 4 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index 6da6e04..681f7c8 100644
a/configure.ac
-+++ b/configure.ac
-@@ -515,13 +515,17 @@ AC_ARG_ENABLE(resize-optimization,
- AS_IF([test "x$enable_resize_optimization" = "xyes"],
- [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a
performance optimization])])
-
-+AC_ARG_WITH(pam,
-+AS_HELP_STRING([--with-pam], [Use PAM]),
-+[use_pam=$withval], [use_pam=yes])
- AC_ARG_ENABLE(weston-launch, [ --enable-weston-launch],,
enable_weston_launch=yes)
- AM_CONDITIONAL(BUILD_WESTON_LAUNCH, test x$enable_weston_launch = xyes)
--if test x$enable_weston_launch = xyes; then
-+if test x$enable_weston_launch = xyes -a x$use_pam = xyes; then
- WESTON_SEARCH_LIBS([PAM], [pam], [pam_open_session], [have_pam=yes],
[have_pam=no])
- if test x$have_pam = xno; then
--AC_ERROR([weston-launch requires pam])
-+AC_ERROR([PAM support is explicitly requested, but libpam couldn't be
fo
[OE-core] [PATCH] image.bbclass: exclude deploy-${PN}-image-complete from rm_work
From: Ming Liu
The results in ${IMGDEPLOYDIR} generated by a image task could be used
by later image tasks, hence they should be excluded by rm_work. Or else
when a image task gets rerun but one of its dependent image task does
not, then the results generated by this dependent image task would not
be there in ${IMGDEPLOYDIR}.
Signed-off-by: Ming Liu
---
meta/classes/image.bbclass | 4
1 file changed, 4 insertions(+)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 682858d..d16e285 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -84,6 +84,10 @@ PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}"
IMGDEPLOYDIR = "${WORKDIR}/deploy-${PN}-image-complete"
+# The results in ${IMGDEPLOYDIR} generated by a image task could be used by
+# later image tasks, hence they should be excluded by rm_work.
+RM_WORK_EXCLUDE_ITEMS += "deploy-${PN}-image-complete"
+
# Images are generally built explicitly, do not need to be part of world.
EXCLUDE_FROM_WORLD = "1"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] RFC: exposing information about the SRC_URI(s)/branch via buildhistory (or similar mechanism)
Hi, On Thu, Aug 01, 2019 at 04:51:38PM +, chris.laplante--- via Openembedded-core wrote: > I'm interesting in adding SRC_URI support to buildhistory (or a similar > mechanism), and would like to get some input. Yes to this. Also would be nice if there was an easy way to add bitbake variables to buildhistory. I've patched our tree so that SRC_URI, LICENSE and CVE_PRODUCT are archived in buildhistory. SRC_URI has many uses and changes and patches can be easily identified. Same with LICENSE, any changes trigger a review. CVE_PRODUCT is exported so that we can do QA check to make sure mapping from CVE_PRODUCT for non CLOSED licenses exists to NVD database product names (maintaining a white list of recipes which don't have any CVEs yet). We've also changed the SDK name to be stable across builds and added DISTRO to the path. In our case IMAGE_NAME and SDK_NAME will include git tree tag and hash if tree is dirty, which changes buildhistory SDK paths for every build with different input. I could submit the patches if there is interest in them. Cheers, -Mikko -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
