* Re: Yocto-2.2 build failures on Ubuntu 14.04.5 & 16.04.x hosts due to crash of unity-settings-daemon followed by restart of lightdm
From: Richard Purdie @ 2016-12-27 16:49 UTC (permalink / raw)
To: srikanth krishnakar; +Cc: openembedded-core
In-Reply-To: <CALDxG5ihGZU3f4ipau1nm19_p-C+XRTGxq71OvapTC6J4-8yMQ@mail.gmail.com>
On Tue, 2016-12-27 at 15:18 +0530, srikanth krishnakar wrote:
> Hello Richard,
>
> I was under impression that installing Ubuntu-14.04.4 (+lastest
> updates) would give me stable build environment, unfortunately that
> is not the case ! I could see the logout issue on this installation
> too. So I believe that issue should be reproducible on any 14.04.x
> installation including 16.04.x with all latest updates installed. The
> second attempt of build on "Ubuntu-14.04.4" shows the status of
> bitbake as halted at libvorbis when logout happened:
>
> ---------------------------------------------------------
> NOTE: Running task 2460 of 4212 (/home/poky/meta/recipes-
> core/ncurses/ncurses_6.0+20160625.bb:do_packagedata)
> NOTE: recipe ncurses-6.0+20160625-r0: task do_packagedata: Started
> NOTE: recipe ncurses-6.0+20160625-r0: task do_packagedata: Succeeded
> NOTE: Running task 2461 of 4212 (/home/poky/meta/recipes-
> core/readline/readline_6.3.bb:do_package)
> NOTE: recipe libjpeg-turbo-1_1.5.0-r0: task do_package: Succeeded
> NOTE: Running task 2462 of 4212 (/home/poky/meta/recipes-
> graphics/jpeg/libjpeg-turbo_1.5.0.bb:do_packagedata)
> NOTE: recipe libjpeg-turbo-1_1.5.0-r0: task do_packagedata: Started
> NOTE: recipe libjpeg-turbo-1_1.5.0-r0: task do_packagedata: Succeeded
> NOTE: Running task 2463 of 4212 (/home/poky/meta/recipes-
> multimedia/libvorbis/libvorbis_1.3.5.bb:do_package)
> NOTE: recipe readline-6.3-r0: task do_package: Started
> NOTE: recipe libvorbis-1.3.5-r0: task do_package: Started
None of these look particularly suspicios for causing your X session to
die.
Some further questions:
a) Is anything showing in the dmesg logs? Is the OOM killer the thing
which is killing processes?
b) How are you measuring free memory? You mentioned it was low, it
would depend on the disk cache size and swap status too.
c) Have you tried a lower BB_NUMBER_THREADS and lower PARALLEL_MAKE
values to rule out resource problems and perhaps identify more
specifically which task is causing your problem?
As I mentioned previously, this problem should reduce to a specific
recipe+task causing the problem, unless its a general resource issue in
which case the threads/parallel make will stop the problem occurring.
We have autobuilders running various versions of Ubuntu and we don't
notice problems with processes dying, admittedly we don't run X
desktops on them in general though.
Cheers,
Richard
^ permalink raw reply
* Re: [PATCH V2 2/2] opkg-utils: warn if update-alternatives finds priority conflict
From: Alejandro del Castillo @ 2016-12-27 17:12 UTC (permalink / raw)
To: Chen Qi, openembedded-core
In-Reply-To: <95643e3c862b04090093f9806cbd0486ace51013.1482461845.git.Qi.Chen@windriver.com>
Hi Chen,
Could you send the opkg-utils patch to opkg-devel@googlegroups.com too?
I would gladly pull it in
--
Cheers,
Alejandro
On 12/22/2016 08:59 PM, Chen Qi wrote:
> If multiple providers for a utility have the same alternatives priority,
> which one would be chosen is determined by which one is installed later.
> Our alternatives system should be able to detect such problem and warn users
> so that potential problems could be avoided.
>
> Modify update-alternatives to warn users when detecting multiple providers
> with the same priority.
>
> [YOCTO #8314]
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
> ...rnatives-warn-when-multiple-providers-hav.patch | 26 ++++++++++++++++++++++
> meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 3 ++-
> 2 files changed, 28 insertions(+), 1 deletion(-)
> create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-warn-when-multiple-providers-hav.patch
>
> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-warn-when-multiple-providers-hav.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-warn-when-multiple-providers-hav.patch
> new file mode 100644
> index 0000000..afce1e1
> --- /dev/null
> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-warn-when-multiple-providers-hav.patch
> @@ -0,0 +1,26 @@
> +Subject: update-alternatives: warn when multiple providers have the same priority
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> +---
> + update-alternatives | 3 +++
> + 1 file changed, 3 insertions(+)
> +
> +diff --git a/update-alternatives b/update-alternatives
> +index ca01d5d..ffad853 100644
> +--- a/update-alternatives
> ++++ b/update-alternatives
> +@@ -90,6 +90,9 @@ add_alt() {
> + local path="$2"
> + local priority="$3"
> + remove_alt $name $path
> ++ if grep -qw "$priority" $ad/$name; then
> ++ echo "Warn: update-alternatives: $name has multiple providers with the same priority, please check $ad/$name for details"
> ++ fi
> + echo "$path $priority" >> $ad/$name
> + }
> +
> +--
> +2.8.3
> +
> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> index 19a852e..7b01bfc 100644
> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> @@ -10,7 +10,8 @@ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtu
> SRCREV = "3ffece9bf19a844edacc563aa092fd1fbfcffeee"
> PV = "0.3.2+git${SRCPV}"
>
> -SRC_URI = "git://git.yoctoproject.org/opkg-utils"
> +SRC_URI = "git://git.yoctoproject.org/opkg-utils \
> + file://0001-update-alternatives-warn-when-multiple-providers-hav.patch"
> SRC_URI_append_class-native = " file://tar_ignore_error.patch"
>
> S = "${WORKDIR}/git"
>
^ permalink raw reply
* [PATCH 0/2] opkg & opkg-utils upgrade to 0.3.4
From: Alejandro del Castillo @ 2016-12-27 20:49 UTC (permalink / raw)
To: openembedded-core
Alejandro del Castillo (2):
opkg: upgrade to v0.3.4
opkg-utils: bump SRCREV to 0.3.4 tag
...e-defined-bindir-and-mandir-as-installati.patch | 30 ++++++++++++++++++++++
.../opkg-utils/opkg-utils/tar_ignore_error.patch | 2 +-
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 8 +++---
...reate-opkg.lock-in-run-instead-of-var-run.patch | 8 +++---
.../opkg/{opkg_0.3.3.bb => opkg_0.3.4.bb} | 6 +++--
5 files changed, 44 insertions(+), 10 deletions(-)
create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch
rename meta/recipes-devtools/opkg/{opkg_0.3.3.bb => opkg_0.3.4.bb} (88%)
--
2.7.4
^ permalink raw reply
* [PATCH 1/2] opkg: upgrade to v0.3.4
From: Alejandro del Castillo @ 2016-12-27 20:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1482871801-4357-1-git-send-email-alejandro.delcastillo@ni.com>
* Add localstatedir and sysconfdir class-native configure definitions to
override OE default sysroot values.
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
---
...001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch | 8 ++++----
meta/recipes-devtools/opkg/{opkg_0.3.3.bb => opkg_0.3.4.bb} | 6 ++++--
2 files changed, 8 insertions(+), 6 deletions(-)
rename meta/recipes-devtools/opkg/{opkg_0.3.3.bb => opkg_0.3.4.bb} (88%)
diff --git a/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch b/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
index 255021b..e94a412 100644
--- a/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
+++ b/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
@@ -21,10 +21,10 @@ index 7bca948..5a1bc44 100644
--- a/libopkg/opkg_conf.h
+++ b/libopkg/opkg_conf.h
@@ -40,7 +40,7 @@ extern "C" {
- #define OPKG_CONF_DEFAULT_STATUS_FILE "/var/lib/opkg/status"
- #define OPKG_CONF_DEFAULT_CACHE_DIR "/var/cache/opkg"
- #define OPKG_CONF_DEFAULT_CONF_FILE_DIR "/etc/opkg"
--#define OPKG_CONF_DEFAULT_LOCK_FILE "/var/run/opkg.lock"
+ #define OPKG_CONF_DEFAULT_STATUS_FILE VARDIR "/lib/opkg/status"
+ #define OPKG_CONF_DEFAULT_CACHE_DIR VARDIR "/cache/opkg"
+ #define OPKG_CONF_DEFAULT_CONF_FILE_DIR SYSCONFDIR "/opkg"
+-#define OPKG_CONF_DEFAULT_LOCK_FILE VARDIR "/run/opkg.lock"
+#define OPKG_CONF_DEFAULT_LOCK_FILE "/run/opkg.lock"
/* In case the config file defines no dest */
diff --git a/meta/recipes-devtools/opkg/opkg_0.3.3.bb b/meta/recipes-devtools/opkg/opkg_0.3.4.bb
similarity index 88%
rename from meta/recipes-devtools/opkg/opkg_0.3.3.bb
rename to meta/recipes-devtools/opkg/opkg_0.3.4.bb
index bce72fc..5cf2fac 100644
--- a/meta/recipes-devtools/opkg/opkg_0.3.3.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.3.4.bb
@@ -17,8 +17,8 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
"
-SRC_URI[md5sum] = "a4613038c8afc7d8d482f5c53f137bdf"
-SRC_URI[sha256sum] = "19db9e73121a5e4c91fa228b0a6a4c55cc3591056130cfb3c66c30aa32f8d00e"
+SRC_URI[md5sum] = "6c52a065499056a196e0b45a27e392de"
+SRC_URI[sha256sum] = "750b900b53b62a9b280b601a196f02da81091eda2f3478c509512aa5a1ec93be"
inherit autotools pkgconfig systemd
@@ -37,6 +37,8 @@ PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256"
PACKAGECONFIG[pathfinder] = "--enable-pathfinder,--disable-pathfinder,pathfinder"
PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv"
+EXTRA_OECONF_class-native = "--localstatedir=/${@os.path.relpath('${localstatedir}', '${STAGING_DIR_NATIVE}')} --sysconfdir=/${@os.path.relpath('${sysconfdir}', '${STAGING_DIR_NATIVE}')}"
+
do_install_append () {
install -d ${D}${sysconfdir}/opkg
install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf
--
2.7.4
^ permalink raw reply related
* [PATCH 2/2] opkg-utils: bump SRCREV to 0.3.4 tag
From: Alejandro del Castillo @ 2016-12-27 20:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1482871801-4357-1-git-send-email-alejandro.delcastillo@ni.com>
* Add patch that removes hardcoded installation directories.
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
---
...e-defined-bindir-and-mandir-as-installati.patch | 30 ++++++++++++++++++++++
.../opkg-utils/opkg-utils/tar_ignore_error.patch | 2 +-
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 8 +++---
3 files changed, 36 insertions(+), 4 deletions(-)
create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch
new file mode 100644
index 0000000..6259f00
--- /dev/null
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch
@@ -0,0 +1,30 @@
+From af4a6e4666264661769e32874e9654e02e5eb019 Mon Sep 17 00:00:00 2001
+From: Alejandro del Castillo <alejandro.delcastillo@ni.com>
+Date: Thu, 22 Dec 2016 16:15:56 -0600
+Subject: [opkg-utils PATCH] Makefile: use defined bindir and mandir as
+ installation dirs
+
+Upstream-Status: Pending
+
+Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
+---
+ Makefile | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 92b45f1..9f0531c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -5,9 +5,6 @@ UTILS = opkg-build opkg-unbuild opkg-make-index opkg.py opkg-list-fields \
+ MANPAGES = opkg-build.1
+
+ DESTDIR=
+-PREFIX=/usr/local
+-bindir=$(PREFIX)/bin
+-mandir=$(PREFIX)/man
+
+ .SUFFIXES: .1
+
+--
+2.7.4
+
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
index 4dddb08..3824eb3 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
@@ -25,7 +25,7 @@ Index: git/opkg-build
mkdir $tmp_dir
echo $CONTROL > $tmp_dir/tarX
--( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -cz $tarformat -f $tmp_dir/data.tar.gz . )
+-( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -c --$compressor $tarformat -f $tmp_dir/data.tar.$cext . )
-( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f $tmp_dir/control.tar.gz . )
+
+
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 19a852e..457405a 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -7,10 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083"
PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}"
-SRCREV = "3ffece9bf19a844edacc563aa092fd1fbfcffeee"
-PV = "0.3.2+git${SRCPV}"
+SRCREV = "9228b38a81c94bd95ada3a6334404923d67bea66"
+PV = "0.3.4+git${SRCPV}"
-SRC_URI = "git://git.yoctoproject.org/opkg-utils"
+SRC_URI = "git://git.yoctoproject.org/opkg-utils \
+ file://0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch \
+"
SRC_URI_append_class-native = " file://tar_ignore_error.patch"
S = "${WORKDIR}/git"
--
2.7.4
^ permalink raw reply related
* Re: [PATCH 0/9] UEFI + Secure Boot + qemu
From: Ricardo Neri @ 2016-12-28 2:55 UTC (permalink / raw)
To: Patrick Ohly; +Cc: openembedded-core
In-Reply-To: <cover.1482324587.git.patrick.ohly@intel.com>
On Wed, 2016-12-21 at 14:11 +0100, Patrick Ohly wrote:
> There seems to be a consensus that supporting UEFI in OE-core for qemu
> would be valuable, and there have been some (stalled) attempts to add
> it. For reference, see:
> [OE-core] [PATCH V3 0/3] Add UEFI firmware for qemux86*
> [OE-core] Add ovmf-native to make qemu-native/runqemu support boot UEFI image?
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=5654
> https://github.com/01org/luv-yocto/issues/38
>
> This patch set includes the necessary recipes (ovmf and iasl from
> meta-luv), some improvements to them (in particular, enabling Secure
> Boot), and changes to runqemu to make it easier to boot with UEFI. A
> special image recipes builds an image which can be used to lock down a
> virtual machine by enrolling the "normal" pre-installed certificates.
>
> I decided to keep the setup simple and use just a single file for UEFI
> code and variables because that makes the usage via runqemu very
> easy. See the "runqemu: support UEFI with OVMF firmware" patch for
> details. The downside is that the firmware can't be updated without
> loosing variables. I don't see a big need for long-lived virtual
> machine instances, but would like to hear from others about that.
>
> What's missing is automated testing of this new feature. I'm open for
> suggestions here; right now I don't know enough about the automated
> testing in the AB to propose something.
I guess that tests could be written for buildbot. In the LUV buildbot,
we build OVMF as part of our sanity tests for LUV. We do it mostly
because we need to boot some UEFI firmware in qemu, though. We don't
extensively test OVMF. We also build OVMF with Secure Boot separately.
Now that you have kindly written the recipe, we want to leverage it. :)
>
> I've discussed the usage of ovmf/iasl with Ricardo and he agreed that
> moving ovmf and iasl from meta-luv to OE-core makes sense. Ricardo,
> would you be willing to act as maintainer of it there, like you did in
> meta-luv?
Yes, I can keep doing the same work I did in meta-luv for OVMF now in
OE-core.
Thanks and BR,
Ricardo
>
> Beware that "git am --keep-cr" must be used to import the ovmf patches
> correctly.
>
> The following changes since commit 5e21afc9395060b489156d3f90505a372b713f37:
>
> Revert "selftest/wic: extending test coverage for WIC script options" (2016-12-20 17:06:01 +0000)
>
> are available in the git repository at:
>
> git://github.com/pohly/openembedded-core secure-boot
> https://github.com/pohly/openembedded-core/tree/secure-boot
>
> Patrick Ohly (7):
> ovmf: explicitly depend on nasm-native
> ovmf: deploy firmware in image directory
> ovmf_git.bb: enable parallel compilation
> ovmf_git.bb: enable Secure Boot
> runqemu: let command line parameters override defaults
> runqemu: support UEFI with OVMF firmware
> ovmf: build image which enrolls standard keys
>
> meta-luv (2):
> ovmf: move from meta-luv to OE-core
> iasl: move from meta-luv to OE-core
>
> meta/recipes-core/ovmf/ovmf-shell-image.bb | 22 +
> ...s-Force-tools-variables-to-host-toolchain.patch | 48 +
> .../ovmf/0001-OvmfPkg-Enable-BGRT-in-OVMF.patch | 110 ++
> ...0002-ovmf-update-path-to-native-BaseTools.patch | 32 +
> ...makefile-adjust-to-build-in-under-bitbake.patch | 39 +
> ...ollDefaultKeys-application-for-enrolling-.patch | 1123 ++++++++++++++++++++
> meta/recipes-core/ovmf/ovmf/ovmf-shell-image.wks | 4 +
> meta/recipes-core/ovmf/ovmf_git.bb | 178 ++++
> meta/recipes-extended/iasl/iasl_20120215.bb | 27 +
> meta/recipes-extended/iasl/iasl_20150410.bb | 27 +
> meta/recipes-extended/iasl/iasl_20150515.bb | 27 +
> scripts/runqemu | 37 +-
> 12 files changed, 1673 insertions(+), 1 deletion(-)
> create mode 100644 meta/recipes-core/ovmf/ovmf-shell-image.bb
> create mode 100644 meta/recipes-core/ovmf/ovmf/0001-BaseTools-Force-tools-variables-to-host-toolchain.patch
> create mode 100644 meta/recipes-core/ovmf/ovmf/0001-OvmfPkg-Enable-BGRT-in-OVMF.patch
> create mode 100644 meta/recipes-core/ovmf/ovmf/0002-ovmf-update-path-to-native-BaseTools.patch
> create mode 100644 meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
> create mode 100644 meta/recipes-core/ovmf/ovmf/0007-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch
> create mode 100644 meta/recipes-core/ovmf/ovmf/ovmf-shell-image.wks
> create mode 100644 meta/recipes-core/ovmf/ovmf_git.bb
> create mode 100644 meta/recipes-extended/iasl/iasl_20120215.bb
> create mode 100644 meta/recipes-extended/iasl/iasl_20150410.bb
> create mode 100644 meta/recipes-extended/iasl/iasl_20150515.bb
>
> --
> 2.1.4
>
^ permalink raw reply
* Re: [PATCH 0/9] UEFI + Secure Boot + qemu
From: Ricardo Neri @ 2016-12-28 2:56 UTC (permalink / raw)
To: Fathi Boudra; +Cc: openembedded-core
In-Reply-To: <CAGNsrLAhdfQ7KGvBGCtSype2niB7AvqXGtWqFYOVd7e2GqvJfg@mail.gmail.com>
On Wed, 2016-12-21 at 16:19 +0200, Fathi Boudra wrote:
>
> fwiw, I've been maintaining acpica recipe in meta-oe, and will keep an
> eye here as well.
> meta-luv supports both x86* and arm*, and we have an interest in
> having the same features available and working for qemuaarch64.
I was not aware of this. Perhaps there is no need for us to maintain a
separate recipe in meta-luv.
^ permalink raw reply
* Re: [PATCH 1/9] ovmf: move from meta-luv to OE-core
From: Ricardo Neri @ 2016-12-28 2:58 UTC (permalink / raw)
To: Patrick Ohly; +Cc: meta-luv, openembedded-core
In-Reply-To: <dcef684cc3818883cc4a4787396cb79d86379c84.1482324587.git.patrick.ohly@intel.com>
On Wed, 2016-12-21 at 14:11 +0100, Patrick Ohly wrote:
> create mode 100644
> meta/recipes-core/ovmf/ovmf/0001-OvmfPkg-Enable-BGRT-in-OVMF.patch
We added this patch because we were interested in enabling BGRT for our
own Linux kernel testing purposes. I am not sure if this patch is of the
interest of the wider OE-core audience. I would think it does not.
^ permalink raw reply
* Re: [PATCH 2/9] iasl: move from meta-luv to OE-core
From: Ricardo Neri @ 2016-12-28 3:08 UTC (permalink / raw)
To: Patrick Ohly; +Cc: naresh.bhat, meta-luv, openembedded-core
In-Reply-To: <374bb6a728f368a801f961fb524290f205bb4625.1482324587.git.patrick.ohly@intel.com>
On Wed, 2016-12-21 at 14:11 +0100, Patrick Ohly wrote:
> From: meta-luv <luv@lists.01.org>
>
> This is an unmodified copy of
> github.com/01org/luv-yocto/meta-luv/recipes-extended/iasl revision
> 4be4329.
>
> iasl is also provided by the meta-oe layer's acpica recipe. iasl is a
> bit simpler and thus seems more suitable for OE-core.
>
> When the meta-oe layer is active, PREFERRED_PROVIDER_iasl-native must
> be set to avoid a warning. It can be set to "acpica-native" when
> something from acpica besides just iasl is needed.
It would be worth pondering whether to use this recipe or the one that
Fathi Boudra maintains.
^ permalink raw reply
* Re: [PATCH 4/9] ovmf: deploy firmware in image directory
From: Ricardo Neri @ 2016-12-28 3:12 UTC (permalink / raw)
To: Patrick Ohly; +Cc: openembedded-core
In-Reply-To: <ce57b729e9ac830d808040b7e3ff1fc128475420.1482324587.git.patrick.ohly@intel.com>
On Wed, 2016-12-21 at 14:11 +0100, Patrick Ohly wrote:
> When used with '-drive if=pflash', qemu will store UEFI variables
> inside the firmware image file. That is unexpected for a file located
> in
> the sysroot, which should be read-only, while it is normal for image
> files in the deploy/images directory. Therefore that directory is a
> better place for use with runqemu.
>
> The name was chose so that "runqemu ovmf" can be used as shorthand for
> "runqemu <full path>/ovmf.qcow2" by treating "ovmf" as the base name
> of the BIOS file. "ovmf_secboot.qcow2" is meant to be used for the
> Secure Boot enabled BIOS. qcow2 is used because it is needed for
> "savevm" snapshots of a virtual machine.
>
> Alternatively, OVMF_CODE.fd (read-only) and OVMF_VARS.fd (read/write)
> could be used. That would then allow updating the firmware of an
> existing machine without wiping out the variables set
> earlier. Configuring that in qemu would be more complicated, so for
> now the simpler approach with combined code and variable store is
> used.
This looks good to me!
^ permalink raw reply
* Re: [PATCH 5/9] ovmf_git.bb: enable parallel compilation
From: Ricardo Neri @ 2016-12-28 3:17 UTC (permalink / raw)
To: Patrick Ohly; +Cc: openembedded-core
In-Reply-To: <3b1fda1a385e78c1ef5692b123fafd66078a2a5e.1482324587.git.patrick.ohly@intel.com>
On Wed, 2016-12-21 at 14:11 +0100, Patrick Ohly wrote:
> The Fedora srpm [1] seems to have no problems with parallel
> compilation, so let's also use that for the target. The native
> tools however indeed have dependency problems:
True. It is good to paralize what we can. This also looks good to me.
^ permalink raw reply
* Re: [PATCH V2 2/2] opkg-utils: warn if update-alternatives finds priority conflict
From: ChenQi @ 2016-12-28 3:29 UTC (permalink / raw)
To: Alejandro del Castillo, openembedded-core
In-Reply-To: <3e663ecd-0b33-5374-74bf-454d546ea6e2@ni.com>
On 12/28/2016 01:12 AM, Alejandro del Castillo wrote:
> Hi Chen,
>
> Could you send the opkg-utils patch to opkg-devel@googlegroups.com too?
>
> I would gladly pull it in
>
Done.
Thanks for reminding me about it.
Best Regards,
Chen Qi
^ permalink raw reply
* Re: [PATCH v2 0/1] kexec-tools: Upgrade to 2.0.14
From: Alexander Kanavin @ 2016-12-28 12:15 UTC (permalink / raw)
To: zhe.he, openembedded-core; +Cc: Purdie, Richard
In-Reply-To: <cover.1482820791.git.zhe.he@windriver.com>
On 12/27/2016 08:43 AM, zhe.he@windriver.com wrote:
> From: He Zhe <zhe.he@windriver.com>
>
> Remove kexec-aarch64.patch since it has been merged upstream
> Remove kexec-x32.patch since it has been reverted upstream
> Backport patches for kdump arm64 from:
> https://git.linaro.org/people/takahiro.akashi/kexec-tools.git
>
> v1 to v2: Remove redundant tarball link in SRC_URI
None of my comments are addressed in this new version of the patch.
Specifically:
> Remove kexec-aarch64.patch since it has been merged upstream
> Remove kexec-x32.patch since it has been reverted upstream
You should also remove the actual files, not just drop them from the recipe.
> Backport patches for kdump arm64 from:
> https://git.linaro.org/people/takahiro.akashi/kexec-tools.git
If the patches are coming from a different repository, they are not a
backport. Change the upstream-status to 'pending' please, or 'submitted
(link)' if they have been submitted upstream.
> meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb | 37 ----
> meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb | 44 +++++
Please use git's rename detection when submitting patches, so we can see
what is the difference between the two files.
Alex
^ permalink raw reply
* [PATCH] core-image-minimal-initramfs: fix extrausers functionality
From: Awais Belal @ 2016-12-28 13:01 UTC (permalink / raw)
To: openembedded-core
The extrausers functionality requires base-passwd and shadow
to be installed before it can be leveraged. Otherwise while
using the features of the class we get into build errors
like the following
ERROR: core-image-minimal-initramfs-1.0-r0 do_rootfs: core-image-minimal-initramfs: useradd command did not succeed.
Signed-off-by: Awais Belal <awais_belal@mentor.com>
---
meta/recipes-core/images/core-image-minimal-initramfs.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb
index 5794a25..8186ddc 100644
--- a/meta/recipes-core/images/core-image-minimal-initramfs.bb
+++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Small image capable of booting a device. The kernel includes \
the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \
first 'init' program more efficiently."
-PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi ${VIRTUAL-RUNTIME_base-utils} udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}"
+PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi ${VIRTUAL-RUNTIME_base-utils} udev base-passwd shadow ${ROOTFS_BOOTSTRAP_INSTALL}"
# Do not pollute the initrd image with rootfs features
IMAGE_FEATURES = ""
--
1.9.1
^ permalink raw reply related
* [PATCH 0/8] oeqa.utils.metadata: update xml schema
From: Markus Lehtonen @ 2016-12-28 13:02 UTC (permalink / raw)
To: openembedded-core
This patchset extends and modifies the xml format of the test metadata report.
The goal is to make the data more comprehensive in slightly more consistent
format.
The following changes since commit 425afe2484707640ac71194885fdb263e95e9950:
lib/oe/utils: Drop python2 compatibility code (2016-12-22 08:50:21 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib marquiz/oeqa-metaxml
http://git.openembedded.org/openembedded-core-contrib/log/?h=marquiz/oeqa-metaxml
Markus Lehtonen (8):
oeqa.utils.metadata: re-organise host distro information
oeqa.utils.metadata: re-organise distro information
oeqa.utils.metadata: drop 'unknown' git data elements
oeqa.utils.metadata: fix retrieval of git branch and revision
oeqa.utils.metadata: rename 'revision' to 'commit'
oeqa.utils.metadata: add commit count information
oeqa.utils.metadata: have layer name as an attribute in xml
oeqa.utils.metadata: add bitbake revision information
meta/lib/oeqa/utils/metadata.py | 81 ++++++++++++++++++++++++++++-------------
scripts/oe-selftest | 8 ++--
2 files changed, 59 insertions(+), 30 deletions(-)
--
2.6.6
^ permalink raw reply
* [PATCH 1/8] oeqa.utils.metadata: re-organise host distro information
From: Markus Lehtonen @ 2016-12-28 13:02 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1482930164-15721-1-git-send-email-markus.lehtonen@linux.intel.com>
Put all host distro data under one <host_distro> element. In addition
take the data directly from /etc/os-release instead of the "lsb API".
The /etc/os-release file is virtually ubiquitous, now, and using its
field names and values provides a more standardized and extensible
format.
[YOCTO #10590]
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---
meta/lib/oeqa/utils/metadata.py | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py
index 5d8bf84..2316841 100644
--- a/meta/lib/oeqa/utils/metadata.py
+++ b/meta/lib/oeqa/utils/metadata.py
@@ -10,11 +10,22 @@ from collections.abc import MutableMapping
from xml.dom.minidom import parseString
from xml.etree.ElementTree import Element, tostring
-from oe.lsb import distro_identifier
from oeqa.utils.commands import runCmd, get_bb_var, get_bb_vars
metadata_vars = ['MACHINE', 'DISTRO', 'DISTRO_VERSION']
+def get_os_release():
+ """Get info from /etc/os-release as a dict"""
+ data = OrderedDict()
+ os_release_file = '/etc/os-release'
+ if not os.path.exists(os_release_file):
+ return None
+ with open(os_release_file) as fobj:
+ for line in fobj:
+ key, value = line.split('=', 1)
+ data[key.strip().lower()] = value.strip().strip('"')
+ return data
+
def metadata_from_bb():
""" Returns test's metadata as OrderedDict.
@@ -27,10 +38,15 @@ def metadata_from_bb():
data_dict = get_bb_vars(metadata_vars)
for var in metadata_vars:
info_dict[var.lower()] = data_dict[var]
- host_distro= distro_identifier()
- host_distro, _, host_distro_release = host_distro.partition('-')
- info_dict['host_distro'] = host_distro
- info_dict['host_distro_release'] = host_distro_release
+
+ # Host distro information
+ os_release = get_os_release()
+ if os_release:
+ info_dict['host_distro'] = OrderedDict()
+ for key in ('id', 'version_id', 'pretty_name'):
+ if key in os_release:
+ info_dict['host_distro'][key] = os_release[key]
+
info_dict['layers'] = get_layers(get_bb_var('BBLAYERS'))
return info_dict
--
2.6.6
^ permalink raw reply related
* [PATCH 2/8] oeqa.utils.metadata: re-organise distro information
From: Markus Lehtonen @ 2016-12-28 13:02 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1482930164-15721-1-git-send-email-markus.lehtonen@linux.intel.com>
Use the same format, based on /etc/os-release, as for host distro
information.
[YOCTO #10590]
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---
meta/lib/oeqa/utils/metadata.py | 17 ++++++++++-------
scripts/oe-selftest | 4 ++--
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py
index 2316841..df6ed91 100644
--- a/meta/lib/oeqa/utils/metadata.py
+++ b/meta/lib/oeqa/utils/metadata.py
@@ -10,9 +10,7 @@ from collections.abc import MutableMapping
from xml.dom.minidom import parseString
from xml.etree.ElementTree import Element, tostring
-from oeqa.utils.commands import runCmd, get_bb_var, get_bb_vars
-
-metadata_vars = ['MACHINE', 'DISTRO', 'DISTRO_VERSION']
+from oeqa.utils.commands import runCmd, get_bb_vars
def get_os_release():
"""Get info from /etc/os-release as a dict"""
@@ -35,9 +33,14 @@ def metadata_from_bb():
info_dict = OrderedDict()
hostname = runCmd('hostname')
info_dict['hostname'] = hostname.output
- data_dict = get_bb_vars(metadata_vars)
- for var in metadata_vars:
- info_dict[var.lower()] = data_dict[var]
+ data_dict = get_bb_vars()
+
+ info_dict['machine'] = data_dict['MACHINE']
+
+ # Distro information
+ info_dict['distro'] = {'id': data_dict['DISTRO'],
+ 'version_id': data_dict['DISTRO_VERSION'],
+ 'pretty_name': '%s %s' % (data_dict['DISTRO'], data_dict['DISTRO_VERSION'])}
# Host distro information
os_release = get_os_release()
@@ -47,7 +50,7 @@ def metadata_from_bb():
if key in os_release:
info_dict['host_distro'][key] = os_release[key]
- info_dict['layers'] = get_layers(get_bb_var('BBLAYERS'))
+ info_dict['layers'] = get_layers(data_dict['BBLAYERS'])
return info_dict
def metadata_from_data_store(d):
diff --git a/scripts/oe-selftest b/scripts/oe-selftest
index bfcea66..b4d911e 100755
--- a/scripts/oe-selftest
+++ b/scripts/oe-selftest
@@ -624,8 +624,8 @@ def main():
for layer, values in metadata['layers'].items():
layer_info = '%s%-17s = %s:%s\n' % (layer_info, layer,
values['branch'], values['revision'])
- msg = 'Selftest for build %s of %s %s for machine %s on %s\n\n%s' % (
- log_prefix[12:], metadata['distro'], metadata['distro_version'],
+ msg = 'Selftest for build %s of %s for machine %s on %s\n\n%s' % (
+ log_prefix[12:], metadata['distro']['pretty_name'],
metadata['machine'], metadata['hostname'], layer_info)
log.debug('Commiting results to local repository')
--
2.6.6
^ permalink raw reply related
* [PATCH 3/8] oeqa.utils.metadata: drop 'unknown' git data elements
From: Markus Lehtonen @ 2016-12-28 13:02 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1482930164-15721-1-git-send-email-markus.lehtonen@linux.intel.com>
It's better just to not have the xml elements than to have elements with
faux data. One could have git branch named 'unknown', for example.
[YOCTO #10590]
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---
meta/lib/oeqa/utils/metadata.py | 7 +++----
scripts/oe-selftest | 4 ++--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py
index df6ed91..a389c6a 100644
--- a/meta/lib/oeqa/utils/metadata.py
+++ b/meta/lib/oeqa/utils/metadata.py
@@ -73,11 +73,10 @@ def get_layers(layers):
try:
repo = Repo(layer, search_parent_directories=True)
revision, branch = repo.head.object.name_rev.split()
- layer_dict[layer_name]['branch'] = branch
- layer_dict[layer_name]['revision'] = revision
except (InvalidGitRepositoryError, NoSuchPathError):
- layer_dict[layer_name]['branch'] = 'unknown'
- layer_dict[layer_name]['revision'] = 'unknown'
+ continue
+ layer_dict[layer_name]['branch'] = branch
+ layer_dict[layer_name]['revision'] = revision
return layer_dict
def write_metadata_file(file_path, metadata):
diff --git a/scripts/oe-selftest b/scripts/oe-selftest
index b4d911e..51c52f2 100755
--- a/scripts/oe-selftest
+++ b/scripts/oe-selftest
@@ -595,7 +595,7 @@ def main():
r_branches = set(r_branches.replace('origin/', '').split())
l_branches = {str(branch) for branch in repo.branches}
branch = '%s/%s/%s' % (metadata['hostname'],
- metadata['layers']['meta']['branch'],
+ metadata['layers']['meta'].get('branch', '(nogit)'),
metadata['machine'])
if branch in l_branches:
@@ -623,7 +623,7 @@ def main():
layer_info = ''
for layer, values in metadata['layers'].items():
layer_info = '%s%-17s = %s:%s\n' % (layer_info, layer,
- values['branch'], values['revision'])
+ values.get('branch', '(nogit)'), values.get('revision', '0'*40))
msg = 'Selftest for build %s of %s for machine %s on %s\n\n%s' % (
log_prefix[12:], metadata['distro']['pretty_name'],
metadata['machine'], metadata['hostname'], layer_info)
--
2.6.6
^ permalink raw reply related
* [PATCH 4/8] oeqa.utils.metadata: fix retrieval of git branch and revision
From: Markus Lehtonen @ 2016-12-28 13:02 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1482930164-15721-1-git-send-email-markus.lehtonen@linux.intel.com>
Always return a valid branch name, or, '(nobranch)' if the current HEAD
is detached. Also, always return the hash of the commit object that HEAD
is pointing to. Previous code returned an incorrect branch name (or
crashed) e.g. in the case of detached HEAD.
[YOCTO #10590]
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---
meta/lib/oeqa/utils/metadata.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py
index a389c6a..b732d37 100644
--- a/meta/lib/oeqa/utils/metadata.py
+++ b/meta/lib/oeqa/utils/metadata.py
@@ -72,11 +72,13 @@ def get_layers(layers):
layer_dict[layer_name] = OrderedDict()
try:
repo = Repo(layer, search_parent_directories=True)
- revision, branch = repo.head.object.name_rev.split()
except (InvalidGitRepositoryError, NoSuchPathError):
continue
- layer_dict[layer_name]['branch'] = branch
- layer_dict[layer_name]['revision'] = revision
+ layer_dict[layer_name]['revision'] = repo.head.commit.hexsha
+ try:
+ layer_dict[layer_name]['branch'] = repo.active_branch.name
+ except TypeError:
+ layer_dict[layer_name]['branch'] = '(nobranch)'
return layer_dict
def write_metadata_file(file_path, metadata):
--
2.6.6
^ permalink raw reply related
* [PATCH 5/8] oeqa.utils.metadata: rename 'revision' to 'commit'
From: Markus Lehtonen @ 2016-12-28 13:02 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1482930164-15721-1-git-send-email-markus.lehtonen@linux.intel.com>
Revision is a bit vague and could point to a tag, for example. Git
commit objects are unambiguous and persistent so be explicit that the
element should contain git commit hash.
[YOCTO #10590]
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---
meta/lib/oeqa/utils/metadata.py | 2 +-
scripts/oe-selftest | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py
index b732d37..2f7e8f2 100644
--- a/meta/lib/oeqa/utils/metadata.py
+++ b/meta/lib/oeqa/utils/metadata.py
@@ -74,7 +74,7 @@ def get_layers(layers):
repo = Repo(layer, search_parent_directories=True)
except (InvalidGitRepositoryError, NoSuchPathError):
continue
- layer_dict[layer_name]['revision'] = repo.head.commit.hexsha
+ layer_dict[layer_name]['commit'] = repo.head.commit.hexsha
try:
layer_dict[layer_name]['branch'] = repo.active_branch.name
except TypeError:
diff --git a/scripts/oe-selftest b/scripts/oe-selftest
index 51c52f2..2092b09 100755
--- a/scripts/oe-selftest
+++ b/scripts/oe-selftest
@@ -623,7 +623,7 @@ def main():
layer_info = ''
for layer, values in metadata['layers'].items():
layer_info = '%s%-17s = %s:%s\n' % (layer_info, layer,
- values.get('branch', '(nogit)'), values.get('revision', '0'*40))
+ values.get('branch', '(nogit)'), values.get('commit', '0'*40))
msg = 'Selftest for build %s of %s for machine %s on %s\n\n%s' % (
log_prefix[12:], metadata['distro']['pretty_name'],
metadata['machine'], metadata['hostname'], layer_info)
--
2.6.6
^ permalink raw reply related
* [PATCH 6/8] oeqa.utils.metadata: add commit count information
From: Markus Lehtonen @ 2016-12-28 13:02 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1482930164-15721-1-git-send-email-markus.lehtonen@linux.intel.com>
Makes it easier to put the commits into a timeline.
[YOCTO #10590]
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---
meta/lib/oeqa/utils/metadata.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py
index 2f7e8f2..d5cc290 100644
--- a/meta/lib/oeqa/utils/metadata.py
+++ b/meta/lib/oeqa/utils/metadata.py
@@ -63,7 +63,7 @@ def metadata_from_data_store(d):
pass
def get_layers(layers):
- """ Returns layer name, branch, and revision as OrderedDict. """
+ """Returns layer information in dict format"""
from git import Repo, InvalidGitRepositoryError, NoSuchPathError
layer_dict = OrderedDict()
@@ -75,6 +75,7 @@ def get_layers(layers):
except (InvalidGitRepositoryError, NoSuchPathError):
continue
layer_dict[layer_name]['commit'] = repo.head.commit.hexsha
+ layer_dict[layer_name]['commit_count'] = repo.head.commit.count()
try:
layer_dict[layer_name]['branch'] = repo.active_branch.name
except TypeError:
--
2.6.6
^ permalink raw reply related
* [PATCH 7/8] oeqa.utils.metadata: have layer name as an attribute in xml
From: Markus Lehtonen @ 2016-12-28 13:02 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1482930164-15721-1-git-send-email-markus.lehtonen@linux.intel.com>
Have the layer name as an attribute instead of of the name of the
element itself. That is, have <layer name="layer_name"/> instead of
<layer_name/>. A bit better XML design.
[YOCTO #10590]
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---
meta/lib/oeqa/utils/metadata.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py
index d5cc290..6331c21 100644
--- a/meta/lib/oeqa/utils/metadata.py
+++ b/meta/lib/oeqa/utils/metadata.py
@@ -90,12 +90,14 @@ def write_metadata_file(file_path, metadata):
with open(file_path, 'w') as f:
f.write(xml_doc.toprettyxml())
-def dict_to_XML(tag, dictionary):
+def dict_to_XML(tag, dictionary, **kwargs):
""" Return XML element converting dicts recursively. """
- elem = Element(tag)
+ elem = Element(tag, **kwargs)
for key, val in dictionary.items():
- if isinstance(val, MutableMapping):
+ if tag == 'layers':
+ child = (dict_to_XML('layer', val, name=key))
+ elif isinstance(val, MutableMapping):
child = (dict_to_XML(key, val))
else:
child = Element(key)
--
2.6.6
^ permalink raw reply related
* [PATCH 8/8] oeqa.utils.metadata: add bitbake revision information
From: Markus Lehtonen @ 2016-12-28 13:02 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1482930164-15721-1-git-send-email-markus.lehtonen@linux.intel.com>
[YOCTO #10590]
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---
meta/lib/oeqa/utils/metadata.py | 32 +++++++++++++++++++-------------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py
index 6331c21..23449fc 100644
--- a/meta/lib/oeqa/utils/metadata.py
+++ b/meta/lib/oeqa/utils/metadata.py
@@ -10,6 +10,8 @@ from collections.abc import MutableMapping
from xml.dom.minidom import parseString
from xml.etree.ElementTree import Element, tostring
+from git import Repo, InvalidGitRepositoryError, NoSuchPathError
+
from oeqa.utils.commands import runCmd, get_bb_vars
def get_os_release():
@@ -51,6 +53,7 @@ def metadata_from_bb():
info_dict['host_distro'][key] = os_release[key]
info_dict['layers'] = get_layers(data_dict['BBLAYERS'])
+ info_dict['bitbake'] = git_rev_info(os.path.dirname(bb.__file__))
return info_dict
def metadata_from_data_store(d):
@@ -62,24 +65,27 @@ def metadata_from_data_store(d):
# be useful when running within bitbake.
pass
+def git_rev_info(path):
+ """Get git revision information as a dict"""
+ info = OrderedDict()
+ try:
+ repo = Repo(path, search_parent_directories=True)
+ except (InvalidGitRepositoryError, NoSuchPathError):
+ return info
+ info['commit'] = repo.head.commit.hexsha
+ info['commit_count'] = repo.head.commit.count()
+ try:
+ info['branch'] = repo.active_branch.name
+ except TypeError:
+ info['branch'] = '(nobranch)'
+ return info
+
def get_layers(layers):
"""Returns layer information in dict format"""
- from git import Repo, InvalidGitRepositoryError, NoSuchPathError
-
layer_dict = OrderedDict()
for layer in layers.split():
layer_name = os.path.basename(layer)
- layer_dict[layer_name] = OrderedDict()
- try:
- repo = Repo(layer, search_parent_directories=True)
- except (InvalidGitRepositoryError, NoSuchPathError):
- continue
- layer_dict[layer_name]['commit'] = repo.head.commit.hexsha
- layer_dict[layer_name]['commit_count'] = repo.head.commit.count()
- try:
- layer_dict[layer_name]['branch'] = repo.active_branch.name
- except TypeError:
- layer_dict[layer_name]['branch'] = '(nobranch)'
+ layer_dict[layer_name] = git_rev_info(layer)
return layer_dict
def write_metadata_file(file_path, metadata):
--
2.6.6
^ permalink raw reply related
* Re: [PATCH] core-image-minimal-initramfs: fix extrausers functionality
From: Belal, Awais @ 2016-12-28 13:21 UTC (permalink / raw)
To: openembedded-core@lists.openembedded.org
In-Reply-To: <1482930090-10835-1-git-send-email-awais_belal@mentor.com>
Please ignore the below patch. The issue was actually fixed in master at
http://cgit.openembedded.org/openembedded-core/commit/meta/classes/extrausers.bbclass?id=fa541362e2d2cc0494a86a413b7b52dfe3eee908
BR,
Awais
________________________________________
From: openembedded-core-bounces@lists.openembedded.org <openembedded-core-bounces@lists.openembedded.org> on behalf of Belal, Awais
Sent: Wednesday, December 28, 2016 6:01 PM
To: openembedded-core@lists.openembedded.org
Subject: [OE-core] [PATCH] core-image-minimal-initramfs: fix extrausers functionality
The extrausers functionality requires base-passwd and shadow
to be installed before it can be leveraged. Otherwise while
using the features of the class we get into build errors
like the following
ERROR: core-image-minimal-initramfs-1.0-r0 do_rootfs: core-image-minimal-initramfs: useradd command did not succeed.
Signed-off-by: Awais Belal <awais_belal@mentor.com>
---
meta/recipes-core/images/core-image-minimal-initramfs.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb
index 5794a25..8186ddc 100644
--- a/meta/recipes-core/images/core-image-minimal-initramfs.bb
+++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Small image capable of booting a device. The kernel includes \
the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \
first 'init' program more efficiently."
-PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi ${VIRTUAL-RUNTIME_base-utils} udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}"
+PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi ${VIRTUAL-RUNTIME_base-utils} udev base-passwd shadow ${ROOTFS_BOOTSTRAP_INSTALL}"
# Do not pollute the initrd image with rootfs features
IMAGE_FEATURES = ""
--
1.9.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply related
* [PATCH 0/2] ppp build fix for musl + 4.9 headers
From: Jussi Kukkonen @ 2016-12-28 14:45 UTC (permalink / raw)
To: openembedded-core
These patches should apply to master but are meant for current
ross/mut: ppp fails to build on musl when the 4.9 headers are used.
Thanks to Khem for the patch suggestion.
Jussi
The following changes since commit 1dc1894e05ef0f3aeeefa61ed89613f17bba2e83:
cairo: set license for cairo-doc (2016-12-22 20:29:28 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/ppp-fix-for-mut
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/ppp-fix-for-mut
Jussi Kukkonen (2):
ppp: Partly remove patch that doesn't make sense any more
ppp: Add patch to fix build with musl and 4.9 headers
...01-ppp-Fix-compilation-errors-in-Makefile.patch | 51 ++--------------------
.../ppp/ppp/0001-ppp-Remove-unneeded-include.patch | 43 ++++++++++++++++++
meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 +
3 files changed, 47 insertions(+), 48 deletions(-)
create mode 100644 meta/recipes-connectivity/ppp/ppp/0001-ppp-Remove-unneeded-include.patch
--
2.1.4
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox