[OE-core] [PATCH 0/1] Pull to restore qt4 arm64 patches
Push to poky-contrib for merge easily. The following changes since commit 1675ff6fff53dda89fa8d4f3a2c292c23fd346d7: bitbake: tests/data: Add new data tests (2015-06-12 00:02:28 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib kangkai/qt4 https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=kangkai%2Fqt4 Kai Kang (1): qt4-4.8.7: restore arm64 patches which are dropped by mistake meta/recipes-qt/qt4/qt4-4.8.7.inc | 3 + .../0030-aarch64_arm64_qatomic_support.patch | 491 + .../qt4/qt4-4.8.7/0031-aarch64_arm64_mkspecs.patch | 124 ++ .../qt4/qt4-4.8.7/0032-aarch64_add_header.patch| 18 + 4 files changed, 636 insertions(+) create mode 100644 meta/recipes-qt/qt4/qt4-4.8.7/0030-aarch64_arm64_qatomic_support.patch create mode 100644 meta/recipes-qt/qt4/qt4-4.8.7/0031-aarch64_arm64_mkspecs.patch create mode 100644 meta/recipes-qt/qt4/qt4-4.8.7/0032-aarch64_add_header.patch -- 2.4.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Restore arm64 related patches
Hi Ross, Three of four arm64 patches of qt4 are removed by mistake. Restore them then. Sorry for trouble. Kai Kang (1): qt4-4.8.7: restore arm64 patches which are dropped by mistake meta/recipes-qt/qt4/qt4-4.8.7.inc | 3 + .../0030-aarch64_arm64_qatomic_support.patch | 491 + .../qt4/qt4-4.8.7/0031-aarch64_arm64_mkspecs.patch | 124 ++ .../qt4/qt4-4.8.7/0032-aarch64_add_header.patch| 18 + 4 files changed, 636 insertions(+) create mode 100644 meta/recipes-qt/qt4/qt4-4.8.7/0030-aarch64_arm64_qatomic_support.patch create mode 100644 meta/recipes-qt/qt4/qt4-4.8.7/0031-aarch64_arm64_mkspecs.patch create mode 100644 meta/recipes-qt/qt4/qt4-4.8.7/0032-aarch64_add_header.patch -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] qt4-4.8.7: restore arm64 patches which are dropped by mistake
During upgrade qt4 from 4.8.6 to 4.8.7, four arm64 patches are removed.
But three of them are dropped by mistake that they are not merged by
upstream and still needed.
Restore them.
Signed-off-by: Kai Kang
---
meta/recipes-qt/qt4/qt4-4.8.7.inc | 3 +
.../0030-aarch64_arm64_qatomic_support.patch | 491 +
.../qt4/qt4-4.8.7/0031-aarch64_arm64_mkspecs.patch | 124 ++
.../qt4/qt4-4.8.7/0032-aarch64_add_header.patch| 18 +
4 files changed, 636 insertions(+)
create mode 100644
meta/recipes-qt/qt4/qt4-4.8.7/0030-aarch64_arm64_qatomic_support.patch
create mode 100644
meta/recipes-qt/qt4/qt4-4.8.7/0031-aarch64_arm64_mkspecs.patch
create mode 100644 meta/recipes-qt/qt4/qt4-4.8.7/0032-aarch64_add_header.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7.inc
b/meta/recipes-qt/qt4/qt4-4.8.7.inc
index 2f580cc..67fad3a 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.7.inc
@@ -22,6 +22,9 @@ SRC_URI =
"http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever
file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \
file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \
file://0028-Don-t-crash-on-broken-GIF-images.patch \
+ file://0030-aarch64_arm64_qatomic_support.patch \
+ file://0031-aarch64_arm64_mkspecs.patch \
+ file://0032-aarch64_add_header.patch \
file://Fix-QWSLock-invalid-argument-logs.patch \
file://add_check_for_aarch64_32.patch \
file://g++.conf \
diff --git
a/meta/recipes-qt/qt4/qt4-4.8.7/0030-aarch64_arm64_qatomic_support.patch
b/meta/recipes-qt/qt4/qt4-4.8.7/0030-aarch64_arm64_qatomic_support.patch
new file mode 100644
index 000..ba4c2a6
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.7/0030-aarch64_arm64_qatomic_support.patch
@@ -0,0 +1,491 @@
+From 294010b562c9846bb2bc4ee9c63ff78adc7c1f4f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?=
+
+Date: Sat, 15 Mar 2014 15:40:49 -0300
+Subject: [PATCH] Add qatomic support for AArch64 (aka arm64).
+
+Patch by Mark Salter
+licensed under BSD:
+
+
+
+This patch is known to not be the most correct way
+to implement them, as it seems to be possible to do it in a faster way,
+but should work non the less until we can provide something better.
+
+Change-Id: Ib392b27dc54691fd4c2ea9896240ad71fb8128cc
+
+
+Upstream-Status: Pending
+
+Signed-off-by: Kai Kang
+
+---
+ src/corelib/arch/aarch64/arch.pri| 4 +
+ src/corelib/arch/aarch64/qatomic_aarch64.cpp | 70 ++
+ src/corelib/arch/arch.pri| 4 +-
+ src/corelib/arch/qatomic_aarch64.h | 335 +++
+ src/corelib/arch/qatomic_arch.h | 2 +
+ 5 files changed, 414 insertions(+), 1 deletion(-)
+ create mode 100644 src/corelib/arch/aarch64/arch.pri
+ create mode 100644 src/corelib/arch/aarch64/qatomic_aarch64.cpp
+ create mode 100644 src/corelib/arch/qatomic_aarch64.h
+
+diff --git a/src/corelib/arch/aarch64/arch.pri
b/src/corelib/arch/aarch64/arch.pri
+new file mode 100644
+index 000..63523d9
+--- /dev/null
b/src/corelib/arch/aarch64/arch.pri
+@@ -0,0 +1,4 @@
++#
++# AArch64 architecture
++#
++SOURCES += $$QT_ARCH_CPP/qatomic_aarch64.cpp
+diff --git a/src/corelib/arch/aarch64/qatomic_aarch64.cpp
b/src/corelib/arch/aarch64/qatomic_aarch64.cpp
+new file mode 100644
+index 000..fc851b9
+--- /dev/null
b/src/corelib/arch/aarch64/qatomic_aarch64.cpp
+@@ -0,0 +1,70 @@
++/
++**
++** Copyright (C) 2012, 2013 Digia Plc and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtCore module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia. For licensing terms and
++** conditions see http://qt.digia.com/licensing. For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file. Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights. Thes
[OE-core] [PATCH] lighttpd: Bug fix
mod_cgi buffers data without bound,so fix it.
Reference: http://redmine.lighttpd.net/issues/1264
Signed-off-by: Li Xin
---
.../0001-mod_cgi-buffers-data-without-bound.patch | 386 +
meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb | 1 +
2 files changed, 387 insertions(+)
create mode 100644
meta/recipes-extended/lighttpd/lighttpd/0001-mod_cgi-buffers-data-without-bound.patch
diff --git
a/meta/recipes-extended/lighttpd/lighttpd/0001-mod_cgi-buffers-data-without-bound.patch
b/meta/recipes-extended/lighttpd/lighttpd/0001-mod_cgi-buffers-data-without-bound.patch
new file mode 100644
index 000..e456182
--- /dev/null
+++
b/meta/recipes-extended/lighttpd/lighttpd/0001-mod_cgi-buffers-data-without-bound.patch
@@ -0,0 +1,386 @@
+From e6ccbab5d42b110ac4f6ce1f72cb1e9ccbe4400a Mon Sep 17 00:00:00 2001
+From: Li xin
+Date: Tue, 16 Jun 2015 19:02:38 +0900
+Subject: [PATCH] mod_cgi buffers data without bound so fix it
+
+Upstream-Status: pending
+
+Signed-off-by: Li Xin
+---
+ doc/config/lighttpd.conf | 8 ++
+ src/mod_cgi.c| 188 ---
+ 2 files changed, 186 insertions(+), 10 deletions(-)
+
+diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf
+index 60b0ae1..9c101a7 100644
+--- a/doc/config/lighttpd.conf
b/doc/config/lighttpd.conf
+@@ -375,6 +375,14 @@ server.upload-dirs = ( "/var/tmp" )
+ ##
+ ###
+
++###
++##
++##
++## maximum bytes in send_raw before backing off [KByte]
++## cgi.high-waterlevel= 10240
++## minimum bytes in send_raw to disable backoff [KByte]
++## cgi.low-waterlevel = 5120
++###
+
+ ###
+ ##
+diff --git a/src/mod_cgi.c b/src/mod_cgi.c
+index 734ecee..c51f43c 100644
+--- a/src/mod_cgi.c
b/src/mod_cgi.c
+@@ -38,6 +38,10 @@
+
+ #include "version.h"
+
++/* for output logs */
++char msgbuf[2048];
++
++
+ enum {EOL_UNSET, EOL_N, EOL_RN};
+
+ typedef struct {
+@@ -53,9 +57,19 @@ typedef struct {
+ size_t size;
+ } buffer_pid_t;
+
++struct handler_ctx;
++
++typedef struct {
++ struct handler_ctx **hctx;
++ size_t used;
++ size_t size;
++} buffer_ctx_t;
++
+ typedef struct {
+ array *cgi;
+ unsigned short execute_x_only;
++ unsigned int high_waterlevel; /* maximum bytes in send_raw before
backing off */
++ unsigned int low_waterlevel; /* minimum bytes in send_raw to disable
backoff */
+ } plugin_config;
+
+ typedef struct {
+@@ -68,9 +82,11 @@ typedef struct {
+ plugin_config **config_storage;
+
+ plugin_config conf;
++
++ buffer_ctx_t cgi_ctx;
+ } plugin_data;
+
+-typedef struct {
++typedef struct handler_ctx {
+ pid_t pid;
+ int fd;
+ int fde_ndx; /* index into the fd-event buffer */
+@@ -78,11 +94,16 @@ typedef struct {
+ connection *remote_conn; /* dumb pointer */
+ plugin_data *plugin_data; /* dumb pointer */
+
++ int throttling;/* 1=waiting for send_raw buffer to drain */
++ off_t high_waterlevel; /* maximum bytes in send_raw before backing off
*/
++ off_t low_waterlevel; /* minimum bytes in send_raw to disable backoff
*/
++ off_t bytes_in_buffer;
++
+ buffer *response;
+ buffer *response_header;
+ } handler_ctx;
+
+-static handler_ctx * cgi_handler_ctx_init(void) {
++static handler_ctx * cgi_handler_ctx_init(plugin_data *p) {
+ handler_ctx *hctx = calloc(1, sizeof(*hctx));
+
+ force_assert(hctx);
+@@ -90,13 +111,26 @@ static handler_ctx * cgi_handler_ctx_init(void) {
+ hctx->response = buffer_init();
+ hctx->response_header = buffer_init();
+
++ hctx->throttling = 0;
++ hctx->high_waterlevel = (off_t)p->conf.high_waterlevel * 1024;
++ hctx->low_waterlevel = (off_t)p->conf.low_waterlevel * 1024;
++ if (hctx->low_waterlevel >= hctx->high_waterlevel) {
++ hctx->low_waterlevel = hctx->high_waterlevel * 3 / 4; /* 75% */
++ }
++ hctx->bytes_in_buffer = 0;
++
+ return hctx;
+ }
+
+-static void cgi_handler_ctx_free(handler_ctx *hctx) {
++static void cgi_handler_ctx_free(server *srv, handler_ctx *hctx) {
+ buffer_free(hctx->response);
+ buffer_free(hctx->response_header);
+
++ /* to avoid confusion */
++ if (hctx->throttling) {
++ log_error_write(srv, __FILE__, __LINE__, "s", "unthrottled");
++ }
++
+ free(hctx);
+ }
+
+@@ -152,6 +186,8 @@ SETDEFAULTS_FUNC(mod_fastcgi_set_defaults) {
+ config_values_t cv[] = {
+ { "cgi.assign", NULL, T_CONFIG_ARRAY,
T_CONFIG_SCOPE_CONNECTION }, /* 0 */
+ { "cgi.execute-x-only", NULL, T_CONFIG_BOOLEAN,
T_CONFIG_SCOPE_CONNECTION }, /* 1 */
++
[OE-core] [PATCH][fido] python3-ctypes: Fix cross compilation for arm targets
When cross compiling for arm targets ctypes compilation fails because
it uses _sysconfigdata from the HOST, this patches makes it use the
one from TARGET fixing compilation of this module
[YOCTO #7873]
Signed-off-by: Alejandro Hernandez
Signed-off-by: Jonas Göransson
---
meta/recipes-devtools/python/python3_3.3.3.bb | 4
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-devtools/python/python3_3.3.3.bb
b/meta/recipes-devtools/python/python3_3.3.3.bb
index 6147408..22ea651 100644
--- a/meta/recipes-devtools/python/python3_3.3.3.bb
+++ b/meta/recipes-devtools/python/python3_3.3.3.bb
@@ -72,6 +72,10 @@ export CROSS_COMPILE = "${TARGET_PREFIX}"
export _PYTHON_PROJECT_BASE = "${B}"
export _PYTHON_PROJECT_SRC = "${S}"
+# Fix ctypes cross compilation
+export CROSSPYTHONPATH =
"${B}/build/lib.linux-${TARGET_ARCH}-${PYTHON_MAJMIN}:${S}/Lib:${S}/Lib/plat-linux"
+
+
# No ctypes option for python 3
PYTHONLSBOPTS = ""
--
1.8.4.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python3-ctypes: Fix cross compilation for arm targets
When cross compiling for arm targets ctypes compilation fails because
it uses _sysconfigdata from the HOST, this patches makes it use the
one from TARGET fixing compilation of this module
[YOCTO #7873]
Signed-off-by: Alejandro Hernandez
Signed-off-by: Jonas Göransson
---
meta/recipes-devtools/python/python3_3.4.3.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-devtools/python/python3_3.4.3.bb
b/meta/recipes-devtools/python/python3_3.4.3.bb
index 8e0c2ba..7eb99b1 100644
--- a/meta/recipes-devtools/python/python3_3.4.3.bb
+++ b/meta/recipes-devtools/python/python3_3.4.3.bb
@@ -69,6 +69,9 @@ export _PYTHON_PROJECT_BASE = "${B}"
export _PYTHON_PROJECT_SRC = "${S}"
export CCSHARED = "-fPIC"
+# Fix ctypes cross compilation
+export CROSSPYTHONPATH =
"${B}/build/lib.linux-${TARGET_ARCH}-${PYTHON_MAJMIN}:${S}/Lib:${S}/Lib/plat-linux"
+
# No ctypes option for python 3
PYTHONLSBOPTS = ""
--
1.8.4.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] rt-tests: bump version to v0.92
Version upgrade to v0.92
Rebased below listed patch to newer source code:
added-missing-dependencies.patch
Signed-off-by: Maxin B. John
---
.../files/added-missing-dependencies.patch | 36 +-
.../{hwlatdetect_0.91.bb => hwlatdetect_0.92.bb} | 0
meta/recipes-rt/rt-tests/rt-tests.inc | 6 ++--
.../{rt-tests_0.91.bb => rt-tests_0.92.bb} | 0
4 files changed, 17 insertions(+), 25 deletions(-)
rename meta/recipes-rt/rt-tests/{hwlatdetect_0.91.bb => hwlatdetect_0.92.bb}
(100%)
rename meta/recipes-rt/rt-tests/{rt-tests_0.91.bb => rt-tests_0.92.bb} (100%)
diff --git a/meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch
b/meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch
index e420282..0bf768e 100644
--- a/meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch
+++ b/meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch
@@ -1,50 +1,42 @@
-From 82d28701486ba5a699544a168448bf93b1ccd7b1 Mon Sep 17 00:00:00 2001
-From: Jackie Huang
-Date: Thu, 6 Dec 2012 11:26:14 +0800
+From 3f948f22d9106a2b957d1d430b16a7c51ccfc067 Mon Sep 17 00:00:00 2001
+From: "Maxin B. John"
+Date: Tue, 16 Jun 2015 22:53:23 +0200
Subject: [PATCH] Added missing dependencies
Upstream-Status: Submitted [linux-rt-users]
The following targets missed dependency on librttest.a:
-pi_stress
rt-migrate-test
hackbench
Signed-off-by: Jackie Huang
+Signed-off-by: Maxin B. John
---
- Makefile |6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
-index fd3cdb3..60707a7 100644
+index a48e759..7a3f192 100644
--- a/Makefile
+++ b/Makefile
-@@ -68,14 +68,14 @@ cyclictest: cyclictest.o librttest.a
- signaltest: signaltest.o librttest.a
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
-
--pi_stress: pi_stress.o
-+pi_stress: pi_stress.o librttest.a
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
-
- hwlatdetect: src/hwlatdetect/hwlatdetect.py
+@@ -85,7 +85,7 @@ hwlatdetect: src/hwlatdetect/hwlatdetect.py
chmod +x src/hwlatdetect/hwlatdetect.py
ln -s src/hwlatdetect/hwlatdetect.py hwlatdetect
-rt-migrate-test: rt-migrate-test.o
+rt-migrate-test: rt-migrate-test.o librttest.a
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
ptsematest: ptsematest.o librttest.a
-@@ -96,7 +96,7 @@ sendme: sendme.o librttest.a
+@@ -106,7 +106,7 @@ sendme: sendme.o librttest.a
pip_stress: pip_stress.o librttest.a
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB)
-hackbench: hackbench.o
+hackbench: hackbench.o librttest.a
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
- librttest.a: rt-utils.o error.o rt-get_cpu.o
+ librttest.a: rt-utils.o error.o rt-get_cpu.o rt-sched.o
--
-1.7.9.5
+1.9.1
diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_0.91.bb
b/meta/recipes-rt/rt-tests/hwlatdetect_0.92.bb
similarity index 100%
rename from meta/recipes-rt/rt-tests/hwlatdetect_0.91.bb
rename to meta/recipes-rt/rt-tests/hwlatdetect_0.92.bb
diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc
b/meta/recipes-rt/rt-tests/rt-tests.inc
index 68a972a..e63182a 100644
--- a/meta/recipes-rt/rt-tests/rt-tests.inc
+++ b/meta/recipes-rt/rt-tests/rt-tests.inc
@@ -1,6 +1,6 @@
-# Version v0.91
-PV = "0.91"
-SRCREV = "3fed00ff8d2c0cdbc5ba078cbd60ce3cfcee615f"
+# Version v0.92
+PV = "0.92"
+SRCREV = "5f9f1e3fe327440a9d405f4af8feb16ff7a909eb"
SRC_URI =
"git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests.git \
file://0001-rt-tests-Allow-for-user-specified-PYLIB.patch \
diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.91.bb
b/meta/recipes-rt/rt-tests/rt-tests_0.92.bb
similarity index 100%
rename from meta/recipes-rt/rt-tests/rt-tests_0.91.bb
rename to meta/recipes-rt/rt-tests/rt-tests_0.92.bb
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V5 3/3] systemd: split modules into packages
Hello Leandro,
On 16.06.2015 20:20, Leandro Dorileo wrote:
> On 05/13/2015 07:41 PM, Andreas Oberritter wrote:
>> Hello Bruno,
>>
>> On 13.05.2015 23:51, Bruno Bottazzini wrote:
>>> +
>>>
>>> +# Aggregation of Split Packages
>>> +
>>>
>>> +PACKAGES =+ "${PN}-services-base"
>>> +SUMMARY_${PN}-services-base = "Base services aggregation"
>>> +ALLOW_EMPTY_${PN}-services-base = "1"
>>> +RDEPENDS_${PN}-services-base = " \
>>
>> I think it would be better to use RRECOMMENDS, in order to support
>> BAD_RECOMMENDATIONS per image. This would also remove the need to use
>> bb.utils.contains, because unavailable recommended packages get ignored
>> by the package managers.
>
>
> In the end, isn't it just a different approach? a different way of
> doing the same thing?
No. Although recommended packages get installed by default, just like
depended-upon packages, the difference is that you can choose to
uninstall these packages selectively or to disable automatic
installation using "BAD_RECOMMENDATIONS".
If you choose this route, then it doesn't make a difference whether you
use bb.utils.contains(...) for each package or not when declaring the
relationship between packages (unless you keep old packages on your
update feeds). I just mentioned that, because the patch is already hard
to read and any simplification in syntax may be a plus. I don't think
it's important though.
> By the way, from my point of view, semantically
> we're saying "we want a given package feature" besides the "we want a
> given distro feature", don't you think?
I can't follow you, sorry. At this point, PACKAGECONFIG already
determined which files got built, installed and packaged. I fail to
connect this to distro features in this context, besides its use for
sane defaults of the PACKAGECONFIG variable.
Regards,
Andreas
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V5 3/3] systemd: split modules into packages
Hello Bruno,
On 16.06.2015 20:11, Bottazzini, Bruno wrote:
> Ping
>
> On Sex, 2015-06-05 at 13:52 -0300, Bottazzini, Bruno wrote:
>> Ping.
>>
>> On Ter, 2015-05-19 at 10:18 -0300, Bottazzini, Bruno wrote:
>>> On Qui, 2015-05-14 at 00:41 +0200, Andreas Oberritter wrote:
Hello Bruno,
On 13.05.2015 23:51, Bruno Bottazzini wrote:
> +
> +# Aggregation of Split Packages
> +
> +PACKAGES =+ "${PN}-services-base"
> +SUMMARY_${PN}-services-base = "Base services aggregation"
> +ALLOW_EMPTY_${PN}-services-base = "1"
> +RDEPENDS_${PN}-services-base = " \
I think it would be better to use RRECOMMENDS, in order to support
BAD_RECOMMENDATIONS per image. This would also remove the need to use
bb.utils.contains, because unavailable recommended packages get ignored
by the package managers.
>>>
>>> I don't think if we should use RRECOMENDS.
>>>
>>> There are some packages described in services-base that it is not on the
>>> default PACKAGECONFIG.
>>>
>>> With RRECOMENDS and with out bb.utils.contains, it will install all the
>>> packages that it is described on the recipe and this is not the behavior
>>> we are looking for.
>>>
Besides that, I wonder whether ${PN}-services would be a better name,
because the -base suffix suggests that it contained only the most
important services.
>>>
>>> Sure, we can change it.
>>>
I guess your patch wasn't applied, because your last answer let expect a
follow-up patch.
There may be other reasons I don't know about (complexity for example).
Note that I'm not the maintainer of this recipe. I just shared my
thoughts as a user.
Regards,
Andreas
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] python-2.7/3.4-manifest.inc: add missing dependencies for python-netserver
* SimpleHTTPServer imports shutil so we need
definitly python-shell
* SocketServer can be run without the threading modul,
but I think we should run the full blown stuff, so
let us add python-threading
* this work was sponsored by sysmocom GmbH
Signed-off-by: Henning Heinold
---
meta/recipes-devtools/python/python-2.7-manifest.inc | 2 +-
meta/recipes-devtools/python/python-3.4-manifest.inc | 4 ++--
scripts/contrib/python/generate-manifest-2.7.py | 2 +-
scripts/contrib/python/generate-manifest-3.4.py | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-devtools/python/python-2.7-manifest.inc
b/meta/recipes-devtools/python/python-2.7-manifest.inc
index 4cd7a0c..9ba9c7f 100644
--- a/meta/recipes-devtools/python/python-2.7-manifest.inc
+++ b/meta/recipes-devtools/python/python-2.7-manifest.inc
@@ -170,7 +170,7 @@ RDEPENDS_${PN}-netclient="${PN}-core ${PN}-crypt
${PN}-datetime ${PN}-io ${PN}-l
FILES_${PN}-netclient="${libdir}/python2.7/*Cookie*.*
${libdir}/python2.7/base64.* ${libdir}/python2.7/cookielib.*
${libdir}/python2.7/ftplib.* ${libdir}/python2.7/gopherlib.*
${libdir}/python2.7/hmac.* ${libdir}/python2.7/httplib.*
${libdir}/python2.7/mimetypes.* ${libdir}/python2.7/nntplib.*
${libdir}/python2.7/poplib.* ${libdir}/python2.7/smtplib.*
${libdir}/python2.7/telnetlib.* ${libdir}/python2.7/urllib.*
${libdir}/python2.7/urllib2.* ${libdir}/python2.7/urlparse.*
${libdir}/python2.7/uuid.* ${libdir}/python2.7/rfc822.*
${libdir}/python2.7/mimetools.* "
SUMMARY_${PN}-netserver="Python Internet Protocol servers"
-RDEPENDS_${PN}-netserver="${PN}-core ${PN}-netclient"
+RDEPENDS_${PN}-netserver="${PN}-core ${PN}-netclient ${PN}-shell
${PN}-threading"
FILES_${PN}-netserver="${libdir}/python2.7/cgi.*
${libdir}/python2.7/*HTTPServer.* ${libdir}/python2.7/SocketServer.* "
SUMMARY_${PN}-numbers="Python number APIs"
diff --git a/meta/recipes-devtools/python/python-3.4-manifest.inc
b/meta/recipes-devtools/python/python-3.4-manifest.inc
index b0f46c3..557acdf 100644
--- a/meta/recipes-devtools/python/python-3.4-manifest.inc
+++ b/meta/recipes-devtools/python/python-3.4-manifest.inc
@@ -1,6 +1,6 @@
# WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I
regenerate the file.
-# Generator: './generate-manifest-3.4.py' Version 20140131 (C) 2002-2010
Michael 'Mickey' Lauer
+# Generator: '../../../scripts/contrib/python/generate-manifest-3.4.py'
Version 20140131 (C) 2002-2010 Michael 'Mickey' Lauer
# Visit the Python for Embedded Systems Site =>
http://www.Vanille.de/projects/python.spy
@@ -154,7 +154,7 @@ RDEPENDS_${PN}-netclient="${PN}-core ${PN}-crypt
${PN}-datetime ${PN}-io ${PN}-l
FILES_${PN}-netclient="${libdir}/python3.4/*Cookie*.*
${libdir}/python3.4/base64.* ${libdir}/python3.4/cookielib.*
${libdir}/python3.4/ftplib.* ${libdir}/python3.4/gopherlib.*
${libdir}/python3.4/hmac.* ${libdir}/python3.4/httplib.*
${libdir}/python3.4/mimetypes.* ${libdir}/python3.4/nntplib.*
${libdir}/python3.4/poplib.* ${libdir}/python3.4/smtplib.*
${libdir}/python3.4/telnetlib.* ${libdir}/python3.4/urllib
${libdir}/python3.4/uuid.* ${libdir}/python3.4/rfc822.*
${libdir}/python3.4/mimetools.* "
SUMMARY_${PN}-netserver="Python Internet Protocol servers"
-RDEPENDS_${PN}-netserver="${PN}-core ${PN}-netclient"
+RDEPENDS_${PN}-netserver="${PN}-core ${PN}-netclient ${PN}-shell
${PN}-threading"
FILES_${PN}-netserver="${libdir}/python3.4/cgi.*
${libdir}/python3.4/*HTTPServer.* ${libdir}/python3.4/SocketServer.* "
SUMMARY_${PN}-numbers="Python number APIs"
diff --git a/scripts/contrib/python/generate-manifest-2.7.py
b/scripts/contrib/python/generate-manifest-2.7.py
index 922ebe4..a368c8a 100755
--- a/scripts/contrib/python/generate-manifest-2.7.py
+++ b/scripts/contrib/python/generate-manifest-2.7.py
@@ -310,7 +310,7 @@ if __name__ == "__main__":
"*Cookie*.* " +
"base64.* cookielib.* ftplib.* gopherlib.* hmac.* httplib.* mimetypes.*
nntplib.* poplib.* smtplib.* telnetlib.* urllib.* urllib2.* urlparse.* uuid.*
rfc822.* mimetools.*" )
-m.addPackage( "${PN}-netserver", "Python Internet Protocol servers",
"${PN}-core ${PN}-netclient",
+m.addPackage( "${PN}-netserver", "Python Internet Protocol servers",
"${PN}-core ${PN}-netclient ${PN}-shell ${PN}-threading",
"cgi.* *HTTPServer.* SocketServer.*" )
m.addPackage( "${PN}-numbers", "Python number APIs", "${PN}-core
${PN}-lang ${PN}-re",
diff --git a/scripts/contrib/python/generate-manifest-3.4.py
b/scripts/contrib/python/generate-manifest-3.4.py
index 427367c..569fd3c 100755
--- a/scripts/contrib/python/generate-manifest-3.4.py
+++ b/scripts/contrib/python/generate-manifest-3.4.py
@@ -310,7 +310,7 @@ if __name__ == "__main__":
"*Cookie*.* " +
"base64.* cookielib.* ftplib.* gopherlib.* hmac.* httplib.* mimetypes.*
nntplib.* poplib.* smtplib.* telnetlib.* urllib uuid.* rfc822.* mimetools.*" )
-m.addPackage( "${PN}-netserver", "Pyt
Re: [OE-core] [PATCH V5 3/3] systemd: split modules into packages
On 05/13/2015 07:41 PM, Andreas Oberritter wrote:
Hello Bruno,
On 13.05.2015 23:51, Bruno Bottazzini wrote:
+
+# Aggregation of Split Packages
+
+PACKAGES =+ "${PN}-services-base"
+SUMMARY_${PN}-services-base = "Base services aggregation"
+ALLOW_EMPTY_${PN}-services-base = "1"
+RDEPENDS_${PN}-services-base = " \
I think it would be better to use RRECOMMENDS, in order to support
BAD_RECOMMENDATIONS per image. This would also remove the need to use
bb.utils.contains, because unavailable recommended packages get ignored
by the package managers.
In the end, isn't it just a different approach? a different way of
doing the same thing? By the way, from my point of view, semantically
we're saying "we want a given package feature" besides the "we want a
given distro feature", don't you think?
Besides that, I wonder whether ${PN}-services would be a better name,
because the -base suffix suggests that it contained only the most
important services.
Ok, here I agree. Bruno, could you please do the rename suggested here
by Andreas?
Btw., sorry for commenting late again, but it's quite a big patch.
Regards,
Andreas
+${@bb.utils.contains('PACKAGECONFIG', 'ask-password',
'${PN}-services-ask-password', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'backlight',
'${PN}-services-backlight', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'binfmt',
'${PN}-services-binfmt', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'dbus', '${PN}-services-dbus',
'', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'firstboot',
'${PN}-services-firstboot', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'fuse', '${PN}-services-fuse',
'', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'quota', '${PN}-services-quota',
'', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'rfkill',
'${PN}-services-rfkill', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'timesyncd',
'${PN}-services-timesyncd', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'update',
'${PN}-services-update', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'vconsole',
'${PN}-services-vconsole', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'filesystems',
'${PN}-generators-filesystems', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'preset', '${PN}-preset', '',
d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'fsck', '${PN}-services-fsck',
'', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'journal',
'${PN}-services-journal', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'modules-load',
'${PN}-services-modules-load', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'randomseed',
'${PN}-services-randomseed', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'sleep', '${PN}-services-sleep',
'', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'sysctl',
'${PN}-services-sysctl', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'sysusers',
'${PN}-services-sysusers', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'tmpfiles',
'${PN}-services-tmpfiles', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'udev', '${PN}-services-udev',
'', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'tools', '${PN}-tools', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'bash', '${PN}-bash', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'initramfs', '${PN}-initramfs',
'', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'kernel-install',
'${PN}-kernel-install', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'rpm-macros',
'${PN}-rpm-macros', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'zsh', '${PN}-zsh', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'bootchart',
'${PN}-services-bootchart', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'debug', '${PN}-services-debug',
'', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'machined',
'${PN}-services-machined', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'nspawn',
'${PN}-services-nspawn', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'sysvcompat',
'${PN}-services-sysvcompat', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'getty',
'${PN}-generators-getty', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'getty', '${PN}-services-getty',
'', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'ldconfig',
'${PN}-services-ldconfig', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'polkit',
'${PN}-services-hostnamed', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'polkit',
'${PN}-services-localed', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'polkit',
'${PN}-services-logind', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'polkit',
Re: [OE-core] [PATCH V5 3/3] systemd: split modules into packages
Ping
On Sex, 2015-06-05 at 13:52 -0300, Bottazzini, Bruno wrote:
> Ping.
>
> On Ter, 2015-05-19 at 10:18 -0300, Bottazzini, Bruno wrote:
> > On Qui, 2015-05-14 at 00:41 +0200, Andreas Oberritter wrote:
> > > Hello Bruno,
> > >
> > > On 13.05.2015 23:51, Bruno Bottazzini wrote:
> > > > +
> > > > +# Aggregation of Split Packages
> > > > +
> > > > +PACKAGES =+ "${PN}-services-base"
> > > > +SUMMARY_${PN}-services-base = "Base services aggregation"
> > > > +ALLOW_EMPTY_${PN}-services-base = "1"
> > > > +RDEPENDS_${PN}-services-base = " \
> > >
> > > I think it would be better to use RRECOMMENDS, in order to support
> > > BAD_RECOMMENDATIONS per image. This would also remove the need to use
> > > bb.utils.contains, because unavailable recommended packages get ignored
> > > by the package managers.
> >
> > I don't think if we should use RRECOMENDS.
> >
> > There are some packages described in services-base that it is not on the
> > default PACKAGECONFIG.
> >
> > With RRECOMENDS and with out bb.utils.contains, it will install all the
> > packages that it is described on the recipe and this is not the behavior
> > we are looking for.
> >
> > >
> > > Besides that, I wonder whether ${PN}-services would be a better name,
> > > because the -base suffix suggests that it contained only the most
> > > important services.
> >
> > Sure, we can change it.
> >
> > >
> > > Btw., sorry for commenting late again, but it's quite a big patch
> > >
> > > Regards,
> > > Andreas
> > >
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'ask-password',
> > > > '${PN}-services-ask-password', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'backlight',
> > > > '${PN}-services-backlight', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'binfmt',
> > > > '${PN}-services-binfmt', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'dbus',
> > > > '${PN}-services-dbus', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'firstboot',
> > > > '${PN}-services-firstboot', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'fuse',
> > > > '${PN}-services-fuse', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'quota',
> > > > '${PN}-services-quota', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'rfkill',
> > > > '${PN}-services-rfkill', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'timesyncd',
> > > > '${PN}-services-timesyncd', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'update',
> > > > '${PN}-services-update', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'vconsole',
> > > > '${PN}-services-vconsole', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'filesystems',
> > > > '${PN}-generators-filesystems', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'preset',
> > > > '${PN}-preset', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'fsck',
> > > > '${PN}-services-fsck', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'journal',
> > > > '${PN}-services-journal', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'modules-load',
> > > > '${PN}-services-modules-load', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'randomseed',
> > > > '${PN}-services-randomseed', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'sleep',
> > > > '${PN}-services-sleep', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'sysctl',
> > > > '${PN}-services-sysctl', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'sysusers',
> > > > '${PN}-services-sysusers', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'tmpfiles',
> > > > '${PN}-services-tmpfiles', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'udev',
> > > > '${PN}-services-udev', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'tools', '${PN}-tools',
> > > > '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'bash', '${PN}-bash',
> > > > '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'initramfs',
> > > > '${PN}-initramfs', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'kernel-install',
> > > > '${PN}-kernel-install', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'rpm-macros',
> > > > '${PN}-rpm-macros', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'zsh', '${PN}-zsh', '',
> > > > d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'bootchart',
> > > > '${PN}-services-bootchart', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'debug',
> > > > '${PN}-services-debug', '', d)} \
> > > > +${@bb.utils.contains('PACKAGECONFIG', 'machined',
> >
[OE-core] [PATCH][fido] binutils: fix native builds when host has gcc5
Cherry pick upstream commit to fix -Werror=logical-not-parentheses error when building with native gcc5. Signed-off-by: George McCollister --- meta/recipes-devtools/binutils/binutils-2.24.inc | 1 + ...86.c-Werror-logical-not-parentheses-error.patch | 76 ++ 2 files changed, 77 insertions(+) create mode 100644 meta/recipes-devtools/binutils/binutils/Fix-tc-i386.c-Werror-logical-not-parentheses-error.patch diff --git a/meta/recipes-devtools/binutils/binutils-2.24.inc b/meta/recipes-devtools/binutils/binutils-2.24.inc index 63c9287..2fb56eb 100644 --- a/meta/recipes-devtools/binutils/binutils-2.24.inc +++ b/meta/recipes-devtools/binutils/binutils-2.24.inc @@ -40,6 +40,7 @@ SRC_URI = "\ file://binutils_CVE-2014-8503.patch \ file://binutils_CVE-2014-8504.patch \ file://binutils_CVE-2014-8737.patch \ + file://Fix-tc-i386.c-Werror-logical-not-parentheses-error.patch \ " SRC_URI[md5sum] = "e0f71a7b2ddab0f8612336ac81d9636b" diff --git a/meta/recipes-devtools/binutils/binutils/Fix-tc-i386.c-Werror-logical-not-parentheses-error.patch b/meta/recipes-devtools/binutils/binutils/Fix-tc-i386.c-Werror-logical-not-parentheses-error.patch new file mode 100644 index 000..0511c39 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/Fix-tc-i386.c-Werror-logical-not-parentheses-error.patch @@ -0,0 +1,76 @@ +From 360ddc990a941bc506576f45a3858d38f508410b Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Fri, 12 Sep 2014 09:46:30 +0930 +Subject: [PATCH] Fix tc-i386.c -Werror=logical-not-parentheses error + + * config/tc-i386.c (match_template): Remove redundant "!!" testing + single-bit bitfields. + (build_modrm_byte): Don't compare single-bit bitfields to "1". + +Upstream commit: +https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=ac4eb736520174305bf6e691827f7473b858cff1 + +Manually resolved gas/ChangeLog conflict by placing the change at the +top of the file. +gas/config/tc-i386.c patched with offset + +Signed-off-by: George McCollister +--- + gas/ChangeLog| 6 ++ + gas/config/tc-i386.c | 12 ++-- + 2 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/gas/ChangeLog b/gas/ChangeLog +index 7fafa26..c6e60c9 100644 +--- a/gas/ChangeLog b/gas/ChangeLog +@@ -1,3 +1,9 @@ ++2014-09-12 Alan Modra ++ ++ * config/tc-i386.c (match_template): Remove redundant "!!" testing ++ single-bit bitfields. ++ (build_modrm_byte): Don't compare single-bit bitfields to "1". ++ + 2013-11-18 H.J. Lu + + * config/tc-i386.c (lex_got): Add a dummy "int bnd_prefix" +diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c +index 3c423da..4464091 100644 +--- a/gas/config/tc-i386.c b/gas/config/tc-i386.c +@@ -4672,9 +4672,9 @@ match_template (void) + && !operand_types[0].bitfield.regymm + && !operand_types[0].bitfield.regzmm) + || (!operand_types[t->operands > 1].bitfield.regmmx +-&& !!operand_types[t->operands > 1].bitfield.regxmm +-&& !!operand_types[t->operands > 1].bitfield.regymm +-&& !!operand_types[t->operands > 1].bitfield.regzmm)) ++&& operand_types[t->operands > 1].bitfield.regxmm ++&& operand_types[t->operands > 1].bitfield.regymm ++&& operand_types[t->operands > 1].bitfield.regzmm)) + && (t->base_opcode != 0x0fc7 + || t->extension_opcode != 1 /* cmpxchg8b */)) + continue; +@@ -4689,7 +4689,7 @@ match_template (void) + && ((!operand_types[0].bitfield.regmmx + && !operand_types[0].bitfield.regxmm) + || (!operand_types[t->operands > 1].bitfield.regmmx +- && !!operand_types[t->operands > 1].bitfield.regxmm))) ++ && operand_types[t->operands > 1].bitfield.regxmm))) + continue; + + /* Do not verify operands when there are none. */ +@@ -6139,8 +6139,8 @@ build_modrm_byte (void) + op = i.tm.operand_types[]; + op.bitfield.regmem = 0; + if ((dest + 1) >= i.operands +-|| (op.bitfield.reg32 != 1 +-&& !op.bitfield.reg64 != 1 ++|| (!op.bitfield.reg32 ++&& op.bitfield.reg64 + && !operand_type_equal (&op, ®xmm) + && !operand_type_equal (&op, ®ymm) + && !operand_type_equal (&op, ®zmm) +-- +2.4.3 + -- 2.4.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe] multiple git repos vs. AUTOREV?
On Tue, Jun 16, 2015 at 04:12:49PM +0200, Steffen Sledz wrote:
> For development purposes we use this method to build always from the HEAD
> revision of a git repository.
>
> -> snip <--
> SRCREV="${AUTOREV}"
> PV = "gitr${SRCPV}"
>
> SRC_URI = "git://g...@bitbucket.org/.../foo.git;protocol=ssh"
> -> snap <--
>
> Now we like to do the same in one recipe which uses sources from two git
> repos.
>
> Our first try was this one. But if failed..
>
> -> snip <--
> SRCREV_foo="${AUTOREV_foo}"
> SRCREV_bar="${AUTOREV_bar}"
> PV = "gitr${SRCPV_foo}+${SRCPV_bar}"
>
> SRC_URI = " \
> git://g...@bitbucket.org/.../foo.git;protocol=ssh,name=foo \
> git://g...@bitbucket.org/.../bar.git;protocol=ssh,name=bar \
> "
> -> snap <--
>
> Is it possible to do what we want? And what's the right way to do it?
You need to set SRCREV_FORMAT variable.
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [OE-Core][PATCH] {python, python3}-native: fix TypeError
On Tue, 2015-06-16 at 14:33 +0900, Changhyeok Bae wrote: > Doesn't this mean BUILD_SYS or HOST_SYS weren't set in the environment? > -> You're right. The default env value of BUILD_SYS and HOST_SYS is "" > (empty). > -> I wonder that the original patch > (12-distutils-prefix-is-inside-staging-area.patch) to add is required? > > Wouldn't this patch just mean you get a value of something like "None"? > -> My patch is to prevent errors in runtime. > -> Do you have any other good idea? My concern is that just having a value of "None" means the code trying to use this variable will probably do the wrong thing. We should try and fix the underlying problem of BUILD_SYS bot being set when it should be, rather than just hide the runtime error. How you do that depends on when the runtime error is occurring which I know little about... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 5/6] sato-icon-theme: Inherit Adwaita, not gnome-icon-theme
Adwaita is the current GNOME icon theme. Signed-off-by: Jussi Kukkonen --- .../sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch b/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch index fa595dc..2c176ee 100644 --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch @@ -22,7 +22,7 @@ index c4b03a7..688fbbf 100644 [Icon Theme] Name=Sato Comment=Sato icon theme -+Inherits=gnome ++Inherits=Adwaita Directories=16x16/apps,16x16/status,16x16/stock,16x16/places,16x16/mimetypes,16x16/devices,16x16/actions,22x22/apps,22x22/status,22x22/stock,22x22/places,22x22/mimetypes,22x22/devices,22x22/actions,32x32/apps,32x32/status,32x32/stock,32x32/places,32x32/mimetypes,32x32/devices,32x32/actions,48x48/apps,48x48/status,48x48/stock,48x48/places,48x48/mimetypes,48x48/devices,48x48/actions,64x64/apps,64x64/status,64x64/stock,64x64/places,64x64/mimetypes,64x64/devices,64x64/actions, -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 1/6] gtk-update-icon-cache-native: Upgrade, add binary
* Upgrade to GTK+ 3.16.3
* Add gtk-encode-symbolic-svg binary: it is used by icon themes
(e.g. Adwaita) to generate png versions of svg icons.
* Depend on librsvg-native for gtk-encode-symbolic-svg
* Add a patch that removes Gdk dependency from gtk-encode-symbolic-svg:
this way the native build stays slim.
Signed-off-by: Jussi Kukkonen
---
.../gtk+/gtk-update-icon-cache-native_3.16.3.bb| 63 +
.../gtk+/gtk-update-icon-cache-native_3.4.4.bb | 47 --
...k-dependency-from-gtk-encode-symbolic-svg.patch | 102 +
3 files changed, 165 insertions(+), 47 deletions(-)
create mode 100644
meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.16.3.bb
delete mode 100644
meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb
create mode 100644
meta/recipes-gnome/gtk+/gtk-update-icon-cache/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch
diff --git a/meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.16.3.bb
b/meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.16.3.bb
new file mode 100644
index 000..f4077d5
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.16.3.bb
@@ -0,0 +1,63 @@
+SUMMARY = "Native icon utils for GTK+"
+DESCRIPTION = "gtk-update-icon-cache and gtk-encode-symbolic-svg built from
GTK+ natively, for build time and on-host postinst script execution."
+SECTION = "libs"
+
+DEPENDS = "glib-2.0-native gdk-pixbuf-native librsvg-native"
+
+LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
+
+MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
+
+SRC_URI =
"http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
+ file://Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch"
+SRC_URI[md5sum] = "af22a1a753ea9b182babfed9d8b38228"
+SRC_URI[sha256sum] =
"2943fd4a6b02c2a9b2edd231c1d8f7a1d2f8d36996f14310d34f503dca9ebea4"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+
file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \
+
file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \
+
file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1"
+
+S = "${WORKDIR}/gtk+-${PV}"
+
+inherit pkgconfig native
+
+PKG_CONFIG_FOR_BUILD = "${STAGING_BINDIR_NATIVE}/pkg-config-native"
+
+do_configure() {
+ # Quite ugly but defines enough to compile the tools.
+ if ! test -f gtk/config.h; then
+ echo "#define GETTEXT_PACKAGE \"gtk30\"" >> gtk/config.h
+ echo "#define HAVE_UNISTD_H 1" >> gtk/config.h
+ echo "#define HAVE_FTW_H 1" >> gtk/config.h
+ fi
+ if ! test -f gdk/config.h; then
+ touch gdk/config.h
+ fi
+}
+
+do_compile() {
+ ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
+ ${S}/gtk/updateiconcache.c \
+ $(${PKG_CONFIG_FOR_BUILD} --cflags --libs gdk-pixbuf-2.0) \
+ -o gtk-update-icon-cache
+
+ ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
+ ${S}/gtk/encodesymbolic.c \
+ $(${PKG_CONFIG_FOR_BUILD} --cflags --libs gio-2.0
gdk-pixbuf-2.0) \
+ -o gtk-encode-symbolic-svg
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 0755 ${B}/gtk-update-icon-cache ${D}${bindir}
+ install -m 0755 ${B}/gtk-encode-symbolic-svg ${D}${bindir}
+
+ create_wrapper ${D}/${bindir}/gtk-update-icon-cache \
+
GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/2.10.0/loaders.cache
+ create_wrapper ${D}/${bindir}/gtk-encode-symbolic-svg \
+
GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/2.10.0/loaders.cache
+}
+
+# Prevent bitbake from optimizing away the native librsvg sysroot population
+do_populate_sysroot_setscene[depends] +=
"librsvg-native:do_populate_sysroot_setscene"
diff --git a/meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb
b/meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb
deleted file mode 100644
index 73b7644..000
--- a/meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-SUMMARY = "gtk-update-icon-cache built natively"
-DESCRIPTION = "Just gtk-update-icon-cache built from GTK+ natively, for
on-host postinst script execution."
-SECTION = "libs"
-
-DEPENDS = "gdk-pixbuf-native"
-
-LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
-
file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \
-
file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \
-
file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1"
-
-SRC_URI = "http://download.gnome.org/sources/gtk+/3.4/gtk+-${PV}.tar.xz";
-SRC_URI[md5sum] = "1b2cf29502a6394e8d4b30f7f5bb9131"
-SRC_URI[sha256sum] =
"f154e460075034da4c0ce89c320
[OE-core] [PATCH v3 6/6] midori: Depend on Adwaita, not gnome-icon-theme
Adwaita is the current GNOME icon theme.
Signed-off-by: Jussi Kukkonen
---
meta/recipes-sato/midori/midori_0.5.8.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-sato/midori/midori_0.5.8.bb
b/meta/recipes-sato/midori/midori_0.5.8.bb
index aa1b395..1c027fe4 100644
--- a/meta/recipes-sato/midori/midori_0.5.8.bb
+++ b/meta/recipes-sato/midori/midori_0.5.8.bb
@@ -26,6 +26,6 @@ EXTRA_OECMAKE = " \
TARGET_CC_ARCH += "${LDFLAGS}"
-RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme"
+RRECOMMENDS_${PN} += "glib-networking ca-certificates adwaita-icon-theme"
FILES_${PN} += "${datadir}/appdata"
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 4/6] matchbox-session-sato: set GTK_CSD env var
Sato practically requires server side decorations as matchbox panel draws on top of the title bar. Setting "GTK_CSD=0" informs GTK+3 that we really want server side decorations even for apps designed for CSD. Signed-off-by: Jussi Kukkonen --- meta/recipes-sato/matchbox-sato/matchbox-session-sato/session | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session index a3138b6..42ce483 100644 --- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session +++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session @@ -14,6 +14,10 @@ else KEYBOARD_APPLET="keyboard" fi +# Tell GTK+3 we really want server side decorations, even with +# GtkHeaderBar using applications: Without that mb-panel will render +# on top of the client side decorations. +export GTK_CSD=0 matchbox-desktop & -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 3/6] gtk+3: Upgrade to 3.16.3
* Drop --disable-gtk2-dependency and the patch for
gtk/native/Makefile.am: gtk-update-icon-cache is no longer used at
build time and as a result the option was removed.
* Add dependency to libepoxy
* Add dependency to virtual/mesa for wayland-egl
* Package new binaries gtk3-icon-browser and gtk-encode-symbolic-svg
* Add a backported patch that allows server side window decorations
in all cases
* RRECOMMEND adwaita-icon-theme-symbolic: GTK+ widgets expect a
symbolic theme to be installed
Signed-off-by: Jussi Kukkonen
---
meta/recipes-gnome/gtk+/gtk+3.inc | 15 +--
meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch | 118 +
.../gtk+/gtk+3/fix-flags-for-native.patch | 33 --
.../gtk+/{gtk+3_3.12.2.bb => gtk+3_3.16.3.bb} | 6 +-
4 files changed, 129 insertions(+), 43 deletions(-)
create mode 100644 meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch
delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/fix-flags-for-native.patch
rename meta/recipes-gnome/gtk+/{gtk+3_3.12.2.bb => gtk+3_3.16.3.bb} (75%)
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc
b/meta/recipes-gnome/gtk+/gtk+3.inc
index 3e36676..721ec94 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -6,7 +6,7 @@ BUGTRACKER = "https://bugzilla.gnome.org/";
SECTION = "libs"
DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \
- docbook-utils-native gdk-pixbuf-native"
+ docbook-utils-native gdk-pixbuf-native libepoxy"
LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
@@ -22,10 +22,7 @@ do_configure_prepend() {
ln -s ${TARGET_PREFIX}libtool libtool
}
-# Forcibly disable the GTK+ 2 dependency as we don't want to natively build the
-# entire GTK+ stack, or need GTK+ 2 for gtk-update-icon-cache.
EXTRA_OECONF += " \
- --disable-gtk2-dependency \
--disable-glibtest \
--disable-xinerama \
--enable-modules \
@@ -37,7 +34,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES",
"x11", "x11", "", d)}
${@bb.utils.contains("DISTRO_FEATURES", "wayland",
"wayland", "", d)}"
PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk
fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender
libxcomposite libxfixes"
-PACKAGECONFIG[wayland] =
"--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon"
+PACKAGECONFIG[wayland] =
"--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon
virtual/mesa"
do_install_append() {
mv ${D}${bindir}/gtk-update-icon-cache
${D}${bindir}/gtk-update-icon-cache-3.0
@@ -48,12 +45,14 @@ LIBV = "3.0.0"
FILES_${PN}-demo = "${bindir}/gtk3-demo \
${bindir}/gtk3-demo-application \
+${bindir}/gtk3-icon-browser \
${bindir}/gtk3-widget-factory \
${datadir}/gtk-3.0/demo \
${datadir}/applications/gtk3-demo.desktop \
+${datadir}/applications/gtk3-icon-browser.desktop \
${datadir}/applications/gtk3-widget-factory.desktop \
-${datadir}/icons/hicolor/*/apps/gtk3-demo.png \
-${datadir}/icons/hicolor/*/apps/gtk3-widget-factory.png"
+${datadir}/icons/hicolor/*/apps/gtk3-demo*.png \
+${datadir}/icons/hicolor/*/apps/gtk3-widget-factory*.png"
# The demo uses PNG files and mime type sniffing, so ensure that these
# dependencies are present.
@@ -62,6 +61,7 @@ RDEPENDS_${PN}-demo += "gdk-pixbuf-loader-png
shared-mime-info"
FILES_${PN} = "${bindir}/gtk-update-icon-cache-3.0 \
${bindir}/gtk-query-immodules-3.0 \
${bindir}/gtk-launch \
+ ${bindir}/gtk-encode-symbolic-svg \
${libdir}/lib*${SOLIBS} \
${datadir}/themes ${sysconfdir} ${datadir}/glib-2.0/schemas/ \
${libdir}/gtk-3.0/${LIBV}/engines/libpixmap.so \
@@ -85,6 +85,7 @@ FILES_${PN}-dbg += " \
${libdir}/gtk-3.0/${LIBV}/printbackends/.debug \
${libdir}/gtk-3.0/modules/.debug"
+RRECOMMENDS_${PN} = "adwaita-icon-theme-symbolic"
PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*"
diff --git a/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch
b/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch
new file mode 100644
index 000..32d8a84
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch
@@ -0,0 +1,118 @@
+window: Check if we can use CSD before enabling them
+
+Upstream-Status: Backport
+Signed-off-by: Jussi Kukkonen
+
+
+From c5e5ee67490e7e7af56052d8f8beb75db002c2f1 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi
+Date: Wed, 3 Jun 2015 14:07:29 +0100
+Subject: window: Check if we can use CSD before enabling them
+
+The change in 03213b9509fc1df16c66194ea168aed6c15110e9 changed the rules
+as to w
[OE-core] [PATCH v3 2/6] adwaita-icon-theme: Add new icon theme for GTK+
Adwaita is a complete icon theme for GTK+, and the current GNOME icon
theme. Most importantly it includes the symbolic icons used extensively
in GTK+3 widgets.
* Package the icons, symbolic icons and cursors separately
* Backport a build fix for the cursor theme to cut installed size by
11MB.
Signed-off-by: Jussi Kukkonen
---
.../Create-symlinks-when-installing-cursors.patch | 178 +
.../gnome/adwaita-icon-theme_3.16.2.1.bb | 35
2 files changed, 213 insertions(+)
create mode 100644
meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch
create mode 100644 meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb
diff --git
a/meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch
b/meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch
new file mode 100644
index 000..446f9c9
--- /dev/null
+++
b/meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch
@@ -0,0 +1,178 @@
+Create symlinks when installing cursors
+
+This cuts down the installed size by ~11MB.
+
+Upstream-Status: Backport
+Signed-off-by: Jussi Kukkonen
+
+
+From 1e8c0dd0a2de5e1d5ff60ff11f131e88510c7f50 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
+ =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?=
+Date: Sat, 16 May 2015 07:49:19 +
+Subject: [PATCH] Create symlinks when installing cursors
+
+Also support creating symlinks for W32 cursors (including L and XL variants).
+
+https://bugzilla.gnome.org/show_bug.cgi?id=749223
+---
+ Makefile.am | 93
+ configure.ac | 24
+ 2 files changed, 117 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index fed3972..4d00268 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -6,6 +6,17 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+ cursordir = $(datadir)/icons/Adwaita/cursors
+ cursor_DATA = $(wildcard $(srcdir)/Adwaita/cursors/*)
++if ENABLE_L_XL_VARIANTS
++cursorldir = $(datadir)/icons/Adwaita-Large/cursors
++cursorl_DATA = $(wildcard $(srcdir)/Adwaita-Large/cursors/*)
++cursorxldir = $(datadir)/icons/Adwaita-ExtraLarge/cursors
++cursorxl_DATA = $(wildcard $(srcdir)/Adwaita-ExtraLarge/cursors/*)
++else
++cursorldir =
++cursorl_DATA =
++cursorxldir =
++cursorxl_DATA =
++endif
+
+ theme_in_files = index.theme.in.in
+ theme_DATA = $(theme_in_files:.theme.in.in=.theme)
+@@ -99,6 +110,88 @@ install-data-local:
+ fi
+
+ install-data-hook:
++ cd $(DESTDIR)$(cursordir) && \
++ if test "x$(enable_w32_cursors)" = "xyes"; \
++ then \
++ cur=.cur && \
++ ani=.ani; \
++ else \
++ cur= && \
++ ani= ; \
++ fi; \
++ if test "x$(enable_l_xl_variants)" = "xyes"; \
++ then \
++ themedirs="$(cursordir) $(cursorldir) $(cursorxldir)"; \
++ else \
++ themedirs="$(cursordir)"; \
++ fi; \
++ for d in $$themedirs; \
++ do \
++ cd $(DESTDIR)$$d && \
++ echo Creating symlinks in $(DESTDIR)$$d && \
++ $(LN_S) -f dotbox$$cur draped_box$$cur && \
++ $(LN_S) -f dotbox$$cur icon$$cur && \
++ $(LN_S) -f dotbox$$cur target$$cur && \
++ $(LN_S) -f dotbox$$cur dot_box_mask$$cur && \
++ $(LN_S) -f X_cursor$$cur pirate$$cur && \
++ $(LN_S) -f left_ptr_watch$$ani
08e8e1c95fe2fc01f976f1e063a24ccd$$ani && \
++ $(LN_S) -f left_ptr_watch$$ani
3ecb610c1bf2410f44200f48c40d3599$$ani && \
++ $(LN_S) -f left_ptr$$cur arrow$$cur && \
++ $(LN_S) -f left_ptr$$cur top_left_arrow$$cur && \
++ $(LN_S) -f right_ptr$$cur draft_large$$cur && \
++ $(LN_S) -f right_ptr$$cur draft_small$$cur && \
++ $(LN_S) -f move$$cur
4498f0e0c1937ffe01fd06f973665830$$cur && \
++ $(LN_S) -f move$$cur
9081237383d90e509aa00f00170e968f$$cur && \
++ $(LN_S) -f copy$$cur
1081e37283d983c07f3ef6bf$$cur && \
++ $(LN_S) -f copy$$cur
6407b0e94181790501fd1e167b474872$$cur && \
++ $(LN_S) -f cross$$cur cross_reverse$$cur && \
++ $(LN_S) -f cross$$cur diamond_cross$$cur && \
++ $(LN_S) -f hand1$$cur grab$$cur && \
++ $(LN_S) -f hand2$$cur
9d800788f1b08800ae810202380a0822$$cur && \
++ $(LN_S) -f hand2$$cur
e29285e634086352946a0e7090d73106$$cur && \
++ $(LN_S) -f hand2$$cur hand$$cur &&
[OE-core] [PATCH v3 0/6] GTK+3 upgrade and related changes
Patch set upgrades GTK+3 and adds adwaita-icon-theme.
Changes since v2:
* Package Adwaita into
adwaita-icon-theme
adwaita-icon-theme-symbolic
adwaita-icon-theme-cursors
* Make gtk+3 RRECOMMEND adwaita-icon-theme-symbolic
* Re-order commits so dependencies and recommendations are logical
* Improve commit messages
* Rebase on master
The following changes since commit 379a030702c985c6e69831173f765a47dfeb8841:
bitbake: toastergui: prevent contamination of libtoaster context (2015-06-12
00:01:50 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/update-gtk3
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/update-gtk3
Jussi Kukkonen (6):
gtk-update-icon-cache-native: Upgrade, add binary
adwaita-icon-theme: Add new icon theme for GTK+
gtk+3: Upgrade to 3.16.3
matchbox-session-sato: set GTK_CSD env var
sato-icon-theme: Inherit Adwaita, not gnome-icon-theme
midori: Depend on Adwaita, not gnome-icon-theme
.../Create-symlinks-when-installing-cursors.patch | 178 +
.../gnome/adwaita-icon-theme_3.16.2.1.bb | 35
meta/recipes-gnome/gtk+/gtk+3.inc | 15 +-
meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch | 118 ++
.../gtk+/gtk+3/fix-flags-for-native.patch | 33
.../gtk+/{gtk+3_3.12.2.bb => gtk+3_3.16.3.bb} | 6 +-
.../gtk+/gtk-update-icon-cache-native_3.16.3.bb| 63
.../gtk+/gtk-update-icon-cache-native_3.4.4.bb | 47 --
...k-dependency-from-gtk-encode-symbolic-svg.patch | 102
.../matchbox-sato/matchbox-session-sato/session| 4 +
meta/recipes-sato/midori/midori_0.5.8.bb | 2 +-
.../0001-Inherit-the-GNOME-icon-theme.patch| 2 +-
12 files changed, 513 insertions(+), 92 deletions(-)
create mode 100644
meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch
create mode 100644 meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb
create mode 100644 meta/recipes-gnome/gtk+/gtk+3/Dont-force-csd.patch
delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/fix-flags-for-native.patch
rename meta/recipes-gnome/gtk+/{gtk+3_3.12.2.bb => gtk+3_3.16.3.bb} (75%)
create mode 100644
meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.16.3.bb
delete mode 100644
meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb
create mode 100644
meta/recipes-gnome/gtk+/gtk-update-icon-cache/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] multiple git repos vs. AUTOREV?
Hi Steffen,
On Tuesday 16 June 2015 16:12:49 Steffen Sledz wrote:
> For development purposes we use this method to build always from the HEAD
> revision of a git repository.
>
> -> snip <--
> SRCREV="${AUTOREV}"
> PV = "gitr${SRCPV}"
>
> SRC_URI = "git://g...@bitbucket.org/.../foo.git;protocol=ssh"
> -> snap <--
>
> Now we like to do the same in one recipe which uses sources from two git
> repos.
>
> Our first try was this one. But if failed..
>
> -> snip <--
> SRCREV_foo="${AUTOREV_foo}"
> SRCREV_bar="${AUTOREV_bar}"
> PV = "gitr${SRCPV_foo}+${SRCPV_bar}"
>
> SRC_URI = " \
> git://g...@bitbucket.org/.../foo.git;protocol=ssh,name=foo \
> git://g...@bitbucket.org/.../bar.git;protocol=ssh,name=bar \
> "
> -> snap <--
>
> Is it possible to do what we want? And what's the right way to do it?
I believe this should work:
-> snip <--
SRCREV_FORMAT = "foo_bar"
SRCREV_foo = "${AUTOREV}"
SRCREV_bar = "${AUTOREV}"
PV = "gitr${SRCPV}"
SRC_URI = " \
git://g...@bitbucket.org/.../foo.git;protocol=ssh,name=foo \
git://g...@bitbucket.org/.../bar.git;protocol=ssh,name=bar \
"
-> snap <--
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] multiple git repos vs. AUTOREV?
For development purposes we use this method to build always from the HEAD
revision of a git repository.
-> snip <--
SRCREV="${AUTOREV}"
PV = "gitr${SRCPV}"
SRC_URI = "git://g...@bitbucket.org/.../foo.git;protocol=ssh"
-> snap <--
Now we like to do the same in one recipe which uses sources from two git repos.
Our first try was this one. But if failed..
-> snip <--
SRCREV_foo="${AUTOREV_foo}"
SRCREV_bar="${AUTOREV_bar}"
PV = "gitr${SRCPV_foo}+${SRCPV_bar}"
SRC_URI = " \
git://g...@bitbucket.org/.../foo.git;protocol=ssh,name=foo \
git://g...@bitbucket.org/.../bar.git;protocol=ssh,name=bar \
"
-> snap <--
Is it possible to do what we want? And what's the right way to do it?
Thx,
Steffen
--
DResearch Fahrzeugelektronik GmbH
Otto-Schmirgal-Str. 3, 10319 Berlin, Germany
Tel: +49 30 515932-237 mailto:sl...@dresearch-fe.de
Fax: +49 30 515932-299
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 130120 B;
Ust.-IDNr. DE273952058
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] KCONF_AUDIT_LEVEL + kernel_configcheck
On 2015-06-16 04:06 AM, Patrick Ohly wrote: On Mon, 2015-06-15 at 15:48 -0400, Bruce Ashfield wrote: On 2015-06-15 8:17 AM, Patrick Ohly wrote: Hello! In Fido and master, the following patch changed the default value of KCONF_AUDIT_LEVEL: $ git annotate origin/fido -- meta/classes/kernel-yocto.bbclass | grep KCONF_AUDIT_LEVEL ad4d5949(Bruce Ashfield 2015-02-18 16:15:35 -0500 308) config_check_visibility = int(d.getVar( "KCONF_AUDIT_LEVEL", True ) or 0) $ git annotate origin/master -- meta/classes/kernel-yocto.bbclass | grep KCONF_AUDIT_LEVEL ad4d5949(Bruce Ashfield 2015-02-18 16:15:35 -0500 309) config_check_visibility = int(d.getVar( "KCONF_AUDIT_LEVEL", True ) or 0) At least if I read it right, that wasn't the intention. The commit explicitly says that the default should be 1: The visibility of auditing is controlled by KCONF_AUDIT_LEVEL: 0: no reporting 1: report options that are specified, but not in the final config 2: report options that are not hardware related, but set by a BSP The default level is 1, with level 2 and above being for BSP development only. The line is correct, since we don't want it warning for non linux-yocto meta-data enabled kernels. The default is indeed 1, since I set it in the common include file. That was the default I was referring to in that change. Ah, I missed that other part of the patch. You are right of course. foobar.cfg is used (the CONFIG_SECURITY_SMACK part is used) but the CONFIG_FOOBAR part of course is not. Shouldn't this trigger the "specified values did not make it into the kernel's final configuration"? To keep the noise down, I'm only emitting partial audit information and the warnings only apply to options that are tagged as "hardware", since that is also a synonym to 'required' in the configuration scheme. .. and no. That isn't common knowledge, since I've been slowly changing and making the audit information more visible, but don't want to flood too many warnings, or create an ABI that limits how we can change things. That explains it then. I don't remember how I learned about this kernel configuration check (might have seen the error message at some point) and came away with the impression that it applies to all configuration options. It was visible, then hidden, and then made visible again. So it has been a balancing act all along. I cannot say how much noise it would create in practice, but at least I had one specific case where I was using a non-hardware configuration not supported by the kernel and would have appreciated a warning about that ;-} This is good feedback, and I am planning to expose more of the output, including some dependency information (since without giving hints on how to fix a warning .. more warnings are not all that helpful :) Cheers, Bruce -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe] Webkit-gtk will be updated to latest upstream; midori browser to be replaced with Epiphany
On 06/16/2015 04:37 PM, Alexander Kanavin wrote: Latest epiphany will be provided as a replacement for midori. It works fine here in the core-image-sato under qemu. I can't promise it will work on ARM, but any ARM-specific issues are almost certainly in webkit's (or other web engine's) javascript JIT code and have nothing to do with the browser. Oh, and with webkit it's trivial to disable JIT at compile time; in fact I have to do it for ARMv5 and ARMv6 because it has bitrotten for those architectures due to lack of upstream testing. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Webkit-gtk will be updated to latest upstream; midori browser to be replaced with Epiphany
On 06/16/2015 04:27 PM, Andreas Müller wrote: Yes and midori is the only working browser in Yocto (I know): firefox crashes since very long time for illegal ARM instruction and chromium does not start at all. Latest epiphany will be provided as a replacement for midori. It works fine here in the core-image-sato under qemu. I can't promise it will work on ARM, but any ARM-specific issues are almost certainly in webkit's (or other web engine's) javascript JIT code and have nothing to do with the browser. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Webkit-gtk will be updated to latest upstream; midori browser to be replaced with Epiphany
On Tue, Jun 16, 2015 at 3:30 PM, Gary Thomas wrote: > On 2015-06-16 07:27, Andreas Müller wrote: >> >> On Tue, Jun 16, 2015 at 2:39 PM, Alexander Kanavin >> wrote: >>> >>> On 06/16/2015 09:50 AM, Andreas Müller wrote: >>> How about doing same as others do e.g fedora [1-2]: Keep two version of webkit-gtk based on same recent code: * gtk2/webkit1 * gtk3/webkit2 >>> >>> >>> >>> Before showing how, you need to explain why. Fedora has to package >>> webkit1 >>> because they have a lot of apps in the Gnome stack that still haven't >>> been >>> ported to webkit2. Oe-core on the other hand has only one such app: >>> midori. >> >> Yes and midori is the only working browser in Yocto (I know): firefox >> crashes since very long time for illegal ARM instruction and chromium >> does not start at all. > > > What platform are you using? Are you building these from meta-browser? > > I routinely use both firefox and chromium on ARM (i.MX6) with no problems. Hmm - I was wondering why nobody took care. All my plattforms fail: * i.MX6 base * gumstix * raspberry Pi2 I'll put this browser issue on my TODO currently I have no further time to take care. Andreas -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Webkit-gtk will be updated to latest upstream; midori browser to be replaced with Epiphany
On 2015-06-16 07:27, Andreas Müller wrote: On Tue, Jun 16, 2015 at 2:39 PM, Alexander Kanavin wrote: On 06/16/2015 09:50 AM, Andreas Müller wrote: How about doing same as others do e.g fedora [1-2]: Keep two version of webkit-gtk based on same recent code: * gtk2/webkit1 * gtk3/webkit2 Before showing how, you need to explain why. Fedora has to package webkit1 because they have a lot of apps in the Gnome stack that still haven't been ported to webkit2. Oe-core on the other hand has only one such app: midori. Yes and midori is the only working browser in Yocto (I know): firefox crashes since very long time for illegal ARM instruction and chromium does not start at all. What platform are you using? Are you building these from meta-browser? I routinely use both firefox and chromium on ARM (i.MX6) with no problems. I suggest we stop discussing my comment: You continue updating webkitgtk and I'll try to get a working browser. Andreas -- Gary Thomas | Consulting for the MLB Associates |Embedded world -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Webkit-gtk will be updated to latest upstream; midori browser to be replaced with Epiphany
On Tue, Jun 16, 2015 at 2:39 PM, Alexander Kanavin wrote: > On 06/16/2015 09:50 AM, Andreas Müller wrote: > >> How about doing same as others do e.g fedora [1-2]: Keep two version >> of webkit-gtk based on same recent code: >> >> * gtk2/webkit1 >> * gtk3/webkit2 > > > Before showing how, you need to explain why. Fedora has to package webkit1 > because they have a lot of apps in the Gnome stack that still haven't been > ported to webkit2. Oe-core on the other hand has only one such app: midori. Yes and midori is the only working browser in Yocto (I know): firefox crashes since very long time for illegal ARM instruction and chromium does not start at all. I suggest we stop discussing my comment: You continue updating webkitgtk and I'll try to get a working browser. Andreas -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [wic][PATCH v2] wic: Return error code when wic fails to invoke command
Return 1 if command doesn't exist or wic is called without
any commmand.
Return result of invoke_command as wic return code.
Added tests for unsupported command and no command.
Fixed typo in test case test02_createhelp spotted by this fix.
[YOCTO #7856]
Signed-off-by: Ed Bartosh
---
meta/lib/oeqa/selftest/wic.py | 11 ++-
scripts/lib/image/help.py | 2 ++
scripts/wic | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index 0e3f1f6..ca8fe99 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -52,7 +52,7 @@ class Wic(oeSelfTest):
def test02_createhelp(self):
"""Test wic create --help"""
-self.assertEqual(0, runCmd('wic creat --help').status)
+self.assertEqual(0, runCmd('wic create --help').status)
def test03_listhelp(self):
"""Test wic list --help"""
@@ -82,3 +82,12 @@ class Wic(oeSelfTest):
self.assertEqual(0, runCmd("wic create directdisk-gpt "
"--image-name core-image-minimal").status)
self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct")))
+
+def test07_unsupported_subcommand(self):
+"""Test unsupported subcommand"""
+self.assertEqual(1, runCmd('wic unsupported',
+ ignore_status=True).status)
+
+def test08_no_command(self):
+"""Test wic without command"""
+self.assertEqual(1, runCmd('wic', ignore_status=True).status)
diff --git a/scripts/lib/image/help.py b/scripts/lib/image/help.py
index adfe976..a546c7c 100644
--- a/scripts/lib/image/help.py
+++ b/scripts/lib/image/help.py
@@ -63,11 +63,13 @@ def invoke_subcommand(args, parser, main_command_usage,
subcommands):
if not args:
logging.error("No subcommand specified, exiting")
parser.print_help()
+return 1
elif args[0] == "help":
wic_help(args, main_command_usage, subcommands)
elif args[0] not in subcommands:
logging.error("Unsupported subcommand %s, exiting\n" % (args[0]))
parser.print_help()
+return 1
else:
usage = subcommands.get(args[0], subcommand_error)[1]
subcommands.get(args[0], subcommand_error)[0](args[1:], usage)
diff --git a/scripts/wic b/scripts/wic
index cf96859..d48e45d 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -305,7 +305,7 @@ def main(argv):
parser.print_help()
sys.exit(1)
-hlp.invoke_subcommand(args, parser, hlp.wic_help_usage, subcommands)
+return hlp.invoke_subcommand(args, parser, hlp.wic_help_usage, subcommands)
if __name__ == "__main__":
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Webkit-gtk will be updated to latest upstream; midori browser to be replaced with Epiphany
On 06/16/2015 09:50 AM, Andreas Müller wrote: How about doing same as others do e.g fedora [1-2]: Keep two version of webkit-gtk based on same recent code: * gtk2/webkit1 * gtk3/webkit2 Before showing how, you need to explain why. Fedora has to package webkit1 because they have a lot of apps in the Gnome stack that still haven't been ported to webkit2. Oe-core on the other hand has only one such app: midori. Also, webkit1 has been deprecated for years, and there is no commitment from upstream to maintain the 2.4.x series which is the last that still has it in the source tree; they may cease to do it at any moment. So once again, why keep it in oe-core? Regards, Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] packagegroup-core-tools-profile.bb: Remove oprofile.
On 16 June 2015 at 13:33, Philip Balister wrote: > My gut feeling is people are moving to perf, which is also part of > tools-profile. > Indeed. Porting oprofileui to perf is one option here - as usual I've forgotten why oprofile is still a thing considering perf is also in-tree now... Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] packagegroup-core-tools-profile.bb: Remove oprofile.
On 06/16/2015 08:08 AM, Burton, Ross wrote: > On 1 June 2015 at 21:17, Philip Balister wrote: > >> Oprofile functions duplicate perf. Since perf is easier to use drop >> oprofile >> from the core-tools-profile package. >> >> Also, the oprofile-ui package opens a port on the device. removing this >> package reduces a possible security issue for devices with profiling tools. >> > > I filed this in the "think about" box when you submitted it, but then > failed to think. My concern was "oprofile is the profiling tool we support > with oprofileui on the host" but that point is fairly moot right now as > oprofileui doesn't work anymore... (#7054). > > When that's fixed, we can re-add the tooling as appropriate. My gut feeling is people are moving to perf, which is also part of tools-profile. Philip > > Ross > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [wic][PATCH v2] wic: Document creation of empty partition
Added short explanation of how to create empty pattition to the 'wic help kickstart' output. [YOCTO #7131] Signed-off-by: Ed Bartosh --- scripts/lib/image/help.py | 4 1 file changed, 4 insertions(+) diff --git a/scripts/lib/image/help.py b/scripts/lib/image/help.py index 14f0ff1..adfe976 100644 --- a/scripts/lib/image/help.py +++ b/scripts/lib/image/help.py @@ -707,6 +707,10 @@ DESCRIPTION up being are dependent on the given plugin implementation. + If --source option is not used, the wic command + will create empty partition. --size parameter has + to be used to specify size of empty partition. + --ondisk or --ondrive: Forces the partition to be created on a particular disk. -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] packagegroup-core-tools-profile.bb: Remove oprofile.
On 1 June 2015 at 21:17, Philip Balister wrote: > Oprofile functions duplicate perf. Since perf is easier to use drop > oprofile > from the core-tools-profile package. > > Also, the oprofile-ui package opens a port on the device. removing this > package reduces a possible security issue for devices with profiling tools. > I filed this in the "think about" box when you submitted it, but then failed to think. My concern was "oprofile is the profiling tool we support with oprofileui on the host" but that point is fairly moot right now as oprofileui doesn't work anymore... (#7054). When that's fixed, we can re-add the tooling as appropriate. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [wic][PATCH] wic: Document creation of empty partition
Added short explanation of how to create empty pattition to the 'wic help kickstart' command output. Signed-off-by: Ed Bartosh --- scripts/lib/image/help.py | 4 1 file changed, 4 insertions(+) diff --git a/scripts/lib/image/help.py b/scripts/lib/image/help.py index 14f0ff1..adfe976 100644 --- a/scripts/lib/image/help.py +++ b/scripts/lib/image/help.py @@ -707,6 +707,10 @@ DESCRIPTION up being are dependent on the given plugin implementation. + If --source option is not used, the wic command + will create empty partition. --size parameter has + to be used to specify size of empty partition. + --ondisk or --ondrive: Forces the partition to be created on a particular disk. -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] dbus: Upgrade 1.8.16 -> 1.8.18
Signed-off-by: Jussi Kukkonen --- meta/recipes-core/dbus/dbus_1.8.16.bb | 4 meta/recipes-core/dbus/dbus_1.8.18.bb | 4 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 meta/recipes-core/dbus/dbus_1.8.16.bb create mode 100644 meta/recipes-core/dbus/dbus_1.8.18.bb diff --git a/meta/recipes-core/dbus/dbus_1.8.16.bb b/meta/recipes-core/dbus/dbus_1.8.16.bb deleted file mode 100644 index b549651..000 --- a/meta/recipes-core/dbus/dbus_1.8.16.bb +++ /dev/null @@ -1,4 +0,0 @@ -include dbus.inc - -SRC_URI[md5sum] = "020824a38850501e7d6ba8307a7c5ac3" -SRC_URI[sha256sum] = "7f795268efd343ff0498786acb35097564390d40b1b6158daf1b4f742b522b07" diff --git a/meta/recipes-core/dbus/dbus_1.8.18.bb b/meta/recipes-core/dbus/dbus_1.8.18.bb new file mode 100644 index 000..2932b7a --- /dev/null +++ b/meta/recipes-core/dbus/dbus_1.8.18.bb @@ -0,0 +1,4 @@ +include dbus.inc + +SRC_URI[md5sum] = "83e607e9ccb1c921d5b6bbea2376a36c" +SRC_URI[sha256sum] = "36f2eb9c777a3c71562573da36a147e900a642afcd44d2b0470d992a4898c4f2" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] Upgrade D-Bus
Upgrade dbus and bring dbus-test to matching version.
Ptests pass.
The following changes since commit 379a030702c985c6e69831173f765a47dfeb8841:
bitbake: toastergui: prevent contamination of libtoaster context (2015-06-12
00:01:50 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/dbus
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/dbus
Jussi Kukkonen (2):
dbus: Upgrade 1.8.16 -> 1.8.18
dbus-test: Upgrade 1.8.10 -> 1.8.18
meta/recipes-core/dbus/{dbus-test_1.8.10.bb => dbus-test_1.8.18.bb} | 4 ++--
meta/recipes-core/dbus/dbus_1.8.16.bb | 4
meta/recipes-core/dbus/dbus_1.8.18.bb | 4
3 files changed, 6 insertions(+), 6 deletions(-)
rename meta/recipes-core/dbus/{dbus-test_1.8.10.bb => dbus-test_1.8.18.bb}
(93%)
delete mode 100644 meta/recipes-core/dbus/dbus_1.8.16.bb
create mode 100644 meta/recipes-core/dbus/dbus_1.8.18.bb
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] dbus-test: Upgrade 1.8.10 -> 1.8.18
Signed-off-by: Jussi Kukkonen
---
meta/recipes-core/dbus/{dbus-test_1.8.10.bb => dbus-test_1.8.18.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/dbus/{dbus-test_1.8.10.bb => dbus-test_1.8.18.bb}
(93%)
diff --git a/meta/recipes-core/dbus/dbus-test_1.8.10.bb
b/meta/recipes-core/dbus/dbus-test_1.8.18.bb
similarity index 93%
rename from meta/recipes-core/dbus/dbus-test_1.8.10.bb
rename to meta/recipes-core/dbus/dbus-test_1.8.18.bb
index 719c1f9..e138f6e 100644
--- a/meta/recipes-core/dbus/dbus-test_1.8.10.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.8.18.bb
@@ -18,8 +18,8 @@ SRC_URI =
"http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
"
-SRC_URI[md5sum] = "6be5ef99ae784de9d04589eb067fe038"
-SRC_URI[sha256sum] =
"10bf87fdb68815edd01d53885101dbcdd80dacad7198912cca61a4fa22dfaf8e"
+SRC_URI[md5sum] = "83e607e9ccb1c921d5b6bbea2376a36c"
+SRC_URI[sha256sum] =
"36f2eb9c777a3c71562573da36a147e900a642afcd44d2b0470d992a4898c4f2"
S="${WORKDIR}/dbus-${PV}"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] packagegroup-core-tools-profile.bb: Remove oprofile.
Ping
On 06/01/2015 04:17 PM, Philip Balister wrote:
> Oprofile functions duplicate perf. Since perf is easier to use drop oprofile
> from the core-tools-profile package.
>
> Also, the oprofile-ui package opens a port on the device. removing this
> package reduces a possible security issue for devices with profiling tools.
>
> Signed-off-by: Philip Balister
> ---
> meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git
> a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
> b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
> index 6f4842f..80f5933 100644
> --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
> +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
> @@ -19,15 +19,12 @@ PROFILE_TOOLS_SYSTEMD =
> "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'sys
> RRECOMMENDS_${PN} = "\
> perf \
> trace-cmd \
> -kernel-module-oprofile \
> blktrace \
> ${PROFILE_TOOLS_X} \
> ${PROFILE_TOOLS_SYSTEMD} \
> "
>
> PROFILETOOLS = "\
> -oprofile \
> -oprofileui-server \
> powertop \
> latencytop \
> "
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] packagegroup-core-sdk.bb: Drop distcc from the core-sdk.
Ping On 06/01/2015 04:17 PM, Philip Balister wrote: > distcc has been used in the past to speed up native compile across > several machines. This is less an issue on modern embedded systems. > > Also, improvements in sdk generation have reduced the need for on target > compile of large projects. > > Since the distcc packages start a daemon at boot, drop it from the > packagegroup to avoid having some slight runtime impact on systems > installing an sdk. > > Signed-off-by: Philip Balister > --- > meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb > b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb > index a41eada..9b26387 100644 > --- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb > +++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb > @@ -23,7 +23,6 @@ RDEPENDS_packagegroup-core-sdk = "\ > findutils \ > quilt \ > less \ > -distcc \ > ldd \ > file \ > tcl" > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] libpcap: fix PACKAGECONFIG
On 16 June 2015 at 03:20, Robert Yang wrote: > After more thoughts, add a dummy PACKAGECONFIG can avoid confusing > the user, and avoid the warning, so I updated in the repo: > Yes, that's what I meant - thanks. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2][fido 4/4] runqemu-internal: set mutual exclusiveness for serial and nographic options
Use "-nographic" option only if "serial" option is not
specified. Otherwise we get below error when
'runqemu serial' is executed,
(snip)
QEMU 2.2.0 monitor - type 'help' for more information
(qemu) qemu-system-aarch64: -serial stdio: cannot use stdio by multiple
character devices
-- CUT --
Signed-off-by: Jagadeesh Krishnanjanappa
---
scripts/runqemu-internal | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index fb51754..e346c64 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -275,9 +275,6 @@ else
KERNCMDLINE="mem=$QEMU_MEMORY"
QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice wacom-tablet"
-if [ $MACHINE = 'qemuarm64' ]; then
-QEMU_UI_OPTIONS="-nographic"
-fi
NFS_INSTANCE=`echo $TAP | sed 's/tap//'`
export NFS_INSTANCE
@@ -383,7 +380,11 @@ if [ "$MACHINE" = "qemuarm64" ]; then
QEMU=qemu-system-aarch64
export QEMU_AUDIO_DRV="none"
-QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
+if [ "x$SERIALSTDIO" = "x" ] ; then
+QEMU_UI_OPTIONS="-nographic"
+else
+QEMU_UI_OPTIONS=""
+fi
if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
KERNCMDLINE="root=/dev/vda rw console=ttyAMA0,38400 mem=$QEMU_MEMORY
highres=off $KERNEL_NETWORK_CMD"
# qemu-system-aarch64 only support '-machine virt -cpu cortex-a57' for
now
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2][fido 2/4] runqemu-script: define console for qemuarm NFS booting
Add console=ttyAMA0,115200 as one of the boot parameters
for qemuarm, in order to print bootlog messages on the
console.
Signed-off-by: Jagadeesh Krishnanjanappa
---
scripts/runqemu-internal | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 2db5566..dc0e053 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -368,7 +368,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o
"$MACHINE" = "qemuarm
cleanup
return 1
fi
-KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw
$KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
+KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw
console=ttyAMA0,115200 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} --no-reboot
$QEMU_UI_OPTIONS"
fi
if [ "$MACHINE" = "qemuarmv6" ]; then
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2][fido 3/4] runqemu-internal: add support to boot arm64 qemu target via NFS
Add required boot parameters inorder to boot arm64 qemu target via NFS Signed-off-by: Jagadeesh Krishnanjanappa --- scripts/runqemu-internal | 9 + 1 file changed, 9 insertions(+) diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index dc0e053..fb51754 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -389,6 +389,15 @@ if [ "$MACHINE" = "qemuarm64" ]; then # qemu-system-aarch64 only support '-machine virt -cpu cortex-a57' for now QEMUOPTIONS="$QEMU_NETWORK_CMD -machine virt -cpu cortex-a57 $ROOTFS_OPTIONS $QEMU_UI_OPTIONS" fi +if [ "$FSTYPE" = "nfs" ]; then +if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then +echo "Error: NFS mount point $ROOTFS doesn't exist" +cleanup +return 1 +fi +KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw console=ttyAMA0,38400 mem=$QEMU_MEMORY highres=off $KERNEL_NETWORK_CMD" +QEMUOPTIONS="$QEMU_NETWORK_CMD -machine virt -cpu cortex-a57 $QEMU_UI_OPTIONS" +fi fi -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2][fido 1/4] runqemu: fix MACHINE being detected as qemuarm for qemuarm64 kernel image
Basically, runqemu script autodetects MACHINE type based on the kernel image name; if MACHINE name is not specified. Since 'qemuarm' string is common in both qemuarm amnd qemuarm64 kernel image names, the MACHINE type is considered as 'qemuarm' even when qemuarm64 kernel image name is given in command line. Signed-off-by: Jagadeesh Krishnanjanappa --- scripts/runqemu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 84ece4d..09c507d 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -232,13 +232,13 @@ fi if [ -z "$MACHINE" ]; then if [ "x$FSTYPE" = "xvmdk" ]; then -MACHINE=`basename $VM | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'` +MACHINE=`basename $VM | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'` if [ -z "$MACHINE" ]; then error "Unable to set MACHINE from vmdk filename [$VM]" fi echo "Set MACHINE to [$MACHINE] based on vmdk [$VM]" else -MACHINE=`basename $KERNEL | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'` +MACHINE=`basename $KERNEL | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'` if [ -z "$MACHINE" ]; then error "Unable to set MACHINE from kernel filename [$KERNEL]" fi -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2 2/4] distrodata: Remove unnecessary include of package_regex.inc
On 4 June 2015 at 19:42, Aníbal Limón wrote: > This causes a warning when follow documentation to use distrodata > class that points to include, > > include conf/distro/include/distro_alias.inc > include conf/distro/include/recipe_color.inc > include conf/distro/include/maintainers.inc > include conf/distro/include/upstream_tracking.inc > include conf/distro/include/package_regex.inc > INHERIT+= "distrodata" > Can we revert this? Instead make the class include the configuration files that it needs, and update the documentation. As Paul pointed out in a bug earlier several of these files can be deleted now anyway, and having distrodata working with just a simple INHERIT is much neater. (by which I mean: I've reverted this in master-under-test, shout if you have a good argument against this) Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [wic][PATCH] oe-selftest: wic: Fix testcase
Fixed test05_build_artifacts testcase by using values of MACHINE
and BUILD_SYS bitbake variables in paths to artifacts.
Test was failing because of hardcoded machine(qemux86) and
build_sys(qemux86-poky-linux) in artifact paths.
[YOCTO #7730]
Signed-off-by: Ed Bartosh
---
meta/lib/oeqa/selftest/wic.py | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index 358f09e..0e3f1f6 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -29,7 +29,7 @@ from glob import glob
from shutil import rmtree
from oeqa.selftest.base import oeSelfTest
-from oeqa.utils.commands import runCmd, bitbake
+from oeqa.utils.commands import runCmd, bitbake, get_bb_var
class Wic(oeSelfTest):
"""Wic test class."""
@@ -66,12 +66,15 @@ class Wic(oeSelfTest):
def test05_build_artifacts(self):
"""Test wic create directdisk providing all artifacts."""
-self.assertEqual(0, runCmd("wic create directdisk "
- "-b tmp/sysroots/qemux86/usr/share "
- "-k tmp/deploy/images/qemux86 "
- "-n tmp/sysroots/x86_64-linux "
- "-r tmp/work/qemux86-poky-linux/"
- "core-image-minimal/1.0-r0/rootfs").status)
+vars = {'machine': get_bb_var('MACHINE'),
+'buildsys': get_bb_var('BUILD_SYS')}
+status = runCmd("wic create directdisk "
+"-b tmp/sysroots/%(machine)s/usr/share "
+"-k tmp/deploy/images/%(machine)s "
+"-n tmp/sysroots/%(buildsys)s "
+"-r tmp/work/%(machine)s-poky-linux/"
+"core-image-minimal/1.0-r0/rootfs" % vars).status
+self.assertEqual(0, status)
self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct")))
def test06_gpt_image(self):
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] [meta-oe] opencv: Add OpenCV 3.0
Hello Khem
Unfortunately It uses the same header file names :(
Regards!
On Sun, Jun 14, 2015 at 5:42 PM, Khem Raj wrote:
> On Tue, Jun 9, 2015 at 10:07 AM, Ricardo Ribalda Delgado
> wrote:
>> -Support for new PACKAGECONFIGS
>> -Merge with opencv-samples
>>
>> Since it is not backward compatible with 2.x and cannot be installed in
>> parallel it has a DEFAULT_PREFERENCE of -1.
>
> I would have thought that ABI breakages like this should be parallel
> installable to facilitate migration path. Are you sure it can not live
> together with opencv2 ?
> if it could I would have suggested to call the recipe opencv3_xx.bb
>
>>
>> Signed-off-by: Ricardo Ribalda Delgado
>> ---
>> meta-oe/recipes-support/opencv/opencv_3.0.bb | 127
>> +++
>> 1 file changed, 127 insertions(+)
>> create mode 100644 meta-oe/recipes-support/opencv/opencv_3.0.bb
>>
>> diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb
>> b/meta-oe/recipes-support/opencv/opencv_3.0.bb
>> new file mode 100644
>> index ..60a96af1fe68
>> --- /dev/null
>> +++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb
>> @@ -0,0 +1,127 @@
>> +SUMMARY = "Opencv : The Open Computer Vision Library"
>> +HOMEPAGE = "http://opencv.willowgarage.com/wiki/";
>> +SECTION = "libs"
>> +
>> +LICENSE = "BSD"
>> +LIC_FILES_CHKSUM =
>> "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14"
>> +
>> +ARM_INSTRUCTION_SET = "arm"
>> +
>> +DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0
>> oracle-jse-jdk ant"
>> +
>> +DEFAULT_PREFERENCE = "-1"
>> +
>> +SRCREV_opencv = "424c2bddb39dae97dc4639a24eaa0e0c8fbb8e69"
>> +SRCREV_contrib = "844c30e8b2f2f4b34b96a169fafe9beea3c45e87"
>> +SRCREV_FORMAT = "opencv"
>> +SRC_URI = "git://github.com/Itseez/opencv.git;nobranch=1;name=opencv \
>> +
>> git://github.com/Itseez/opencv_contrib.git;nobranch=1;destsuffix=contrib;name=contrib"
>> +
>> +PV = "3.0+git${SRCPV}"
>> +
>> +S = "${WORKDIR}/git"
>> +
>> +EXTRA_OECMAKE =
>> "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include
>> \
>> +-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
>> + -DWITH_1394=OFF \
>> + -DCMAKE_SKIP_RPATH=ON \
>> + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3",
>> "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
>> + ${@base_conditional("libdir", "/usr/lib64",
>> "-DLIB_SUFFIX=64", "", d)} \
>> + ${@base_conditional("libdir", "/usr/lib32",
>> "-DLIB_SUFFIX=32", "", d)} \
>> +"
>> +
>> +PACKAGECONFIG ??= "eigen jpeg libav png tiff v4l tbb samples\
>> + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk",
>> "", d)}"
>> +PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen,"
>> +PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3,"
>> +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg,"
>> +PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav,"
>> +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,"
>> +PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff,"
>> +PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils,"
>> +PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper,"
>> +PACKAGECONFIG[amdblas] =
>> "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,"
>> +PACKAGECONFIG[amdfft] =
>> "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,"
>> +PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers,"
>> +PACKAGECONFIG[gstreamer] =
>> "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0
>> gstreamer1.0-plugins-base,"
>> +PACKAGECONFIG[oracle-java-amd64] =
>> "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include
>> -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux
>> -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include
>> -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so
>> -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,oracle-jse-jdk
>> ant,"
>> +PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON
>> -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,,"
>> +PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb,"
>> +
>> +inherit distutils-base pkgconfig cmake
>> +
>> +export BUILD_SYS
>> +export HOST_SYS
>> +export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}"
>> +export PYTHON="${STAGING_BINDIR_NATIVE}/python"
>> +export JAVA_HOME="${STAGING_DIR_TARGET}/usr/share/java/"
>> +export ANT_DIR="${STAGING_DIR_TARGET}/usr/share/ant/"
>> +
>> +TARGET_CC_ARCH += "-I${S}/include "
>> +
>> +PACKAGES += "${PN}-java-dbg ${PN}-java ${PN}-samples-dbg ${PN}-samples
>> ${PN}-apps python-opencv"
>> +
>> +python populate_packages_prepend () {
>> +cv_libdir = d.expand('${libdir}')
>> +cv_libdir_dbg = d.expand('${libdir}/.debug')
>> +do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV
>> %s development package', extra_depends='${PN}-dev', a
Re: [OE-core] [PATCH][fido] runqemu: add support to boot arm64 qemu target from NFS
On 9 June 2015 at 05:48, Jagadeesh Krishnanjanappa < jkrishnanjana...@mvista.com> wrote: > The other changes include, > runqemu - fix MACHINE type being detected as qemuarm when qemuarm64 kernel > image name is given. > > runqemu-internal - Added console=ttyAMA0,115200 as one of the boot > parameters >for qemuarm, in order to print bootlog messages on the >console. > > - Use "-nographic" option only if "serial" option is not >specified. Otherwise we get below error when >'runqemu serial' is > executed, > > (snip) > QEMU 2.2.0 monitor - type 'help' for more information > (qemu) qemu-system-aarch64: -serial stdio: cannot use stdio by multiple > character devices > -- CUT -- > > qemuarm64 NFS booting has been tested successfully on Ubuntu 14.04 host. > So many changes that are unrelated to NFS on qemuarm64, please split the patch up. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 06/11] init-install: Implement UUID support
Used partition UUID in kernel command line to specify root partition.
Searched root device by file system uuid in GRUB configuration.
Used partition UUID in /etc/fstab to specify swap partition.
Used filesystem UUID in /etc/fstab to specify boot partition.
[YOCTO #6101]
Signed-off-by: Ed Bartosh
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh
b/meta/recipes-core/initrdscripts/files/init-install.sh
index 298ea8d..9957c15 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -196,8 +196,17 @@ mount -o rw,loop,noatime,nodiratime /run/media/$1/$2
/src_root
echo "Copying rootfs files..."
cp -a /src_root/* /tgt_root
if [ -d /tgt_root/etc/ ] ; then
-echo "$swapswap swap defaults
0 0" >> /tgt_root/etc/fstab
-echo "$bootfs /bootext3 defaults
1 2" >> /tgt_root/etc/fstab
+if [ $grub_version -ne 0 ] ; then
+boot_uuid=$(blkid -o value -s UUID ${device}2)
+swap_part_uuid=$(blkid -o value -s PARTUUID ${device}4)
+bootdev="UUID=$boot_uuid"
+swapdev=/dev/disk/by-partuuid/$swap_part_uuid
+else
+bootdev=${device}2
+swapdev=${device}4
+fi
+echo "$swapdevswap swap defaults
0 0" >> /tgt_root/etc/fstab
+echo "$bootdev /bootext3 defaults
1 2" >> /tgt_root/etc/fstab
# We dont want udev to mount our root device while we're booting...
if [ -d /tgt_root/etc/udev/ ] ; then
echo "/dev/${device}" >> /tgt_root/etc/udev/mount.blacklist
@@ -209,22 +218,24 @@ umount /src_root
# Handling of the target boot partition
mount $bootfs /boot
echo "Preparing boot partition..."
-if [ -f /etc/grub.d/00_header ] ; then
+if [ -f /etc/grub.d/00_header -a $grub_version -ne 0 ] ; then
echo "Preparing custom grub2 menu..."
+root_part_uuid=$(blkid -o value -s PARTUUID /dev/${device}3)
+boot_uuid=$(blkid -o value -s UUID /dev/${device}2)
GRUBCFG="/boot/grub/grub.cfg"
mkdir -p $(dirname $GRUBCFG)
cat >$GRUBCFG <<_EOF
menuentry "Linux" {
-set root=(hd0,2)
-linux /vmlinuz root=$rootfs $rootwait rw $5 $3 $4 quiet
+search --no-floppy --fs-uuid $boot_uuid --set root
+linux /vmlinuz root=PARTUUID=$root_part_uuid $rootwait rw $5 $3 $4 quiet
}
_EOF
chmod 0444 $GRUBCFG
fi
grub-install /dev/${device}
-echo "(hd0) /dev/${device}" > /boot/grub/device.map
if [ $grub_version -eq 0 ] ; then
+echo "(hd0) /dev/${device}" > /boot/grub/device.map
echo "Preparing custom grub menu..."
echo "default 0" > /boot/grub/menu.lst
echo "timeout 30" >> /boot/grub/menu.lst
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 11/11] init-install: Properly delete partition table
Fixed deletion of the partition table by increasing
amount of sectors from 2(correct for msdos PT) to 35 as
GPT size is 34 sectors + 1 sector for protective MBR.
Signed-off-by: Ed Bartosh
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index 74372b0..14939ac 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -127,7 +127,7 @@ echo "Rootfs partition size: $rootfs_size MB ($rootfs)"
echo "Swap partition size: $swap_size MB ($swap)"
echo "*"
echo "Deleting partition table on ${device} ..."
-dd if=/dev/zero of=${device} bs=512 count=2
+dd if=/dev/zero of=${device} bs=512 count=35
echo "Creating new partition table on ${device} ..."
parted ${device} mklabel gpt
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh
b/meta/recipes-core/initrdscripts/files/init-install.sh
index 0593b3c..7fccdde 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -153,7 +153,7 @@ echo "Rootfs partition size: $rootfs_size MB ($rootfs)"
echo "Swap partition size: $swap_size MB ($swap)"
echo "*"
echo "Deleting partition table on ${device} ..."
-dd if=/dev/zero of=${device} bs=512 count=2
+dd if=/dev/zero of=${device} bs=512 count=35
echo "Creating new partition table on ${device} ..."
if [ $grub_version -eq 0 ] ; then
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 07/11] init-install: Specify filesystem type in parted command line
Explicitly specified filesystem type for parted mkpart command.
This makes partition table to look more informative.
Signed-off-by: Ed Bartosh
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index 5fb4d4d..7f3e889 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -134,14 +134,14 @@ echo "Creating new partition table on /dev/${device} ..."
parted /dev/${device} mklabel gpt
echo "Creating boot partition on $bootfs"
-parted /dev/${device} mkpart primary 0% $boot_size
+parted /dev/${device} mkpart primary fat32 0% $boot_size
parted /dev/${device} set 1 boot on
echo "Creating rootfs partition on $rootfs"
-parted /dev/${device} mkpart primary $rootfs_start $rootfs_end
+parted /dev/${device} mkpart primary ext3 $rootfs_start $rootfs_end
echo "Creating swap partition on $swap"
-parted /dev/${device} mkpart primary $swap_start 100%
+parted /dev/${device} mkpart primary linux-swap $swap_start 100%
parted /dev/${device} print
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh
b/meta/recipes-core/initrdscripts/files/init-install.sh
index 9957c15..10aed07 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -159,21 +159,21 @@ echo "Creating new partition table on /dev/${device} ..."
if [ $grub_version -eq 0 ] ; then
parted /dev/${device} mktable msdos
echo "Creating boot partition on $bootfs"
-parted /dev/${device} mkpart primary 0% $boot_size
+parted /dev/${device} mkpart primary ext3 0% $boot_size
else
parted /dev/${device} mktable gpt
echo "Creating BIOS boot partition on $bios_boot"
parted /dev/${device} mkpart primary 0% $bios_boot_size
parted /dev/${device} set 1 bios_grub on
echo "Creating boot partition on $bootfs"
-parted /dev/${device} mkpart primary $boot_start $boot_size
+parted /dev/${device} mkpart primary ext3 $boot_start $boot_size
fi
echo "Creating rootfs partition on $rootfs"
-parted /dev/${device} mkpart primary $rootfs_start $rootfs_end
+parted /dev/${device} mkpart primary ext3 $rootfs_start $rootfs_end
echo "Creating swap partition on $swap"
-parted /dev/${device} mkpart primary $swap_start 100%
+parted /dev/${device} mkpart primary linux-swap $swap_start 100%
parted /dev/${device} print
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 08/11] init-install: Specify partition name in parted command line
parted allows to use names for partitions if GPT partition table
is used on the device. msdos partitioning can have only partition
types: 'primary', 'logical' or 'extended'.
Used meaningful partition names in parted command line for GPT
partitioning.
Signed-off-by: Ed Bartosh
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index 7f3e889..a6a8679 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -134,14 +134,14 @@ echo "Creating new partition table on /dev/${device} ..."
parted /dev/${device} mklabel gpt
echo "Creating boot partition on $bootfs"
-parted /dev/${device} mkpart primary fat32 0% $boot_size
+parted /dev/${device} mkpart boot fat32 0% $boot_size
parted /dev/${device} set 1 boot on
echo "Creating rootfs partition on $rootfs"
-parted /dev/${device} mkpart primary ext3 $rootfs_start $rootfs_end
+parted /dev/${device} mkpart root ext3 $rootfs_start $rootfs_end
echo "Creating swap partition on $swap"
-parted /dev/${device} mkpart primary linux-swap $swap_start 100%
+parted /dev/${device} mkpart swap linux-swap $swap_start 100%
parted /dev/${device} print
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh
b/meta/recipes-core/initrdscripts/files/init-install.sh
index 10aed07..c57a0f3 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -163,17 +163,19 @@ if [ $grub_version -eq 0 ] ; then
else
parted /dev/${device} mktable gpt
echo "Creating BIOS boot partition on $bios_boot"
-parted /dev/${device} mkpart primary 0% $bios_boot_size
+parted /dev/${device} mkpart bios_boot 0% $bios_boot_size
parted /dev/${device} set 1 bios_grub on
echo "Creating boot partition on $bootfs"
-parted /dev/${device} mkpart primary ext3 $boot_start $boot_size
+parted /dev/${device} mkpart boot ext3 $boot_start $boot_size
fi
echo "Creating rootfs partition on $rootfs"
-parted /dev/${device} mkpart primary ext3 $rootfs_start $rootfs_end
+[ $grub_version -eq 0 ] && pname='primary' || pname='root'
+parted /dev/${device} mkpart $pname ext3 $rootfs_start $rootfs_end
echo "Creating swap partition on $swap"
-parted /dev/${device} mkpart primary linux-swap $swap_start 100%
+[ $grub_version -eq 0 ] && pname='primary' || pname='swap'
+parted /dev/${device} mkpart $pname linux-swap $swap_start 100%
parted /dev/${device} print
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 10/11] init-install: code cleanup: replace /dev/$device -> $device
Shortened code by including /dev/ prefix into variable.
Signed-off-by: Ed Bartosh
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index dca1432..74372b0 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -83,7 +83,7 @@ else
exit 1
fi
-device=$TARGET_DEVICE_NAME
+device=/dev/$TARGET_DEVICE_NAME
#
# The udev automounter can cause pain here, kill it
@@ -94,12 +94,12 @@ rm -f /etc/udev/scripts/mount*
#
# Unmount anything the automounter had mounted
#
-umount /dev/${device}* 2> /dev/null || /bin/true
+umount ${device}* 2> /dev/null || /bin/true
mkdir -p /tmp
cat /proc/mounts > /etc/mtab
-disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 |
sed -e "s/MB//")
+disk_size=$(parted ${device} unit mb print | grep Disk | cut -d" " -f 3 | sed
-e "s/MB//")
swap_size=$((disk_size*swap_ratio/100))
rootfs_size=$((disk_size-boot_size-swap_size))
@@ -117,32 +117,32 @@ if [ ! "${device#mmcblk}" = "${device}" ]; then
part_prefix="p"
rootwait="rootwait"
fi
-bootfs=/dev/${device}${part_prefix}1
-rootfs=/dev/${device}${part_prefix}2
-swap=/dev/${device}${part_prefix}3
+bootfs=${device}${part_prefix}1
+rootfs=${device}${part_prefix}2
+swap=${device}${part_prefix}3
echo "*"
echo "Boot partition size: $boot_size MB ($bootfs)"
echo "Rootfs partition size: $rootfs_size MB ($rootfs)"
echo "Swap partition size: $swap_size MB ($swap)"
echo "*"
-echo "Deleting partition table on /dev/${device} ..."
-dd if=/dev/zero of=/dev/${device} bs=512 count=2
+echo "Deleting partition table on ${device} ..."
+dd if=/dev/zero of=${device} bs=512 count=2
-echo "Creating new partition table on /dev/${device} ..."
-parted /dev/${device} mklabel gpt
+echo "Creating new partition table on ${device} ..."
+parted ${device} mklabel gpt
echo "Creating boot partition on $bootfs"
-parted /dev/${device} mkpart boot fat32 0% $boot_size
-parted /dev/${device} set 1 boot on
+parted ${device} mkpart boot fat32 0% $boot_size
+parted ${device} set 1 boot on
echo "Creating rootfs partition on $rootfs"
-parted /dev/${device} mkpart root ext3 $rootfs_start $rootfs_end
+parted ${device} mkpart root ext3 $rootfs_start $rootfs_end
echo "Creating swap partition on $swap"
-parted /dev/${device} mkpart swap linux-swap $swap_start 100%
+parted ${device} mkpart swap linux-swap $swap_start 100%
-parted /dev/${device} print
+parted ${device} print
echo "Formatting $bootfs to vfat..."
mkfs.vfat $bootfs
@@ -163,13 +163,13 @@ mount -o rw,loop,noatime,nodiratime /run/media/$1/$2
/src_root
echo "Copying rootfs files..."
cp -a /src_root/* /tgt_root
if [ -d /tgt_root/etc/ ] ; then
-boot_uuid=$(blkid -o value -s UUID /dev/${device}1)
-swap_part_uuid=$(blkid -o value -s PARTUUID /dev/${device}3)
+boot_uuid=$(blkid -o value -s UUID ${device}1)
+swap_part_uuid=$(blkid -o value -s PARTUUID ${device}3)
echo "/dev/disk/by-partuuid/$swap_part_uuidswap
swap defaults 0 0" >> /tgt_root/etc/fstab
echo "UUID=$boot_uuid /bootvfat defaults
1 2" >> /tgt_root/etc/fstab
# We dont want udev to mount our root device while we're booting...
if [ -d /tgt_root/etc/udev/ ] ; then
-echo "/dev/${device}" >> /tgt_root/etc/udev/mount.blacklist
+echo "${device}" >> /tgt_root/etc/udev/mount.blacklist
fi
fi
@@ -185,7 +185,7 @@ mkdir -p $EFIDIR
cp /run/media/$1/EFI/BOOT/*.efi $EFIDIR
if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then
-root_part_uuid=$(blkid -o value -s PARTUUID /dev/${device}2)
+root_part_uuid=$(blkid -o value -s PARTUUID ${device}2)
GRUBCFG="$EFIDIR/grub.cfg"
cp /run/media/$1/EFI/BOOT/grub.cfg $GRUBCFG
# Update grub config for the installed image
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh
b/meta/recipes-core/initrdscripts/files/init-install.sh
index e1e7cb1..0593b3c 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -82,7 +82,7 @@ else
exit 1
fi
-device=$TARGET_DEVICE_NAME
+device=/dev/$TARGET_DEVICE_NAME
#
# The udev automounter can cause pain here, kill it
@@ -93,7 +93,7 @@ rm -f /etc/udev/scripts/mount*
#
# Unmount anything the automounter had mounted
#
-umount /dev/${device}* 2> /dev/null || /bin/true
+umount ${device}* 2> /dev/null || /bin/true
if [ ! -b /dev/loop0 ] ; then
mknod /dev/loop0 b 7 0
@@ -104,7 +104,7 @@ if [ ! -L /etc/mtab ]; then
cat /proc/mounts > /etc/mtab
fi
-disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 |
sed -e "s/MB//")
+disk_size=$(parted ${device} unit mb print | grep Disk | cut -d" " -f 3 | sed
-e "s/MB//")
grub_version=$(grub-install -v
[OE-core] [PATCH v2 00/11] UUID support in installer (poky-contrib: ed/oe-core/uuid-init-install)
Hi, This patchet adds support of GPT partition table and UUID support to initramfs installer scripts. Using UUID in favor of device names is more reliable as UUID names are persistent. Device names can change as the order of adding device nodes is arbitrary. This sometimes results in device names switching on each boot, which can cause system fail to boot. Persistent naming solves these issues. Implementation details: Used partition UUID in kernel command line to specify root partition. Used partition UUID in /etc/fstab to specify swap partition. Used filesystem UUID in /etc/fstab to specify boot partition. Code cleanup and usability fixes were done along the way. They're also included into this patchset. Patchest was tested on NUC device in both EFI and non-EFI modes. See more details in [YOCTO #6101] NOTE: Please drop the following pending patches as they're included into the patchset: [OE-core] [PATCH] image-live: Set syslinux timeout to 5s [OE-core] [PATCH] initramfs-live-install: Add gptdisk to initramfs [OE-core] [PATCH] init-install-efi: Implement UUID support Ed Bartosh (11): image-live: Set syslinux timeout to 5s initramfs-live-install: Add blkid to initramfs busybox: Enable UUID-related options init-install-efi: Implement UUID support init-install: Use GPT table with GRUB 2 init-install: Implement UUID support init-install: Specify filesystem type in parted command line init-install: Specify partition name in parted command line init-install: code cleanup: Replace tabs with spaces init-install: code cleanup: replace /dev/$device -> $device init-install: Properly delete partition table meta/classes/image-live.bbclass| 2 +- meta/recipes-core/busybox/busybox/defconfig| 8 +- .../initrdscripts/files/init-install-efi.sh| 90 ++-- .../initrdscripts/files/init-install.sh| 151 + .../initramfs-live-install-efi_1.0.bb | 2 +- .../initrdscripts/initramfs-live-install_1.0.bb| 2 +- 6 files changed, 149 insertions(+), 106 deletions(-) -- Ed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 05/11] init-install: Use GPT table with GRUB 2
Changed partition type from 'msdos' to 'gpt'.
Added special partition for grub stage2 bootloader.
NOTE: This is done only for GRUB 2 as legacy GRUB is
rarely used and doesn't support GPT partitions.
Signed-off-by: Ed Bartosh
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh
b/meta/recipes-core/initrdscripts/files/init-install.sh
index cb26163..298ea8d 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -106,10 +106,21 @@ fi
disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 |
sed -e "s/MB//")
+grub_version=$(grub-install -v|sed 's/.* \([0-9]\).*/\1/')
+
+if [ $grub_version -eq 0 ] ; then
+bios_boot_size=0
+else
+# For GRUB 2 we need separate parition to store stage2 grub image
+# 2Mb value is chosen to align partition for best performance.
+bios_boot_size=2
+fi
+
swap_size=$((disk_size*swap_ratio/100))
-rootfs_size=$((disk_size-boot_size-swap_size))
+rootfs_size=$((disk_size-bios_boot_size-boot_size-swap_size))
-rootfs_start=$((boot_size))
+boot_start=$((bios_boot_size))
+rootfs_start=$((bios_boot_size+boot_size))
rootfs_end=$((rootfs_start+rootfs_size))
swap_start=$((rootfs_end))
@@ -122,11 +133,21 @@ if [ ! "${device#mmcblk}" = "${device}" ]; then
part_prefix="p"
rootwait="rootwait"
fi
-bootfs=/dev/${device}${part_prefix}1
-rootfs=/dev/${device}${part_prefix}2
-swap=/dev/${device}${part_prefix}3
+
+if [ $grub_version -eq 0 ] ; then
+bios_boot=''
+bootfs=/dev/${device}${part_prefix}1
+rootfs=/dev/${device}${part_prefix}2
+swap=/dev/${device}${part_prefix}3
+else
+bios_boot=/dev/${device}${part_prefix}1
+bootfs=/dev/${device}${part_prefix}2
+rootfs=/dev/${device}${part_prefix}3
+swap=/dev/${device}${part_prefix}4
+fi
echo "*"
+[ $grub_version -ne 0 ] && echo "BIOS boot partition size: $bios_boot_size MB
($bios_boot)"
echo "Boot partition size: $boot_size MB ($bootfs)"
echo "Rootfs partition size: $rootfs_size MB ($rootfs)"
echo "Swap partition size: $swap_size MB ($swap)"
@@ -135,10 +156,18 @@ echo "Deleting partition table on /dev/${device} ..."
dd if=/dev/zero of=/dev/${device} bs=512 count=2
echo "Creating new partition table on /dev/${device} ..."
-parted /dev/${device} mklabel msdos
-
-echo "Creating boot partition on $bootfs"
-parted /dev/${device} mkpart primary 0% $boot_size
+if [ $grub_version -eq 0 ] ; then
+parted /dev/${device} mktable msdos
+echo "Creating boot partition on $bootfs"
+parted /dev/${device} mkpart primary 0% $boot_size
+else
+parted /dev/${device} mktable gpt
+echo "Creating BIOS boot partition on $bios_boot"
+parted /dev/${device} mkpart primary 0% $bios_boot_size
+parted /dev/${device} set 1 bios_grub on
+echo "Creating boot partition on $bootfs"
+parted /dev/${device} mkpart primary $boot_start $boot_size
+fi
echo "Creating rootfs partition on $rootfs"
parted /dev/${device} mkpart primary $rootfs_start $rootfs_end
@@ -186,7 +215,7 @@ if [ -f /etc/grub.d/00_header ] ; then
mkdir -p $(dirname $GRUBCFG)
cat >$GRUBCFG <<_EOF
menuentry "Linux" {
-set root=(hd0,1)
+set root=(hd0,2)
linux /vmlinuz root=$rootfs $rootwait rw $5 $3 $4 quiet
}
_EOF
@@ -195,8 +224,7 @@ fi
grub-install /dev/${device}
echo "(hd0) /dev/${device}" > /boot/grub/device.map
-# If grub.cfg doesn't exist, assume GRUB 0.97 and create a menu.lst
-if [ ! -f /boot/grub/grub.cfg ] ; then
+if [ $grub_version -eq 0 ] ; then
echo "Preparing custom grub menu..."
echo "default 0" > /boot/grub/menu.lst
echo "timeout 30" >> /boot/grub/menu.lst
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 04/11] init-install-efi: Implement UUID support
Using UUID in favor of device names is more reliable as
UUID names are persistent.
Device names can change as the order of adding device nodes
is arbitrary. This sometimes results in device names switching
on each boot, which can cause system fail to boot.
Persistent naming solves these issues.
Used partition UUID in kernel command line to specify root partition.
Used partition UUID in /etc/fstab to specify swap partition.
Used filesystem UUID in /etc/fstab to specify boot partition.
[YOCTO #6101]
Signed-off-by: Ed Bartosh
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index 8dd2749..5fb4d4d 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -164,8 +164,10 @@ mount -o rw,loop,noatime,nodiratime /run/media/$1/$2
/src_root
echo "Copying rootfs files..."
cp -a /src_root/* /tgt_root
if [ -d /tgt_root/etc/ ] ; then
-echo "$swapswap swap defaults
0 0" >> /tgt_root/etc/fstab
-echo "$bootfs /bootvfat defaults
1 2" >> /tgt_root/etc/fstab
+boot_uuid=$(blkid -o value -s UUID /dev/${device}1)
+swap_part_uuid=$(blkid -o value -s PARTUUID /dev/${device}3)
+echo "/dev/disk/by-partuuid/$swap_part_uuidswap
swap defaults 0 0" >> /tgt_root/etc/fstab
+echo "UUID=$boot_uuid /bootvfat defaults
1 2" >> /tgt_root/etc/fstab
# We dont want udev to mount our root device while we're booting...
if [ -d /tgt_root/etc/udev/ ] ; then
echo "/dev/${device}" >> /tgt_root/etc/udev/mount.blacklist
@@ -184,6 +186,7 @@ mkdir -p $EFIDIR
cp /run/media/$1/EFI/BOOT/*.efi $EFIDIR
if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then
+root_part_uuid=$(blkid -o value -s PARTUUID /dev/${device}2)
GRUBCFG="$EFIDIR/grub.cfg"
cp /run/media/$1/EFI/BOOT/grub.cfg $GRUBCFG
# Update grub config for the installed image
@@ -196,7 +199,7 @@ if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then
# Delete any root= strings
sed -i "s/ root=[^ ]*/ /" $GRUBCFG
# Add the root= and other standard boot options
-sed -i "s@linux /vmlinuz *@linux /vmlinuz root=$rootfs rw $rootwait quiet
@" $GRUBCFG
+sed -i "s@linux /vmlinuz *@linux /vmlinuz root=PARTUUID=$root_part_uuid rw
$rootwait quiet @" $GRUBCFG
fi
if [ -d /run/media/$1/loader ]; then
@@ -212,7 +215,7 @@ if [ -d /run/media/$1/loader ]; then
# delete any root= strings
sed -i "s/ root=[^ ]*/ /" $GUMMIBOOT_CFGS
# add the root= and other standard boot options
-sed -i "s@options *@options root=$rootfs rw $rootwait quiet @"
$GUMMIBOOT_CFGS
+sed -i "s@options *@options root=PARTUUID=$rootuuid rw $rootwait quiet @"
$GUMMIBOOT_CFGS
fi
umount /tgt_root
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 09/11] init-install: code cleanup: Replace tabs with spaces
Cleaned up spaces from init-install* shell scripts.
Signed-off-by: Ed Bartosh
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index a6a8679..dca1432 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -24,22 +24,22 @@ echo "Searching for hard drives ..."
for device in `ls /sys/block/`; do
case $device in
- loop*)
+loop*)
# skip loop device
- ;;
- sr*)
+;;
+sr*)
# skip CDROM device
- ;;
- ram*)
+;;
+ram*)
# skip ram device
- ;;
- *)
- # skip the device LiveOS is on
- # Add valid hard drive name to the list
- if [ $device != $live_dev_name -a -e /dev/$device ]; then
- hdnamelist="$hdnamelist $device"
- fi
- ;;
+;;
+*)
+# skip the device LiveOS is on
+# Add valid hard drive name to the list
+if [ $device != $live_dev_name -a -e /dev/$device ]; then
+hdnamelist="$hdnamelist $device"
+fi
+;;
esac
done
@@ -49,8 +49,8 @@ for hdname in $hdnamelist; do
echo "---"
echo /dev/$hdname
if [ -r /sys/block/$hdname/device/vendor ]; then
- echo -n "VENDOR="
- cat /sys/block/$hdname/device/vendor
+echo -n "VENDOR="
+cat /sys/block/$hdname/device/vendor
fi
if [ -r /sys/block/$hdname/device/model ]; then
echo -n "MODEL="
@@ -63,18 +63,17 @@ for hdname in $hdnamelist; do
echo
# Get user choice
while true; do
- echo -n "Do you want to install this image there? [y/n] "
- read answer
- if [ "$answer" = "y" -o "$answer" = "n" ]; then
- break
- fi
- echo "Please answer y or n"
+echo -n "Do you want to install this image there? [y/n] "
+read answer
+if [ "$answer" = "y" -o "$answer" = "n" ]; then
+break
+fi
+echo "Please answer y or n"
done
if [ "$answer" = "y" ]; then
- TARGET_DEVICE_NAME=$hdname
- break
+TARGET_DEVICE_NAME=$hdname
+break
fi
-
done
if [ -n "$TARGET_DEVICE_NAME" ]; then
@@ -170,7 +169,7 @@ if [ -d /tgt_root/etc/ ] ; then
echo "UUID=$boot_uuid /bootvfat defaults
1 2" >> /tgt_root/etc/fstab
# We dont want udev to mount our root device while we're booting...
if [ -d /tgt_root/etc/udev/ ] ; then
- echo "/dev/${device}" >> /tgt_root/etc/udev/mount.blacklist
+echo "/dev/${device}" >> /tgt_root/etc/udev/mount.blacklist
fi
fi
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh
b/meta/recipes-core/initrdscripts/files/init-install.sh
index c57a0f3..e1e7cb1 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -23,22 +23,22 @@ echo "Searching for hard drives ..."
for device in `ls /sys/block/`; do
case $device in
- loop*)
+loop*)
# skip loop device
- ;;
- sr*)
+;;
+sr*)
# skip CDROM device
- ;;
- ram*)
+;;
+ram*)
# skip ram device
- ;;
- *)
- # skip the device LiveOS is on
- # Add valid hard drive name to the list
- if [ $device != $live_dev_name -a -e /dev/$device ]; then
- hdnamelist="$hdnamelist $device"
- fi
- ;;
+;;
+*)
+# skip the device LiveOS is on
+# Add valid hard drive name to the list
+if [ $device != $live_dev_name -a -e /dev/$device ]; then
+hdnamelist="$hdnamelist $device"
+fi
+;;
esac
done
@@ -48,8 +48,8 @@ for hdname in $hdnamelist; do
echo "---"
echo /dev/$hdname
if [ -r /sys/block/$hdname/device/vendor ]; then
- echo -n "VENDOR="
- cat /sys/block/$hdname/device/vendor
+echo -n "VENDOR="
+cat /sys/block/$hdname/device/vendor
fi
if [ -r /sys/block/$hdname/device/model ]; then
echo -n "MODEL="
@@ -62,16 +62,16 @@ for hdname in $hdnamelist; do
echo
# Get user choice
while true; do
- echo -n "Do you want to install this image there? [y/n] "
- read answer
- if [ "$answer" = "y" -o "$answer" = "n" ]; then
- break
- fi
- echo "Please answer y or n"
+echo -n "Do you want to install this image there? [y/n] "
+read answer
+if [ "$answer" = "y" -o "$answer" = "n" ]; then
+break
+fi
+echo "Please answer y or n"
done
[OE-core] [PATCH v2 01/11] image-live: Set syslinux timeout to 5s
Increased syslinux timeout to 5s as default 1s timeout
is not enough to notice syslinux prompt on some devices.
Signed-off-by: Ed Bartosh
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index 7b770fb..52b6de7 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -3,7 +3,7 @@ AUTO_SYSLINUXCFG = "1"
INITRD_IMAGE ?= "core-image-minimal-initramfs"
INITRD ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz"
SYSLINUX_ROOT = "root=/dev/ram0"
-SYSLINUX_TIMEOUT ?= "10"
+SYSLINUX_TIMEOUT ?= "50"
SYSLINUX_LABELS ?= "boot install"
LABELS_append = " ${SYSLINUX_LABELS} "
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 02/11] initramfs-live-install: Add blkid to initramfs
Added util-linux-blkid to the list of dependencies of
initramfs-live-install and initramfs-live-install-efi.
This is a part of the work to support partiion UUID in installer.
blkid is going to be used to get partition and filesystem UUIDs.
Signed-off-by: Ed Bartosh
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb
b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb
index b0994d7..32c1fce 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb
@@ -5,7 +5,7 @@ SRC_URI = "file://init-install-efi.sh"
PR = "r1"
-RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools"
+RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools util-linux-blkid"
S = "${WORKDIR}"
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
index 6241a90..88b3b30 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
@@ -7,7 +7,7 @@ PR = "r9"
S = "${WORKDIR}"
-RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs"
+RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs util-linux-blkid"
do_install() {
install -m 0755 ${WORKDIR}/init-install.sh ${D}/install.sh
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 03/11] busybox: Enable UUID-related options
Enabled MOUNT_LABEL and VOLUMEID* features for busybox mount to understand 'UUID=' syntax in fstab. Signed-off-by: Ed Bartosh diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig index c200ee0..468c40e 100644 --- a/meta/recipes-core/busybox/busybox/defconfig +++ b/meta/recipes-core/busybox/busybox/defconfig @@ -582,7 +582,7 @@ CONFIG_MOUNT=y # CONFIG_FEATURE_MOUNT_FAKE is not set # CONFIG_FEATURE_MOUNT_VERBOSE is not set # CONFIG_FEATURE_MOUNT_HELPERS is not set -# CONFIG_FEATURE_MOUNT_LABEL is not set +CONFIG_FEATURE_MOUNT_LABEL=y CONFIG_FEATURE_MOUNT_NFS=y # CONFIG_FEATURE_MOUNT_CIFS is not set CONFIG_FEATURE_MOUNT_FLAGS=y @@ -607,11 +607,11 @@ CONFIG_FEATURE_UMOUNT_ALL=y CONFIG_FEATURE_MOUNT_LOOP=y CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_MTAB_SUPPORT is not set -# CONFIG_VOLUMEID is not set -# CONFIG_FEATURE_VOLUMEID_EXT is not set +CONFIG_VOLUMEID=y +CONFIG_FEATURE_VOLUMEID_EXT=y # CONFIG_FEATURE_VOLUMEID_BTRFS is not set # CONFIG_FEATURE_VOLUMEID_REISERFS is not set -# CONFIG_FEATURE_VOLUMEID_FAT is not set +CONFIG_FEATURE_VOLUMEID_FAT=y # CONFIG_FEATURE_VOLUMEID_HFS is not set # CONFIG_FEATURE_VOLUMEID_JFS is not set # CONFIG_FEATURE_VOLUMEID_XFS is not set -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] KCONF_AUDIT_LEVEL + kernel_configcheck
On Mon, 2015-06-15 at 15:48 -0400, Bruce Ashfield wrote: > On 2015-06-15 8:17 AM, Patrick Ohly wrote: > > Hello! > > > > In Fido and master, the following patch changed the default value of > > KCONF_AUDIT_LEVEL: > > > > $ git annotate origin/fido -- meta/classes/kernel-yocto.bbclass | grep > > KCONF_AUDIT_LEVEL > > ad4d5949(Bruce Ashfield 2015-02-18 16:15:35 -0500 308) > > config_check_visibility = int(d.getVar( "KCONF_AUDIT_LEVEL", True ) or 0) > > $ git annotate origin/master -- meta/classes/kernel-yocto.bbclass | grep > > KCONF_AUDIT_LEVEL > > ad4d5949(Bruce Ashfield 2015-02-18 16:15:35 -0500 309) > > config_check_visibility = int(d.getVar( "KCONF_AUDIT_LEVEL", True ) or 0) > > > > At least if I read it right, that wasn't the intention. The commit > > explicitly says that the default should be 1: > > > > The visibility of auditing is controlled by KCONF_AUDIT_LEVEL: > > > > 0: no reporting > > 1: report options that are specified, but not in the final config > > 2: report options that are not hardware related, but set by a BSP > > > > The default level is 1, with level 2 and above being for BSP > > development > > only. > > The line is correct, since we don't want it warning for non linux-yocto > meta-data enabled kernels. The default is indeed 1, since I set it in > the common include file. That was the default I was referring to in that > change. Ah, I missed that other part of the patch. You are right of course. > > foobar.cfg is used (the CONFIG_SECURITY_SMACK part is used) but the > > CONFIG_FOOBAR part of course is not. Shouldn't this trigger the > > "specified values did not make it into the kernel's final > > configuration"? > > To keep the noise down, I'm only emitting partial audit information and > the warnings only apply to options that are tagged as "hardware", since > that is also a synonym to 'required' in the configuration scheme. > > .. and no. That isn't common knowledge, since I've been slowly changing > and making the audit information more visible, but don't want to flood > too many warnings, or create an ABI that limits how we can change things. That explains it then. I don't remember how I learned about this kernel configuration check (might have seen the error message at some point) and came away with the impression that it applies to all configuration options. I cannot say how much noise it would create in practice, but at least I had one specific case where I was using a non-hardware configuration not supported by the kernel and would have appreciated a warning about that ;-} -- Best Regards, Patrick Ohly The content of this message is my personal opinion only and although I am an employee of Intel, the statements I make here in no way represent Intel's position on the issue, nor am I authorized to speak on behalf of Intel on this matter. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH][fido] runqemu: add support to boot arm64 qemu target from NFS
On Tue, Jun 16, 2015 at 12:37 PM, Joshua Lock
wrote:
> On 15/06/15 17:56, Jagadeesh Krishnanjanappa wrote:
>
>> Ping.
>>
>
>
> Is this change intended for fido or master? Usually fixes like this would
> go into master first and then be backported to the stable branch.
>
> The runqemu scripts of fido and master branch are almost at the same
level, the patch should apply to both of them without any warnings. The
intended change is for fido (and future versions) as it already has support
for booting aarch64 qemu target.
Regards,
Jagadeesh
> Regards,
>> Jagadeesh
>>
>> On Tue, Jun 9, 2015 at 10:18 AM, Jagadeesh Krishnanjanappa
>> mailto:jkrishnanjana...@mvista.com>> wrote:
>>
>> The other changes include,
>> runqemu - fix MACHINE type being detected as qemuarm when qemuarm64
>> kernel
>>image name is given.
>>
>> runqemu-internal - Added console=ttyAMA0,115200 as one of the boot
>> parameters
>> for qemuarm, in order to print bootlog messages
>> on the
>> console.
>>
>> - Use "-nographic" option only if "serial" option
>> is not
>> specified. Otherwise we get below error when
>> 'runqemu serial'
>> is executed,
>>
>> (snip)
>> QEMU 2.2.0 monitor - type 'help' for more information
>> (qemu) qemu-system-aarch64: -serial stdio: cannot use stdio by
>> multiple character devices
>> -- CUT --
>>
>> qemuarm64 NFS booting has been tested successfully on Ubuntu 14.04
>> host.
>>
>> Signed-off-by: Jagadeesh Krishnanjanappa
>> mailto:jkrishnanjana...@mvista.com>>
>>
>> ---
>> scripts/runqemu | 4 ++--
>> scripts/runqemu-internal | 20 +++-
>> 2 files changed, 17 insertions(+), 7 deletions(-)
>>
>> diff --git a/scripts/runqemu b/scripts/runqemu
>> index 84ece4d..09c507d 100755
>> --- a/scripts/runqemu
>> +++ b/scripts/runqemu
>> @@ -232,13 +232,13 @@ fi
>>
>> if [ -z "$MACHINE" ]; then
>> if [ "x$FSTYPE" = "xvmdk" ]; then
>> -MACHINE=`basename $VM | sed -n
>>
>> 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
>> +MACHINE=`basename $VM | sed -n
>>
>> 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
>> if [ -z "$MACHINE" ]; then
>> error "Unable to set MACHINE from vmdk filename [$VM]"
>> fi
>> echo "Set MACHINE to [$MACHINE] based on vmdk [$VM]"
>> else
>> -MACHINE=`basename $KERNEL | sed -n
>>
>> 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
>> +MACHINE=`basename $KERNEL | sed -n
>>
>> 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
>> if [ -z "$MACHINE" ]; then
>> error "Unable to set MACHINE from kernel filename
>> [$KERNEL]"
>> fi
>> diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
>> index 2db5566..e346c64 100755
>> --- a/scripts/runqemu-internal
>> +++ b/scripts/runqemu-internal
>> @@ -275,9 +275,6 @@ else
>>
>> KERNCMDLINE="mem=$QEMU_MEMORY"
>> QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice wacom-tablet"
>> -if [ $MACHINE = 'qemuarm64' ]; then
>> -QEMU_UI_OPTIONS="-nographic"
>> -fi
>>
>> NFS_INSTANCE=`echo $TAP | sed 's/tap//'`
>> export NFS_INSTANCE
>> @@ -368,7 +365,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" =
>> "qemuarmv6" -o "$MACHINE" = "qemuarm
>> cleanup
>> return 1
>> fi
>> -KERNCMDLINE="root=/dev/nfs
>> nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD
>> mem=$QEMU_MEMORY"
>> +KERNCMDLINE="root=/dev/nfs
>> nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw console=ttyAMA0,115200
>> $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
>> QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE}
>> --no-reboot $QEMU_UI_OPTIONS"
>> fi
>> if [ "$MACHINE" = "qemuarmv6" ]; then
>> @@ -383,12 +380,25 @@ if [ "$MACHINE" = "qemuarm64" ]; then
>> QEMU=qemu-system-aarch64
>>
>> export QEMU_AUDIO_DRV="none"
>> -QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
>> +if [ "x$SERIALSTDIO" = "x" ] ; then
>> +QEMU_UI_OPTIONS="-nographic"
>> +else
>> +QEMU_UI_OPTIONS=""
>> +fi
>> if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
>> KERNCMDLINE="root=/dev/vda rw console=ttyAMA0,38400
>> mem=$QEMU_MEMORY highres=off $KERNEL_NETWORK_CMD"
>> # qemu-system-aarch64 only support '-machine virt -cpu
>> cortex-a57' for now
>>
Re: [OE-core] [PATCH 0/1] scripts: Add cleanup-downloads-dir tool
Hi Ross, On Mon, Jun 15, 2015 at 11:38:01PM +0100, Burton, Ross wrote: > > On 12 June 2015 at 13:15, Laurentiu Palcu wrote: > > A few days ago I noticed I had no space on disk and decided to make some > space. Since my downloads directory was never deleted since denzil, it > consumed 25GB of space which I needed. However, I wanted to delete only > old > and unneeded tarbals/git repos and keep the ones that my current Yocto > version needed, so I wrote this tool. > > > Something is not quite right, after running this and causing a rebuild I got > this: > > ERROR: No checksum specified for > /home/ross/Yocto/downloads/git2_git.lttng.org.lttng-modules.git.tar.gz, > please add at least one to > the recipe: > SRC_URI[md5sum] = "c32ceb7d4b208b2b1d8132c3bbc7d638" > SRC_URI[sha256sum] = > "d593cca435003770e981c8ae5def3db0e95d72bc3f83f3d43a18287ea1f6d165" > ERROR: Function failed: Fetcher failure for URL: > 'http://downloads.yoctoproject.org/mirror/sources/ > git2_git.lttng.org.lttng-modules.git.tar.gz'. Missing SRC_URI checksum > > A few too many files pruned? Thanks for giving this a test. However, I have no idea why this happens for you... I ran it on my side, after compiling lttng-modules (so it fetches the latest, etc), and the tarballs were not removed. Actually, nothing was removed since I ran it on master, after doing a fresh core-image-minimal build... See below. Can you please try a: 'bitbake lttng-modules' followed by a 'cleanup-downloads-dir'? Do you get the same behavior on the first rebuid? Could there's something else going on at your side? test@test-machine:/ssd/work/yp1/test$ bitbake lttng-modules ... build output skipped ... test@test-machine:/ssd/work/yp1/test$ cleanup-downloads-dir Parsing recipes..done. Generating unused files list... done No obsolete files found in /ssd/work/yp1/test/downloads. test@test-machine:/ssd/work/yp1/test$ ls -la downloads/ |grep lttng-modules -rw-rw-r-- 1 test test 1861595 May 13 11:26 git2_git.lttng.org.lttng-modules.git.tar.gz -rw-rw-r-- 1 test test 0 Jun 16 09:45 git2_git.lttng.org.lttng-modules.git.tar.gz.done -rw-rw-r-- 1 test test 125 Jun 16 09:45 lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch.done test@test-machine:/ssd/work/yp1/test$ ll downloads/git2 |grep lttng-modules drwxr-xr-x 7 test test 4096 May 13 11:26 git.lttng.org.lttng-modules.git/ -rw-rw-r-- 1 test test 6 Jun 16 09:45 git.lttng.org.lttng-modules.git.done laurentiu -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH][fido] runqemu: add support to boot arm64 qemu target from NFS
On 15/06/15 17:56, Jagadeesh Krishnanjanappa wrote:
Ping.
Is this change intended for fido or master? Usually fixes like this
would go into master first and then be backported to the stable branch.
Regards,
Joshua
Regards,
Jagadeesh
On Tue, Jun 9, 2015 at 10:18 AM, Jagadeesh Krishnanjanappa
mailto:jkrishnanjana...@mvista.com>> wrote:
The other changes include,
runqemu - fix MACHINE type being detected as qemuarm when qemuarm64
kernel
image name is given.
runqemu-internal - Added console=ttyAMA0,115200 as one of the boot
parameters
for qemuarm, in order to print bootlog messages
on the
console.
- Use "-nographic" option only if "serial" option
is not
specified. Otherwise we get below error when
'runqemu serial'
is executed,
(snip)
QEMU 2.2.0 monitor - type 'help' for more information
(qemu) qemu-system-aarch64: -serial stdio: cannot use stdio by
multiple character devices
-- CUT --
qemuarm64 NFS booting has been tested successfully on Ubuntu 14.04 host.
Signed-off-by: Jagadeesh Krishnanjanappa
mailto:jkrishnanjana...@mvista.com>>
---
scripts/runqemu | 4 ++--
scripts/runqemu-internal | 20 +++-
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index 84ece4d..09c507d 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -232,13 +232,13 @@ fi
if [ -z "$MACHINE" ]; then
if [ "x$FSTYPE" = "xvmdk" ]; then
-MACHINE=`basename $VM | sed -n
's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
+MACHINE=`basename $VM | sed -n
's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
if [ -z "$MACHINE" ]; then
error "Unable to set MACHINE from vmdk filename [$VM]"
fi
echo "Set MACHINE to [$MACHINE] based on vmdk [$VM]"
else
-MACHINE=`basename $KERNEL | sed -n
's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
+MACHINE=`basename $KERNEL | sed -n
's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
if [ -z "$MACHINE" ]; then
error "Unable to set MACHINE from kernel filename
[$KERNEL]"
fi
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 2db5566..e346c64 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -275,9 +275,6 @@ else
KERNCMDLINE="mem=$QEMU_MEMORY"
QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice wacom-tablet"
-if [ $MACHINE = 'qemuarm64' ]; then
-QEMU_UI_OPTIONS="-nographic"
-fi
NFS_INSTANCE=`echo $TAP | sed 's/tap//'`
export NFS_INSTANCE
@@ -368,7 +365,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" =
"qemuarmv6" -o "$MACHINE" = "qemuarm
cleanup
return 1
fi
-KERNCMDLINE="root=/dev/nfs
nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD
mem=$QEMU_MEMORY"
+KERNCMDLINE="root=/dev/nfs
nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw console=ttyAMA0,115200
$KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE}
--no-reboot $QEMU_UI_OPTIONS"
fi
if [ "$MACHINE" = "qemuarmv6" ]; then
@@ -383,12 +380,25 @@ if [ "$MACHINE" = "qemuarm64" ]; then
QEMU=qemu-system-aarch64
export QEMU_AUDIO_DRV="none"
-QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
+if [ "x$SERIALSTDIO" = "x" ] ; then
+QEMU_UI_OPTIONS="-nographic"
+else
+QEMU_UI_OPTIONS=""
+fi
if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
KERNCMDLINE="root=/dev/vda rw console=ttyAMA0,38400
mem=$QEMU_MEMORY highres=off $KERNEL_NETWORK_CMD"
# qemu-system-aarch64 only support '-machine virt -cpu
cortex-a57' for now
QEMUOPTIONS="$QEMU_NETWORK_CMD -machine virt -cpu
cortex-a57 $ROOTFS_OPTIONS $QEMU_UI_OPTIONS"
fi
+if [ "$FSTYPE" = "nfs" ]; then
+if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then
+echo "Error: NFS mount point $ROOTFS doesn't exist"
+cleanup
+return 1
+fi
+KERNCMDLINE="root=/dev/nfs
nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw console=ttyAMA0,38400
mem=$QEMU_MEMORY highres=off $KERNEL_NETWORK_CMD"
+QEMUOPTIONS="$QEMU_NETWORK_CMD -machine virt -cpu
cortex-a57 $QEMU_UI_OPTIONS"
+f
