[OE-core] [PATCH 3/3] libx11: update to 1.6.8
Signed-off-by: Oleksandr Kravchuk
---
.../xorg-lib/{libx11-diet_1.6.7.bb => libx11-diet_1.6.8.bb} | 0
meta/recipes-graphics/xorg-lib/libx11.inc | 4 ++--
.../xorg-lib/{libx11_1.6.7.bb => libx11_1.6.8.bb} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libx11-diet_1.6.7.bb =>
libx11-diet_1.6.8.bb} (100%)
rename meta/recipes-graphics/xorg-lib/{libx11_1.6.7.bb => libx11_1.6.8.bb}
(100%)
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 ea2ebfb8b9..53c9e436e3 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -10,8 +10,8 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:"
PE = "1"
-SRC_URI[md5sum] = "034fdd6cc5393974d88aec6f5bc96162"
-SRC_URI[sha256sum] =
"910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348"
+SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f"
+SRC_URI[sha256sum] =
"b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5"
PROVIDES = "virtual/libx11"
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb
b/meta/recipes-graphics/xorg-lib/libx11_1.6.8.bb
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb
rename to meta/recipes-graphics/xorg-lib/libx11_1.6.8.bb
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] xorgproto: update to 2019.1
Signed-off-by: Oleksandr Kravchuk
---
.../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 48296f7844..00
---
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.pc.in b/fixesproto.pc.in
-index f8258e2..c7fcb81 100644
[OE-core] [PATCH 2/3] xserver-xorg: update to 1.20.5
Signed-off-by: Oleksandr Kravchuk
---
.../{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} (88%)
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 88%
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 ad99d6bece..79fe0666c3 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
@@ -5,8 +5,8 @@ SRC_URI += "file://musl-arm-inb-outb.patch \
file://pkgconfig.patch \
file://0001-test-xtest-Initialize-array-with-braces.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.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libpciaccess: update to 0.15
Removed patch was upstreamed.
Signed-off-by: Oleksandr Kravchuk
---
.../0004-Don-t-include-sys-io.h-on-arm.patch | 28 ---
...pciaccess_0.14.bb => libpciaccess_0.15.bb} | 8 ++
2 files changed, 2 insertions(+), 34 deletions(-)
delete mode 100644
meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch
rename meta/recipes-graphics/xorg-lib/{libpciaccess_0.14.bb =>
libpciaccess_0.15.bb} (62%)
diff --git
a/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch
b/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch
deleted file mode 100644
index f532858244..00
---
a/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b6df5202306bd71158b482f25ca2e6919645d4dd Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Thu, 4 Jun 2015 20:55:06 -0700
-Subject: [PATCH 4/4] Don't include sys/io.h on arm
-
-Signed-off-by: Khem Raj
-Upstream-Status: Pending
-
- src/linux_sysfs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c
-index 3f95e53..1e3aad3 100644
a/src/linux_sysfs.c
-+++ b/src/linux_sysfs.c
-@@ -50,7 +50,7 @@
- #include
- #include
-
--#if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
-+#if defined(__i386__) || defined(__x86_64__)
- #include
- #else
- #define inb(x) -1
---
-2.1.4
-
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb
b/meta/recipes-graphics/xorg-lib/libpciaccess_0.15.bb
similarity index 62%
rename from meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb
rename to meta/recipes-graphics/xorg-lib/libpciaccess_0.15.bb
index d030c31bd0..16393ac3bb 100644
--- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.15.bb
@@ -5,12 +5,8 @@ PCI bus and devices in a platform-independent way."
require xorg-lib-common.inc
-SRC_URI += "\
-file://0004-Don-t-include-sys-io.h-on-arm.patch \
-"
-
-SRC_URI[md5sum] = "8f436e151d5106a9cfaa71857a066d33"
-SRC_URI[sha256sum] =
"3df543e12afd41fea8eac817e48cbfde5aed8817b81670a4e9e493bb2f5bf2a4"
+SRC_URI[md5sum] = "843e92d0eef94684a4eb9a2d311bfb12"
+SRC_URI[sha256sum] =
"a75643bb5cd02f6da8667d437b76492842dd56bc88e3dfb8410f5d535b99f5dc"
LICENSE = "MIT & MIT-style"
LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] llvm: fix link error for powerpc
On Fri, Jul 12, 2019 at 12:59 AM ChenQi wrote:
>
> I'm recently getting llvm build failure on qemuppc. After reverting this
> patch, the build succeeds.
> My host is ubuntu16.04.
>
so what has changed ? I guess default gcc is now 9.x instead of 8.x. I
wonder if thats contributing to it
if so, I am fine with reverting the change, just mention that if using
8.x we need to add -mlongcall to cxxflags on ppc
> I'm also wondering why autobuilder does not detect the build failure. No
> world build for qemuppc?
>
> Best Regards,
> Chen Qi
>
> On 04/02/2019 08:43 AM, changqing...@windriver.com wrote:
> > From: Changqing Li
> >
> > fix below link error for powerpc
> >
> > lib/libLLVMSupport.a(CommandLine.cpp.o): in function
> > `llvm::cl::opt_storage<(anonymous namespace):
> > :HelpPrinterWrapper, true, true>::setLocation(llvm::cl::Option&, (anonymous
> > namespace)::HelpPrinterWrapper&) [clone .isra.189]':
> > /usr/src/debug/llvm/8.0-r0/git/llvm/include/llvm/Support/CommandLine.h:1218:(.text.startup+0x5c):
> > relocation truncated to fit: R_PPC_PLTREL24 against symbol `llvm::errs()'
> > defined in .text section in lib/libLLVMSupport.a(raw_ostream.cpp.o)+8000
> > lib/libLLVMSupport.a(CommandLine.cpp.o): in function `setLocation':
> >
> > Signed-off-by: Changqing Li
> > ---
> > meta/recipes-devtools/llvm/llvm_git.bb | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/meta/recipes-devtools/llvm/llvm_git.bb
> > b/meta/recipes-devtools/llvm/llvm_git.bb
> > index d2ea927..a35ea4a 100644
> > --- a/meta/recipes-devtools/llvm/llvm_git.bb
> > +++ b/meta/recipes-devtools/llvm/llvm_git.bb
> > @@ -88,6 +88,8 @@ EXTRA_OECMAKE_append_class-nativesdk = "\
> >
> > -DLLVM_CONFIG_PATH=${STAGING_BINDIR_NATIVE}/llvm-config${PV} \
> >"
> >
> > +CXXFLAGS_append_class-target_powerpc = " -mlongcall"
> > +
> > do_configure_prepend() {
> > # Fix paths in llvm-config
> > sed -i
> > "s|sys::path::parent_path(CurrentPath))\.str()|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|g"
> > ${S}/tools/llvm-config/llvm-config.cpp
>
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] llvm: fix link error for powerpc
On Fri, Jul 12, 2019 at 1:06 AM wrote: > > On Fri, 2019-07-12 at 16:11 +0800, ChenQi wrote: > > I'm recently getting llvm build failure on qemuppc. After reverting > > this > > patch, the build succeeds. > > My host is ubuntu16.04. > > > > I'm also wondering why autobuilder does not detect the build failure. > > No > > world build for qemuppc? > > There is no world build for ppc or mips. > no mips ? ppc I understand > Cheers, > > Richard > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] ninja: use Python 3
On Fri, Jul 12, 2019 at 12:50 AM Burton, Ross wrote: > > On Fri, 12 Jul 2019 at 01:54, Khem Raj wrote: > > Maybe we should encode it in interpreter section inside configure.py > > itself and upstream it. > > I've filed a bug (https://github.com/ninja-build/ninja/issues/1601) to > see if they have any strong reasons to stick with python instead of > python3. OK so they are oblivious to python version which is great, I wish whole python world was like that > > Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] classes/icecc: Disable remote pre-processing by default
Unfortunately, GCC has a number of outstanding bugs related to using
-fdirectives-only, which causes a lot of errors when using Icecream.
See:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47254
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88475
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89658
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91152
Until many of these are addressed, it is better to disable remote
preprocessing.
Signed-off-by: Joshua Watt
---
meta/classes/icecc.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index edb0e10434..095518115f 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -57,7 +57,7 @@ ICECC_ENV_VERSION = "2"
# See: https://github.com/icecc/icecream/issues/190
export ICECC_CARET_WORKAROUND ??= "0"
-export ICECC_REMOTE_CPP ??= "1"
+export ICECC_REMOTE_CPP ??= "0"
ICECC_CFLAGS = ""
CFLAGS += "${ICECC_CFLAGS}"
--
2.21.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] python3-manifest: add entry to package the timeit module
(discussed on IRC)
NACK, this is in python3-misc and I don't see a good reason to split
it out explicitly.
Ross
On Fri, 12 Jul 2019 at 15:09, Joshua Lock wrote:
>
> Signed-off-by: Joshua Lock
> ---
> .../python/python3/python3-manifest.json | 12
> 1 file changed, 12 insertions(+)
>
> diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json
> b/meta/recipes-devtools/python/python3/python3-manifest.json
> index 0803ac0033..17d41c34b9 100644
> --- a/meta/recipes-devtools/python/python3/python3-manifest.json
> +++ b/meta/recipes-devtools/python/python3/python3-manifest.json
> @@ -1131,6 +1131,18 @@
> "${libdir}/python${PYTHON_MAJMIN}/__pycache__/queue.*.pyc"
> ]
> },
> +"timeit": {
> +"summary": "Simple way to time small bits of code",
> +"rdepends": [
> +"core"
> +],
> +"files": [
> +"${libdir}/python${PYTHON_MAJMIN}/timeit.py"
> +],
> +"cached": [
> +"${libdir}/python${PYTHON_MAJMIN}/__pycache__/timeit.*.pyc"
> +]
> +},
> "tkinter": {
> "summary": "Python Tcl/Tk bindings",
> "rdepends": [
> --
> 2.21.0
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python3-manifest: add entry to package the timeit module
Signed-off-by: Joshua Lock
---
.../python/python3/python3-manifest.json | 12
1 file changed, 12 insertions(+)
diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json
b/meta/recipes-devtools/python/python3/python3-manifest.json
index 0803ac0033..17d41c34b9 100644
--- a/meta/recipes-devtools/python/python3/python3-manifest.json
+++ b/meta/recipes-devtools/python/python3/python3-manifest.json
@@ -1131,6 +1131,18 @@
"${libdir}/python${PYTHON_MAJMIN}/__pycache__/queue.*.pyc"
]
},
+"timeit": {
+"summary": "Simple way to time small bits of code",
+"rdepends": [
+"core"
+],
+"files": [
+"${libdir}/python${PYTHON_MAJMIN}/timeit.py"
+],
+"cached": [
+"${libdir}/python${PYTHON_MAJMIN}/__pycache__/timeit.*.pyc"
+]
+},
"tkinter": {
"summary": "Python Tcl/Tk bindings",
"rdepends": [
--
2.21.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/2] meta/lib/oeqa: Test for bootimg-biosplusefi Source
Add unittests for bootimg-biosplusefi SourcePlugin in wic module.
First test check wic creation works correctly.
Second test uses qemu to boot image and checks that it has both
EFI and BIOS files in a single partition.
Signed-off-by: William Bourque
---
meta-selftest/wic/test_biosplusefi_plugin.wks | 6 +++
meta/lib/oeqa/selftest/cases/wic.py | 47 +++
2 files changed, 53 insertions(+)
create mode 100644 meta-selftest/wic/test_biosplusefi_plugin.wks
diff --git a/meta-selftest/wic/test_biosplusefi_plugin.wks
b/meta-selftest/wic/test_biosplusefi_plugin.wks
new file mode 100644
index 00..5a56c84518
--- /dev/null
+++ b/meta-selftest/wic/test_biosplusefi_plugin.wks
@@ -0,0 +1,6 @@
+# short-description: This file is used in oe-selftest wic module to test
biosplusefi plugin
+
+part /boot --source bootimg-biosplusefi --sourceparams="loader=grub-efi"
--active --align 1024 --use-uuid
+part / --source rootfs --fstype=ext4 --align 1024 --use-uuid
+
+bootloader --timeout=0 --append="console=ttyS0,115200n8"
diff --git a/meta/lib/oeqa/selftest/cases/wic.py
b/meta/lib/oeqa/selftest/cases/wic.py
index f1c6f390c5..149edee43d 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -680,6 +680,53 @@ class Wic2(WicTestCase):
out = glob(self.resultdir + "%s-*direct" % wksname)
self.assertEqual(1, len(out))
+@only_for_arch(['i586', 'i686', 'x86_64'])
+def test_biosplusefi_plugin_qemu(self):
+"""Test biosplusefi plugin in qemu"""
+for fstype in ("ext4", "wic"):
+config = 'IMAGE_FSTYPES = "%s"\nWKS_FILE =
"test_biosplusefi_plugin.wks"\nMACHINE_FEATURES_append = " efi"\n' % fstype
+self.append_config(config)
+self.assertEqual(0, bitbake('core-image-minimal').status)
+self.remove_config(config)
+
+with runqemu('core-image-minimal', ssh=False, image_fstype='wic') as
qemu:
+# Check that we have ONLY two /dev/sda* partitions (/boot and /)
+cmd = "grep sda. /proc/partitions | wc -l"
+status, output = qemu.run_serial(cmd)
+self.assertEqual(1, status, 'Failed to run command "%s": %s' %
(cmd, output))
+self.assertEqual(output, '2')
+# Check that /dev/sda1 is /boot and that either /dev/root OR
/dev/sda2 is /
+cmd = "mount | grep '^/dev/' | cut -f1,3 -d ' ' | egrep -c -e
'/dev/sda1 /boot' -e '/dev/root /|/dev/sda2 /'"
+status, output = qemu.run_serial(cmd)
+self.assertEqual(1, status, 'Failed to run command "%s": %s' %
(cmd, output))
+self.assertEqual(output, '2')
+# Check that /boot has EFI bootx64.efi (required for EFI)
+cmd = "ls /boot/EFI/BOOT/bootx64.efi | wc -l"
+status, output = qemu.run_serial(cmd)
+self.assertEqual(1, status, 'Failed to run command "%s": %s' %
(cmd, output))
+self.assertEqual(output, '1')
+# Check that "BOOTABLE" flag is set on boot partition (required
for PC-Bios)
+cmd = "fdisk -l /dev/sda | grep /dev/sda1 | awk {print'$2'}"
+status, output = qemu.run_serial(cmd)
+self.assertEqual(1, status, 'Failed to run command "%s": %s' %
(cmd, output))
+self.assertEqual(output, '*')
+
+@only_for_arch(['i586', 'i686', 'x86_64'])
+def test_biosplusefi_plugin(self):
+"""Test biosplusefi plugin"""
+img = 'core-image-minimal'
+machine = get_bb_var('MACHINE', img)
+with NamedTemporaryFile("w", suffix=".wks") as wks:
+wks.writelines(['part /boot --active --source bootimg-biosplusefi
--sourceparams="loader=grub-efi"\n',
+'part / --source rootfs --fstype=ext4 --align 1024
--use-uuid\n'\
+'bootloader --timeout=0
--append="console=ttyS0,115200n8"\n'])
+wks.flush()
+cmd = "wic create %s -e %s -o %s" % (wks.name, img, self.resultdir)
+runCmd(cmd)
+wksname = os.path.splitext(os.path.basename(wks.name))[0]
+out = glob(self.resultdir + "%s-*.direct" % wksname)
+self.assertEqual(1, len(out))
+
def test_fs_types(self):
"""Test filesystem types for empty and not empty partitions"""
img = 'core-image-minimal'
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/2] wic/plugins: Source that support both EFI and BIOS
Add a source plugin that support both EFI and legacy PC-Bios. While using this plugin, both bootloaders configurations reside in the same /boot partitions. This plugin has very little code : to avoid code duplication, we simply re-import bootimg-pcbios and bootmg-efi source and call both their SourcePlugin methods. Signed-off-by: William Bourque --- .../wic/plugins/source/bootimg-biosplusefi.py | 213 ++ 1 file changed, 213 insertions(+) create mode 100644 scripts/lib/wic/plugins/source/bootimg-biosplusefi.py diff --git a/scripts/lib/wic/plugins/source/bootimg-biosplusefi.py b/scripts/lib/wic/plugins/source/bootimg-biosplusefi.py new file mode 100644 index 00..5bd7390680 --- /dev/null +++ b/scripts/lib/wic/plugins/source/bootimg-biosplusefi.py @@ -0,0 +1,213 @@ +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# DESCRIPTION +# This implements the 'bootimg-biosplusefi' source plugin class for 'wic' +# +# AUTHORS +# William Bourque + +import types + +from wic.pluginbase import SourcePlugin +from importlib.machinery import SourceFileLoader + +class BootimgBiosPlusEFIPlugin(SourcePlugin): +""" +Create MBR + EFI boot partition + +This plugin creates a boot partition that contains both +legacy BIOS and EFI content. It will be able to boot from both. +This is useful when managing PC fleet with some older machines +without EFI support. + +Note it is possible to create an image that can boot from both +legacy BIOS and EFI by defining two partitions : one with arg +--source bootimg-efi and another one with --source bootimg-pcbios. +However, this method has the obvious downside that it requires TWO +partitions to be created on the storage device. +Both partitions will also be marked as "bootable" which does not work on +most BIOS, has BIOS often uses the "bootable" flag to determine +what to boot. If you have such a BIOS, you need to manually remove the +"bootable" flag from the EFI partition for the drive to be bootable. +Having two partitions also seems to confuse wic : the content of +the first partition will be duplicated into the second, even though it +will not be used at all. + +Also, unlike "isoimage-isohybrid" that also does BIOS and EFI, this plugin +allows you to have more than only a single rootfs partitions and does +not turn the rootfs into an initramfs RAM image. + +This plugin is made to put everything into a single /boot partition so it +does not have the limitations listed above. + +The plugin is made so it does tries not to reimplement what's already +been done in other plugins; as such it imports "bootimg-pcbios" +and "bootimg-efi". +Plugin "bootimg-pcbios" is used to generate legacy BIOS boot. +Plugin "bootimg-efi" is used to generate the UEFI boot. Note that it +requires a --sourceparams argument to know which loader to use; refer +to "bootimg-efi" code/documentation for the list of loader. + +Imports are handled with "SourceFileLoader" from importlib as it is +otherwise very difficult to import module that has hyphen "-" in their +filename. +The SourcePlugin() methods used in the plugins (do_install_disk, +do_configure_partition, do_prepare_partition) are then called on both, +beginning by "bootimg-efi". + +Plugin options, such as "--sourceparams" can still be passed to a +plugin, as long they does not cause issue in the other plugin. + +Example wic configuration: +part /boot --source bootimg-biosplusefi --sourceparams="loader=grub-efi"\\ + --ondisk sda --label os_boot --active --align 1024 --use-uuid +""" + +name = 'bootimg-biosplusefi' + +__PCBIOS_MODULE_NAME = "bootimg-pcbios" +__EFI_MODULE_NAME = "bootimg-efi" + +__imgEFIObj = None +__imgBiosObj = None + +@classmethod +def __init__(cls): +""" +Constructor (init) +""" + +# XXX +# For some reasons, __init__ constructor is never called. +# Something to do with how pluginbase works? +cls.__instanciateSubClasses() + +@classmethod +def __instanciateSubClasses(cls): +""" + +""" + +# Import bootimg-pcbios (class name "BootimgPcbiosPlugin") +modulePath = os.path.join(os.path.dirname(os.path.realpath(__file__)), +
[OE-core] [PATCH] sstate: Add tweak to avoid multiple sstate stats messages
After the recent changes in bitbake to runqueue, we need to recheck sstate
validity,
particularly in multiconfig builds where tasks have the same checksum.
Avoid printing summary messages in this case. Also avoid multiple events to
toaster
which may not be expecting that at later points in the code.
Signed-off-by: Richard Purdie
---
meta/classes/sstate.bbclass | 4
1 file changed, 4 insertions(+)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 424acfb1557..b604729d84a 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -927,6 +927,10 @@ 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
+
inheritlist = d.getVar("INHERIT")
if "toaster" in inheritlist:
evdata = {'missed': [], 'found': []};
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] sysstat:The sysstat.service in source should be installed for cron with systemd
From: Haiqing Bai
The sysstat.service script in source launchs sysstat-collect and sysstat-summary
services when cron is installed with systemd. At this time, the upstream
sysstat.service must be installed.
Signed-off-by: Haiqing Bai
Signed-off-by: Ross Burton
---
meta/recipes-extended/sysstat/sysstat.inc | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-extended/sysstat/sysstat.inc
b/meta/recipes-extended/sysstat/sysstat.inc
index 4e297216660..592cbf45743 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -20,6 +20,7 @@ inherit autotools-brokensep gettext systemd
upstream-version-is-even
PACKAGECONFIG ??= ""
PACKAGECONFIG[lm-sensors] =
"--enable-sensors,--disable-sensors,lmsensors,lmsensors-libsensors"
PACKAGECONFIG[cron] = "--enable-install-cron
--enable-copy-only,--disable-install-cron --disable-copy-only"
+PACKAGECONFIG[systemd] =
"--with-systemdsystemunitdir=${systemd_system_unitdir}"
EXTRA_OECONF += "--disable-stripping"
@@ -44,11 +45,13 @@ do_install() {
install -d ${D}${sysconfdir}/tmpfiles.d
echo "d ${localstatedir}/log/sa - - - -" \
> ${D}${sysconfdir}/tmpfiles.d/sysstat.conf
- fi
- install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_unitdir}/system
- sed -i -e 's#@LIBDIR@#${libdir}#g'
${D}${systemd_unitdir}/system/sysstat.service
+ if ${@bb.utils.contains('PACKAGECONFIG', 'cron', 'false',
'true', d)}; then
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/sysstat.service
${D}${systemd_unitdir}/system
+ sed -i -e 's#@LIBDIR@#${libdir}#g'
${D}${systemd_unitdir}/system/sysstat.service
+ fi
+ fi
}
pkg_postinst_${PN} () {
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] Revert "sysstat: use service file from source codes"
This doesn't actually work as the unit file is only installed if cron support is
enabled.
This reverts commit 721f09d4897425c7131470bd756eee1b90937feb.
Signed-off-by: Ross Burton
---
meta/recipes-extended/sysstat/sysstat.inc| 8 ++--
.../recipes-extended/sysstat/sysstat/sysstat.service | 12
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-extended/sysstat/sysstat/sysstat.service
diff --git a/meta/recipes-extended/sysstat/sysstat.inc
b/meta/recipes-extended/sysstat/sysstat.inc
index 9085fcfe744..4e297216660 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -6,6 +6,7 @@ SECTION = "console/utils"
SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.xz \
file://99_sysstat \
+ file://sysstat.service \
"
UPSTREAM_CHECK_URI =
"http://sebastien.godard.pagesperso-orange.fr/download.html;
@@ -16,10 +17,9 @@ DEPENDS += "base-passwd"
# autotools-brokensep as this package doesn't use automake
inherit autotools-brokensep gettext systemd upstream-version-is-even
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG ??= ""
PACKAGECONFIG[lm-sensors] =
"--enable-sensors,--disable-sensors,lmsensors,lmsensors-libsensors"
PACKAGECONFIG[cron] = "--enable-install-cron
--enable-copy-only,--disable-install-cron --disable-copy-only"
-PACKAGECONFIG[systemd] =
"--with-systemdsystemunitdir=${systemd_system_unitdir}"
EXTRA_OECONF += "--disable-stripping"
@@ -45,6 +45,10 @@ do_install() {
echo "d ${localstatedir}/log/sa - - - -" \
> ${D}${sysconfdir}/tmpfiles.d/sysstat.conf
fi
+
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_unitdir}/system
+ sed -i -e 's#@LIBDIR@#${libdir}#g'
${D}${systemd_unitdir}/system/sysstat.service
}
pkg_postinst_${PN} () {
diff --git a/meta/recipes-extended/sysstat/sysstat/sysstat.service
b/meta/recipes-extended/sysstat/sysstat/sysstat.service
new file mode 100644
index 000..aff07109f54
--- /dev/null
+++ b/meta/recipes-extended/sysstat/sysstat/sysstat.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Resets System Activity Logs
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+User=root
+ExecStart=@LIBDIR@/sa/sa1 --boot
+
+[Install]
+WantedBy=multi-user.target
+
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] sysstat no longer builds (was: [PATCH 0/1] sysstat: use service file from source codes)
On Fri, 12 Jul 2019 at 12:21, Peter Kjellerstedt wrote: > ERROR: sysstat-12.1.3-r0 do_package: SYSTEMD_SERVICE_sysstat value > sysstat.service does not exist > ERROR: sysstat-12.1.3-r0 do_package: > ERROR: sysstat-12.1.3-r0 do_package: Function failed: > systemd_populate_packages > > This is due to that the upstream package only installs the sysstat.service > file if cron support is enabled, which it isn't by default. > > There was another patch by Haiqing Bai sent on July 2 that seemed to handle > this properly. So the basic problem is that we don't do enough testing with systemd enabled on the AB. Thanks, I'll queue up a revert and pick of the other patch. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 6/6] waf: python2 -> python3
On Fri, 12 Jul 2019 at 11:33, Robert Yang wrote: > > HOSTTOOLS is more complicated and there's still plenty of pieces that > > use host python. I've an old poky-contrib:ross/nopy2 branch that > > fixes a few more users of host python2 that needs rebasing and > > retesting. > > I meant remove python2 from HOSTTOOLS, but it seems not easy to do atm, so > maybe > we still need keep it for many years. I have this idea is because host such as > Redhat Linux 8 doesn't install python2 by default any more. I left a world build going last night, some more fixes in nopy2. There's still about 10 recipes failing. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] sysstat no longer builds (was: [PATCH 0/1] sysstat: use service file from source codes)
[ I cannot find the actual patch in my mailbox, which is why I am replying to the cover letter. ] > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org > On Behalf Of Chen Qi > Sent: den 9 juli 2019 07:53 > To: openembedded-core@lists.openembedded.org > Subject: [OE-core] [PATCH 0/1] sysstat: use service file from source codes > > *** BLURB HERE *** > The following changes since commit 4a68a44f56c725914cfa721993a2ea8a3dc6ebd5: > > cve-update-db: Catch request.urlopen errors. (2019-07-05 12:00:20 +0100) > > are available in the git repository at: > > git://git.pokylinux.org/poky-contrib ChenQi/sysstat-systemd > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/sysstat-systemd > > Chen Qi (1): > sysstat: use service file from source codes > > meta/recipes-extended/sysstat/sysstat.inc | 8 ++-- > meta/recipes-extended/sysstat/sysstat/sysstat.service | 12 > 2 files changed, 2 insertions(+), 18 deletions(-) > delete mode 100644 meta/recipes-extended/sysstat/sysstat/sysstat.service > > -- > 1.9.1 I do not know how this was tested, but it is no longer possible to build sysstat after this change was integrated. I now get the following when I build it: ERROR: sysstat-12.1.3-r0 do_package: SYSTEMD_SERVICE_sysstat value sysstat.service does not exist ERROR: sysstat-12.1.3-r0 do_package: ERROR: sysstat-12.1.3-r0 do_package: Function failed: systemd_populate_packages This is due to that the upstream package only installs the sysstat.service file if cron support is enabled, which it isn't by default. There was another patch by Haiqing Bai sent on July 2 that seemed to handle this properly. //Peter -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 6/6] waf: python2 -> python3
On 7/11/19 6:46 PM, Burton, Ross wrote: On Thu, 11 Jul 2019 at 11:26, Burton, Ross wrote: On Thu, 11 Jul 2019 at 03:59, Robert Yang wrote: On 6/28/19 8:15 PM, Burton, Ross wrote: Did you just do the minimum required, or take a new copy of waf from upstream? (https://gitlab.com/ita1024/waf/) I checked the one from upstream, it is still python2. The waf is the only one which still requires python2 in oe-core. We can get rid of python2 after this patch, what's your opinion, please? If that's the case then YES YES YES. :) Follow-up: do you mean remove python2 from HOSTTOOLS, or the recipe from oe-core? $ bitbake -g world $ grep -- '-> "python"' recipe-depends.dot "kernel-devsrc" -> "python" "ltp" -> "python" "meta-world-pkgdata" -> "python" "packagegroup-core-tools-profile" -> "python" "packagegroup-core-tools-testapps" -> "python" "packagegroup-self-hosted" -> "python" "perf" -> "python" "python-nose" -> "python" "python-numpy" -> "python" "python-scons" -> "python" "python-setuptools" -> "python" Nothing depends on the python-* in core, we can ignore the packagegroups, so that leaves kernel-devsrc, ltp, and perf. Also u-boot uses nativepython. HOSTTOOLS is more complicated and there's still plenty of pieces that use host python. I've an old poky-contrib:ross/nopy2 branch that fixes a few more users of host python2 that needs rebasing and retesting. I meant remove python2 from HOSTTOOLS, but it seems not easy to do atm, so maybe we still need keep it for many years. I have this idea is because host such as Redhat Linux 8 doesn't install python2 by default any more. // Robert Ross Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] glibc-package.inc: Do not use bitbake variable syntax for shell variables
Using bitbake variable syntax (i.e., ${FOO}) for shell variables is
bad practice. First of all it is confusing, but more importantly it
can lead to weird problems if someone actually defines a bitbake
variable with the same name as the shell variable.
Also correct the indentation in stash_locale_cleanup().
Signed-off-by: Peter Kjellerstedt
---
meta/recipes-core/glibc/glibc-package.inc | 48 +++
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/meta/recipes-core/glibc/glibc-package.inc
b/meta/recipes-core/glibc/glibc-package.inc
index 5cfb1b6ab9..b150a34378 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -161,34 +161,34 @@ bashscripts = "mtrace sotruss xtrace"
do_stash_locale () {
dest=${LOCALESTASH}
- install -d ${dest}${base_libdir} ${dest}${bindir} ${dest}${libdir}
${dest}${datadir}
+ install -d $dest${base_libdir} $dest${bindir} $dest${libdir}
$dest${datadir}
# Hide away the locale data from the deployment
if [ -e ${D}${bindir}/localedef ]; then
- cp -a ${D}${bindir}/localedef ${dest}${bindir}
+ cp -a ${D}${bindir}/localedef $dest${bindir}
fi
if [ -e ${D}${libdir}/gconv ]; then
- cp -a ${D}${libdir}/gconv ${dest}${libdir}
+ cp -a ${D}${libdir}/gconv $dest${libdir}
fi
if [ -e ${D}${datadir}/i18n ]; then
- cp -a ${D}${datadir}/i18n ${dest}${datadir}
+ cp -a ${D}${datadir}/i18n $dest${datadir}
fi
# Make a copy of all the libraries into the locale stash
- cp -fpPR ${D}${libdir}/* ${dest}${libdir}
+ cp -fpPR ${D}${libdir}/* $dest${libdir}
if [ "${base_libdir}" != "${libdir}" ]; then
- cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir}
+ cp -fpPR ${D}${base_libdir}/* $dest${base_libdir}
fi
if [ -e ${D}${exec_prefix}/lib ]; then
if [ ${exec_prefix}/lib != ${base_libdir} ] && [
${exec_prefix}/lib != ${libdir} ]; then
- cp -fpPR ${D}${exec_prefix}/lib ${dest}${exec_prefix}
+ cp -fpPR ${D}${exec_prefix}/lib $dest${exec_prefix}
fi
fi
- cp -fpPR ${D}${datadir}/* ${dest}${datadir}
+ cp -fpPR ${D}${datadir}/* $dest${datadir}
rm -rf ${D}${datadir}/locale/
- cp -fpPR ${WORKDIR}/SUPPORTED ${dest}
+ cp -fpPR ${WORKDIR}/SUPPORTED $dest
- target=${dest}/scripts
+ target=$dest/scripts
mkdir -p $target
for i in ${bashscripts}; do
if [ -f ${D}${bindir}/$i ]; then
@@ -216,23 +216,23 @@ stash_locale_cleanup () {
cleanupdir=$1
# Remove all files which do_stash_locale() copies
for i in ${bashscripts}; do
- rm -f ${cleanupdir}${bindir}/$i
+ rm -f $cleanupdir${bindir}/$i
done
- rm -f ${cleanupdir}${bindir}/localedef
- rm -rf ${cleanupdir}${datadir}/i18n
- rm -rf ${cleanupdir}${libdir}/gconv
- rm -rf ${cleanupdir}/${localedir}
- rm -rf ${cleanupdir}${datadir}/locale
+ rm -f $cleanupdir${bindir}/localedef
+ rm -rf $cleanupdir${datadir}/i18n
+ rm -rf $cleanupdir${libdir}/gconv
+ rm -rf $cleanupdir${localedir}
+ rm -rf $cleanupdir${datadir}/locale
if [ "${libdir}" != "${exec_prefix}/lib" ] && [ "${root_prefix}/lib" !=
"${exec_prefix}/lib" ]; then
- if [ -d "${cleanupdir}${exec_prefix}/lib" ]; then
- if [ -z "${ARCH_DYNAMIC_LOADER}" -o \
-! -e
"${cleanupdir}${exec_prefix}/lib/${ARCH_DYNAMIC_LOADER}" ]; then
- # error out if directory isn't empty
- # this dir should only contain locale dir
- # which has been deleted in the previous step
- rmdir ${cleanupdir}${exec_prefix}/lib
+ if [ -d "$cleanupdir${exec_prefix}/lib" ]; then
+ if [ -z "${ARCH_DYNAMIC_LOADER}" -o \
+! -e
"$cleanupdir${exec_prefix}/lib/${ARCH_DYNAMIC_LOADER}" ]; then
+ # error out if directory isn't empty
+ # this dir should only contain locale dir
+ # which has been deleted in the previous step
+ rmdir $cleanupdir${exec_prefix}/lib
+ fi
fi
- fi
fi
}
--
2.21.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-core][PATCH 1/1] libtool: allow for use of reproducible_build bbclass
On Fri, Jul 12, 2019 at 09:33:59AM +0100, Burton, Ross wrote: > On Fri, 12 Jul 2019 at 07:30, Adrian Bunk wrote: > > Debian has already done a lot of work regarding reproducible, > > so checking there for existing patches first is always a good idea. > > To expand on this for people who don't know how to mine Debian: first, > identify the source package. In this case it's libtool but otherwise > you can search packages.debian.org. Then search > https://sources.debian.org/patches for libtool and you find > https://sources.debian.org/patches/libtool/2.4.6-10/no_hostname.patch/. Another useful resource is https://tracker.debian.org/ https://tracker.debian.org/pkg/libtool has some useful links, e.g. "browse source code" (links to sources.debian.org) or "reproducibility" (see if it is reproducible in Debian unstable). > Ross cu 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
[OE-core] [PATCH 2/2] rpm.py: move test_rpm_query_nonroot test case to RpmBasicTest
The test_rpm_query_nonroot test case was in RpmInstallRemoveTest.
But it should logically belong to RpmBasicTest. So move it there.
Signed-off-by: Chen Qi
---
meta/lib/oeqa/runtime/cases/rpm.py | 59 +++---
1 file changed, 30 insertions(+), 29 deletions(-)
diff --git a/meta/lib/oeqa/runtime/cases/rpm.py
b/meta/lib/oeqa/runtime/cases/rpm.py
index 2b45d34..8e18b42 100644
--- a/meta/lib/oeqa/runtime/cases/rpm.py
+++ b/meta/lib/oeqa/runtime/cases/rpm.py
@@ -30,35 +30,6 @@ class RpmBasicTest(OERuntimeTestCase):
msg = 'status and output: %s and %s' % (status, output)
self.assertEqual(status, 0, msg=msg)
-class RpmInstallRemoveTest(OERuntimeTestCase):
-
-@classmethod
-def setUpClass(cls):
-pkgarch = cls.td['TUNE_PKGARCH'].replace('-', '_')
-rpmdir = os.path.join(cls.tc.td['DEPLOY_DIR'], 'rpm', pkgarch)
-# Pick base-passwd-doc as a test file to get installed, because it's
small
-# and it will always be built for standard targets
-rpm_doc = 'base-passwd-doc-*.%s.rpm' % pkgarch
-if not os.path.exists(rpmdir):
-return
-for f in fnmatch.filter(os.listdir(rpmdir), rpm_doc):
-cls.test_file = os.path.join(rpmdir, f)
-cls.dst = '/tmp/base-passwd-doc.rpm'
-
-@OETestDepends(['rpm.RpmBasicTest.test_rpm_query'])
-def test_rpm_install(self):
-self.tc.target.copyTo(self.test_file, self.dst)
-status, output = self.target.run('rpm -ivh /tmp/base-passwd-doc.rpm')
-msg = 'Failed to install base-passwd-doc package: %s' % output
-self.assertEqual(status, 0, msg=msg)
-self.tc.target.run('rm -f %s' % self.dst)
-
-@OETestDepends(['rpm.RpmInstallRemoveTest.test_rpm_install'])
-def test_rpm_remove(self):
-status,output = self.target.run('rpm -e base-passwd-doc')
-msg = 'Failed to remove base-passwd-doc package: %s' % output
-self.assertEqual(status, 0, msg=msg)
-
@OETestDepends(['rpm.RpmBasicTest.test_rpm_query'])
def test_rpm_query_nonroot(self):
@@ -105,6 +76,36 @@ class RpmInstallRemoveTest(OERuntimeTestCase):
finally:
unset_up_test_user(tuser)
+
+class RpmInstallRemoveTest(OERuntimeTestCase):
+
+@classmethod
+def setUpClass(cls):
+pkgarch = cls.td['TUNE_PKGARCH'].replace('-', '_')
+rpmdir = os.path.join(cls.tc.td['DEPLOY_DIR'], 'rpm', pkgarch)
+# Pick base-passwd-doc as a test file to get installed, because it's
small
+# and it will always be built for standard targets
+rpm_doc = 'base-passwd-doc-*.%s.rpm' % pkgarch
+if not os.path.exists(rpmdir):
+return
+for f in fnmatch.filter(os.listdir(rpmdir), rpm_doc):
+cls.test_file = os.path.join(rpmdir, f)
+cls.dst = '/tmp/base-passwd-doc.rpm'
+
+@OETestDepends(['rpm.RpmBasicTest.test_rpm_query'])
+def test_rpm_install(self):
+self.tc.target.copyTo(self.test_file, self.dst)
+status, output = self.target.run('rpm -ivh /tmp/base-passwd-doc.rpm')
+msg = 'Failed to install base-passwd-doc package: %s' % output
+self.assertEqual(status, 0, msg=msg)
+self.tc.target.run('rm -f %s' % self.dst)
+
+@OETestDepends(['rpm.RpmInstallRemoveTest.test_rpm_install'])
+def test_rpm_remove(self):
+status,output = self.target.run('rpm -e base-passwd-doc')
+msg = 'Failed to remove base-passwd-doc package: %s' % output
+self.assertEqual(status, 0, msg=msg)
+
@OETestDepends(['rpm.RpmInstallRemoveTest.test_rpm_remove'])
def test_check_rpm_install_removal_log_file_size(self):
"""
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] rpm.py: two fixes
The following changes since commit 80ab79168ede2786868cbd354f0950c949f73527: gnome-themes-standard: remove (2019-07-11 09:32:50 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib ChenQi/runtime-rpm http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/runtime-rpm Chen Qi (2): rpm.py: ensure no user process running before deleting user rpm.py: move test_rpm_query_nonroot test case to RpmBasicTest meta/lib/oeqa/runtime/cases/rpm.py | 74 +++--- 1 file changed, 45 insertions(+), 29 deletions(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] rpm.py: ensure no user process running before deleting user
In case of systemd, `su -c 'xxx' test1' via ssh will create
several processes owned by test1, e.g. /lib/system/systemd --user.
These processes are actually managed by user@UID.service
(e.g. user@1000.service). And such service is managed
automatically by systemd. In other words, it will be cleaned
up by systemd automatically.
So we need to wait for systemd to clean it up before trying to
use `userdel' to delete the user.
Signed-off-by: Chen Qi
---
meta/lib/oeqa/runtime/cases/rpm.py | 15 +++
1 file changed, 15 insertions(+)
diff --git a/meta/lib/oeqa/runtime/cases/rpm.py
b/meta/lib/oeqa/runtime/cases/rpm.py
index d8cabd3..2b45d34 100644
--- a/meta/lib/oeqa/runtime/cases/rpm.py
+++ b/meta/lib/oeqa/runtime/cases/rpm.py
@@ -4,6 +4,7 @@
import os
import fnmatch
+import time
from oeqa.runtime.case import OERuntimeTestCase
from oeqa.core.decorator.depends import OETestDepends
@@ -77,7 +78,21 @@ class RpmInstallRemoveTest(OERuntimeTestCase):
msg = 'status: %s. Cannot run rpm -qa: %s' % (status, output)
self.assertEqual(status, 0, msg=msg)
+def check_no_process_for_user(u):
+_, output = self.target.run(self.tc.target_cmds['ps'])
+if u + ' ' in output:
+return False
+else:
+return True
+
def unset_up_test_user(u):
+# ensure no test1 process in running
+timeout = time.time() + 30
+while time.time() < timeout:
+if check_no_process_for_user(u):
+break
+else:
+time.sleep(1)
status, output = self.target.run('userdel -r %s' % u)
msg = 'Failed to erase user: %s' % output
self.assertTrue(status == 0, msg=msg)
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-core][PATCH 1/1] libtool: allow for use of reproducible_build bbclass
On Fri, 12 Jul 2019 at 07:30, Adrian Bunk wrote: > Debian has already done a lot of work regarding reproducible, > so checking there for existing patches first is always a good idea. To expand on this for people who don't know how to mine Debian: first, identify the source package. In this case it's libtool but otherwise you can search packages.debian.org. Then search https://sources.debian.org/patches for libtool and you find https://sources.debian.org/patches/libtool/2.4.6-10/no_hostname.patch/. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] ninja: use Python 3
Bug closed as 'python' doesn't have to mean Python 2. We'll use use python3 to start the bootstrap ourself. On Fri, 12 Jul 2019 at 08:49, Burton, Ross wrote: > > On Fri, 12 Jul 2019 at 01:54, Khem Raj wrote: > > Maybe we should encode it in interpreter section inside configure.py > > itself and upstream it. > > I've filed a bug (https://github.com/ninja-build/ninja/issues/1601) to > see if they have any strong reasons to stick with python instead of > python3. > > Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] llvm: fix link error for powerpc
On Fri, 2019-07-12 at 16:11 +0800, ChenQi wrote: > I'm recently getting llvm build failure on qemuppc. After reverting > this > patch, the build succeeds. > My host is ubuntu16.04. > > I'm also wondering why autobuilder does not detect the build failure. > No > world build for qemuppc? There is no world build for ppc or mips. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for Remove remnants of bluez4 support
== Series Details == Series: Remove remnants of bluez4 support Revision: 1 URL : https://patchwork.openembedded.org/series/18642/ 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: * PatchRemove remnants of bluez4 support Issue Shortlog does not follow expected format [test_shortlog_format] Suggested fixCommit shortlog (first line of commit message) should follow the format ": " If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] llvm: fix link error for powerpc
I'm recently getting llvm build failure on qemuppc. After reverting this
patch, the build succeeds.
My host is ubuntu16.04.
I'm also wondering why autobuilder does not detect the build failure. No
world build for qemuppc?
Best Regards,
Chen Qi
On 04/02/2019 08:43 AM, changqing...@windriver.com wrote:
From: Changqing Li
fix below link error for powerpc
lib/libLLVMSupport.a(CommandLine.cpp.o): in function
`llvm::cl::opt_storage<(anonymous namespace):
:HelpPrinterWrapper, true, true>::setLocation(llvm::cl::Option&, (anonymous
namespace)::HelpPrinterWrapper&) [clone .isra.189]':
/usr/src/debug/llvm/8.0-r0/git/llvm/include/llvm/Support/CommandLine.h:1218:(.text.startup+0x5c):
relocation truncated to fit: R_PPC_PLTREL24 against symbol `llvm::errs()'
defined in .text section in lib/libLLVMSupport.a(raw_ostream.cpp.o)+8000
lib/libLLVMSupport.a(CommandLine.cpp.o): in function `setLocation':
Signed-off-by: Changqing Li
---
meta/recipes-devtools/llvm/llvm_git.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb
b/meta/recipes-devtools/llvm/llvm_git.bb
index d2ea927..a35ea4a 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -88,6 +88,8 @@ EXTRA_OECMAKE_append_class-nativesdk = "\
-DLLVM_CONFIG_PATH=${STAGING_BINDIR_NATIVE}/llvm-config${PV} \
"
+CXXFLAGS_append_class-target_powerpc = " -mlongcall"
+
do_configure_prepend() {
# Fix paths in llvm-config
sed -i
"s|sys::path::parent_path(CurrentPath))\.str()|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|g"
${S}/tools/llvm-config/llvm-config.cpp
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Remove remnants of bluez4 support
On Fri, Jul 12, 2019 at 10:48:13AM +0300, Adrian Bunk wrote:
> bluez4 was removed from meta-oe 2 years ago.
>
> Simplfy the setup of the two level bluetooth and bluez4/bluez5
> distro features by removing the bluez4/bluez5 distro features.
>
> This also removes the no longer required bluetooth class.
>
> Signed-off-by: Adrian Bunk
> ---
> Documentation changes will be sent separately.
> Users in meta-openembedded have already been fixed.
> ---
> meta/classes/bluetooth.bbclass | 14 --
> meta/conf/bitbake.conf | 2 +-
> meta/conf/distro/include/default-providers.inc | 2 +-
> meta/recipes-connectivity/bluez5/bluez5_5.50.bb| 2 --
> meta/recipes-connectivity/connman/connman.inc | 4 ++--
> meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb | 4 ++--
> meta/recipes-connectivity/neard/neard_0.16.bb | 4 ++--
> meta/recipes-connectivity/ofono/ofono.inc | 4 ++--
> .../packagegroups/packagegroup-base.bb | 4 +---
> meta/recipes-devtools/qemu/qemu.inc| 4 ++--
> meta/recipes-devtools/strace/strace_4.26.bb| 4 ++--
> .../gstreamer/gstreamer1.0-plugins-bad_1.16.0.bb | 4 ++--
> meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 5 ++---
> 13 files changed, 19 insertions(+), 38 deletions(-)
> delete mode 100644 meta/classes/bluetooth.bbclass
>
> diff --git a/meta/classes/bluetooth.bbclass b/meta/classes/bluetooth.bbclass
> deleted file mode 100644
> index f88b4ae5b8..00
> --- a/meta/classes/bluetooth.bbclass
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -# Avoid code duplication in bluetooth-dependent recipes.
> -
> -# Define a variable that expands to the recipe (package) providing core
> -# bluetooth support on the platform:
> -# "" if bluetooth is not in DISTRO_FEATURES
> -# else "bluez5" if bluez5 is in DISTRO_FEATURES
> -# else "bluez4"
> -
> -# Use this with:
> -# inherit bluetooth
> -# PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth',
> '${BLUEZ}', '', d)}
> -# PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4"
> -
> -BLUEZ ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth',
> bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5', 'bluez4', d), '',
> d)}"
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 5e93f5c223..140f45b895 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -839,7 +839,7 @@ DISTRO_FEATURES_NATIVESDK ?= "x11"
> DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation"
> DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation"
>
> -DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5
> gobject-introspection-data ldconfig"
> +DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data
> ldconfig"
> MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
>
> COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES',
> 'MACHINE_FEATURES', d)}"
> diff --git a/meta/conf/distro/include/default-providers.inc
> b/meta/conf/distro/include/default-providers.inc
> index 2be3378773..7d3be8f4e1 100644
> --- a/meta/conf/distro/include/default-providers.inc
> +++ b/meta/conf/distro/include/default-providers.inc
> @@ -44,7 +44,7 @@ PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg"
> PREFERRED_PROVIDER_console-tools ?= "kbd"
> PREFERRED_PROVIDER_gzip-native ?= "pigz-native"
> PREFERRED_PROVIDER_udev ?=
> "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}"
> -PREFERRED_RPROVIDER_bluez-hcidump ?=
> "${@bb.utils.contains('DISTRO_FEATURES','bluetooth
> bluez5','bluez5','bluez-hcidump',d)}"
> +PREFERRED_RPROVIDER_bluez-hcidump ?=
> "${@bb.utils.contains('DISTRO_FEATURES','bluetooth','bluez5','bluez-hcidump',d)}"
Is this still needed?
With all remnants of bluez4 gone, bluez-hcidump is probably rprovided
only by bluez5 now.
> # Alternative is ltp-ddt in meta-oe:
> meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb
> PREFERRED_PROVIDER_ltp ?= "ltp"
> PREFERRED_PROVIDER_getopt ?= "util-linux-getopt"
> diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.50.bb
> b/meta/recipes-connectivity/bluez5/bluez5_5.50.bb
> index 66271432fe..4e443e5fb0 100644
> --- a/meta/recipes-connectivity/bluez5/bluez5_5.50.bb
> +++ b/meta/recipes-connectivity/bluez5/bluez5_5.50.bb
> @@ -1,7 +1,5 @@
> require bluez5.inc
>
> -REQUIRED_DISTRO_FEATURES = "bluez5"
> -
> SRC_URI[md5sum] = "8e35c67c81a55d3ad4c9f22280dae178"
> SRC_URI[sha256sum] =
> "5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911"
>
> diff --git a/meta/recipes-connectivity/connman/connman.inc
> b/meta/recipes-connectivity/connman/connman.inc
> index ae67079c71..ee00479926 100644
> --- a/meta/recipes-connectivity/connman/connman.inc
> +++ b/meta/recipes-connectivity/connman/connman.inc
> @@ -13,7 +13,7 @@ LICENSE = "GPLv2"
> LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
>
>
Re: [OE-core] [PATCH] ninja: use Python 3
On Fri, 12 Jul 2019 at 01:54, Khem Raj wrote: > Maybe we should encode it in interpreter section inside configure.py > itself and upstream it. I've filed a bug (https://github.com/ninja-build/ninja/issues/1601) to see if they have any strong reasons to stick with python instead of python3. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Remove remnants of bluez4 support
bluez4 was removed from meta-oe 2 years ago.
Simplfy the setup of the two level bluetooth and bluez4/bluez5
distro features by removing the bluez4/bluez5 distro features.
This also removes the no longer required bluetooth class.
Signed-off-by: Adrian Bunk
---
Documentation changes will be sent separately.
Users in meta-openembedded have already been fixed.
---
meta/classes/bluetooth.bbclass | 14 --
meta/conf/bitbake.conf | 2 +-
meta/conf/distro/include/default-providers.inc | 2 +-
meta/recipes-connectivity/bluez5/bluez5_5.50.bb| 2 --
meta/recipes-connectivity/connman/connman.inc | 4 ++--
meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb | 4 ++--
meta/recipes-connectivity/neard/neard_0.16.bb | 4 ++--
meta/recipes-connectivity/ofono/ofono.inc | 4 ++--
.../packagegroups/packagegroup-base.bb | 4 +---
meta/recipes-devtools/qemu/qemu.inc| 4 ++--
meta/recipes-devtools/strace/strace_4.26.bb| 4 ++--
.../gstreamer/gstreamer1.0-plugins-bad_1.16.0.bb | 4 ++--
meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 5 ++---
13 files changed, 19 insertions(+), 38 deletions(-)
delete mode 100644 meta/classes/bluetooth.bbclass
diff --git a/meta/classes/bluetooth.bbclass b/meta/classes/bluetooth.bbclass
deleted file mode 100644
index f88b4ae5b8..00
--- a/meta/classes/bluetooth.bbclass
+++ /dev/null
@@ -1,14 +0,0 @@
-# Avoid code duplication in bluetooth-dependent recipes.
-
-# Define a variable that expands to the recipe (package) providing core
-# bluetooth support on the platform:
-# "" if bluetooth is not in DISTRO_FEATURES
-# else "bluez5" if bluez5 is in DISTRO_FEATURES
-# else "bluez4"
-
-# Use this with:
-# inherit bluetooth
-# PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth',
'${BLUEZ}', '', d)}
-# PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4"
-
-BLUEZ ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth',
bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5', 'bluez4', d), '', d)}"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 5e93f5c223..140f45b895 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -839,7 +839,7 @@ DISTRO_FEATURES_NATIVESDK ?= "x11"
DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation"
DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation"
-DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5
gobject-introspection-data ldconfig"
+DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data
ldconfig"
MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES',
'MACHINE_FEATURES', d)}"
diff --git a/meta/conf/distro/include/default-providers.inc
b/meta/conf/distro/include/default-providers.inc
index 2be3378773..7d3be8f4e1 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -44,7 +44,7 @@ PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg"
PREFERRED_PROVIDER_console-tools ?= "kbd"
PREFERRED_PROVIDER_gzip-native ?= "pigz-native"
PREFERRED_PROVIDER_udev ?=
"${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}"
-PREFERRED_RPROVIDER_bluez-hcidump ?=
"${@bb.utils.contains('DISTRO_FEATURES','bluetooth
bluez5','bluez5','bluez-hcidump',d)}"
+PREFERRED_RPROVIDER_bluez-hcidump ?=
"${@bb.utils.contains('DISTRO_FEATURES','bluetooth','bluez5','bluez-hcidump',d)}"
# Alternative is ltp-ddt in meta-oe:
meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb
PREFERRED_PROVIDER_ltp ?= "ltp"
PREFERRED_PROVIDER_getopt ?= "util-linux-getopt"
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.50.bb
b/meta/recipes-connectivity/bluez5/bluez5_5.50.bb
index 66271432fe..4e443e5fb0 100644
--- a/meta/recipes-connectivity/bluez5/bluez5_5.50.bb
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.50.bb
@@ -1,7 +1,5 @@
require bluez5.inc
-REQUIRED_DISTRO_FEATURES = "bluez5"
-
SRC_URI[md5sum] = "8e35c67c81a55d3ad4c9f22280dae178"
SRC_URI[sha256sum] =
"5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911"
diff --git a/meta/recipes-connectivity/connman/connman.inc
b/meta/recipes-connectivity/connman/connman.inc
index ae67079c71..ee00479926 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -13,7 +13,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36"
-inherit autotools pkgconfig systemd update-rc.d bluetooth update-alternatives
+inherit autotools pkgconfig systemd update-rc.d update-alternatives
DEPENDS = "dbus glib-2.0 ppp readline"
@@ -42,7 +42,7 @@ PACKAGECONFIG ??= "wispr \
PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/
[OE-core] [PATCH 1/1] qemurunner.py: fix race condition at qemu startup
When handling pid file, qemu would first create the file, stat it,
lock it and then write actually contents to it.
So it's possbile that when reading the pid file, the content is empty.
[YOCTO #13390]
Signed-off-by: Chen Qi
---
meta/lib/oeqa/utils/qemurunner.py | 21 ++---
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/meta/lib/oeqa/utils/qemurunner.py
b/meta/lib/oeqa/utils/qemurunner.py
index c16227f..68684ae 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -425,13 +425,20 @@ class QemuRunner:
if not self.runqemu or self.runqemu.poll() is not None:
return False
if os.path.isfile(self.qemu_pidfile):
-f = open(self.qemu_pidfile, 'r')
-qemu_pid = f.read()
-f.close()
-qemupid = int(qemu_pid)
-if os.path.exists("/proc/" + str(qemupid)):
-self.qemupid = qemupid
-return True
+# when handling pidfile, qemu creates the file, stat it, lock it
and then write to it
+# so it's possible that the file has been created but the content
is empty
+pidfile_timeout = time.time() + 3
+while time.time() < pidfile_timeout:
+with open(self.qemu_pidfile, 'r') as f:
+qemu_pid = f.read().strip()
+# file created but not yet written contents
+if not qemu_pid:
+time.sleep(0.5)
+continue
+else:
+if os.path.exists("/proc/" + qemu_pid):
+self.qemupid = int(qemu_pid)
+return True
return False
def run_serial(self, command, raw=False, timeout=60):
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] qemurunner.py: fix race condition at qemu startup
*** BLURB HERE *** The following changes since commit 80ab79168ede2786868cbd354f0950c949f73527: gnome-themes-standard: remove (2019-07-11 09:32:50 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib ChenQi/qemurunner-race http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/qemurunner-race Chen Qi (1): qemurunner.py: fix race condition at qemu startup meta/lib/oeqa/utils/qemurunner.py | 21 ++--- 1 file changed, 14 insertions(+), 7 deletions(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-core][PATCH 1/1] libtool: allow for use of reproducible_build bbclass
On Fri, Jul 12, 2019 at 01:51:26AM +, Slater, Joseph wrote: > That's a question I have about things like this, where some information seems > of minimal use, but is there and is now malignant. Chuck it or modify it to > be benign. All such patches should be submitted upstream, and the final decision for that would be whatever upstream prefers. If in doubt, I would start with whatever is the simplest correct change. It is unlikely that someone will insist on keeping marginally relevant information like in this case. Debian has already done a lot of work regarding reproducible, so checking there for existing patches first is always a good idea. > Joe cu 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
