[OE-core] [PATCH 2/5] gnupg: Fix for multilib
From: Zhai Edwin edwin.z...@intel.com
Signed-off-by: Zhai Edwin edwin.z...@intel.com
---
meta/recipes-support/gnupg/gnupg_2.0.18.bb |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/gnupg/gnupg_2.0.18.bb
b/meta/recipes-support/gnupg/gnupg_2.0.18.bb
index 6712269..abcb5fb 100644
--- a/meta/recipes-support/gnupg/gnupg_2.0.18.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.0.18.bb
@@ -8,7 +8,7 @@ DEPENDS = pth libassuan libksba zlib bzip2 readline libgcrypt
inherit autotools gettext
-SRC_URI = ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2;
+SRC_URI = ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2;
SRC_URI[md5sum] = 2f37e0722666a0fedbe4d9f9227ac4d7
SRC_URI[sha256sum] =
48aedd762ca443fb952a9e859efe3c66706d7c2c9c77c32dbdbac4fe962dae5b
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] libskba: Fix for multilib
From: Zhai Edwin edwin.z...@intel.com
Signed-off-by: Zhai Edwin edwin.z...@intel.com
---
meta/recipes-support/libksba/libksba_1.2.0.bb |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/libksba/libksba_1.2.0.bb
b/meta/recipes-support/libksba/libksba_1.2.0.bb
index 6489cc5..1d8d287 100644
--- a/meta/recipes-support/libksba/libksba_1.2.0.bb
+++ b/meta/recipes-support/libksba/libksba_1.2.0.bb
@@ -7,7 +7,7 @@ DEPENDS = libgpg-error
inherit autotools binconfig
-SRC_URI = ftp://ftp.gnupg.org/gcrypt/${PN}/${PN}-${PV}.tar.bz2;
+SRC_URI = ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2;
SRC_URI[md5sum] = e797f370b69b4dc776499d6a071ae137
SRC_URI[sha256sum] =
09afce65b03d027cbec10d21464f4f651cdfd269e38b404f83e48d3e2a3c934b
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/5] Fixes for multilib, qemugl and vte
From: Zhai Edwin edwin.z...@intel.com All, These are patches to fix bugs and multilib on latest master. Pls. pull. Thanks, Edwin The following changes since commit 927bec5f72230be4f2452d9ef5a747b2c00cb781: bitbake.conf: Create a new filter variable BB_HASHCONFIG_WHITELIST (2012-02-27 20:10:41 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib gzhai/master2 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2 Zhai Edwin (5): vte: fix scroll issue gnupg: Fix for multilib libskba: Fix for multilib qemugl: Fix gl apps failure on qemu-x86-64 self-hosted: Fix multiple libx11 error meta/recipes-core/tasks/task-self-hosted.bb|4 +- .../mesa/qemugl/call_opengl_fix.patch | 40 ++- meta/recipes-graphics/mesa/qemugl_git.bb |2 +- meta/recipes-support/gnupg/gnupg_2.0.18.bb |2 +- meta/recipes-support/libksba/libksba_1.2.0.bb |2 +- meta/recipes-support/vte/vte.inc |3 +- meta/recipes-support/vte/vte/scrollbar_fix.patch | 122 7 files changed, 167 insertions(+), 8 deletions(-) create mode 100644 meta/recipes-support/vte/vte/scrollbar_fix.patch ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] qemugl: Fix gl apps failure on qemu-x86-64
From: Zhai Edwin edwin.z...@intel.com
Extend commit 028968 to qemu x86-64, where stack disorder happen due to
register handling via push/pop.
[YOCTO #1927] fixed
Signed-off-by: Zhai Edwin edwin.z...@intel.com
---
.../mesa/qemugl/call_opengl_fix.patch | 40 +++-
meta/recipes-graphics/mesa/qemugl_git.bb |2 +-
2 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/mesa/qemugl/call_opengl_fix.patch
b/meta/recipes-graphics/mesa/qemugl/call_opengl_fix.patch
index c5e3592..342f49b 100644
--- a/meta/recipes-graphics/mesa/qemugl/call_opengl_fix.patch
+++ b/meta/recipes-graphics/mesa/qemugl/call_opengl_fix.patch
@@ -16,8 +16,8 @@ Upstream-Status: Pending
Signed-off-by: Zhai Edwin edwin.z...@intel.com
Index: git/opengl_client.c
===
git.orig/opengl_client.c 2011-09-19 19:44:51.0 +0800
-+++ git/opengl_client.c2011-09-22 10:11:04.0 +0800
+--- git.orig/opengl_client.c 2012-02-28 15:26:28.0 +0800
git/opengl_client.c2012-02-28 15:29:18.0 +0800
@@ -1076,23 +1076,29 @@
{
#if defined(__i386__)
@@ -56,3 +56,39 @@ Index: git/opengl_client.c
__asm__ (mov %%eax, %0::m(ret));
#ifdef WIN32
__asm__ (movl (%%esp),%%ecx;movl %%ecx,%%fs:0;addl $8,%%esp; : : :
%ecx);
+@@ -1100,20 +1106,27 @@
+ return ret;
+ #elif defined(__x86_64__)
+ int ret;
+- __asm__ (push %rbx);
+- __asm__ (push %rcx);
+- __asm__ (push %rdx);
+- __asm__ (push %rsi);
++ long bx, cx, dx, si;
++
++ /* save registers before opengl call */
++ __asm__ (mov %%rbx, %0::m(bx));
++ __asm__ (mov %%rcx, %0::m(cx));
++ __asm__ (mov %%rdx, %0::m(dx));
++ __asm__ (mov %%rsi, %0::m(si));
++
+ __asm__ (mov %0, %%eax::m(func_number));
+ __asm__ (mov %0, %%ebx::m(pid));
+ __asm__ (mov %0, %%rcx::m(ret_string));
+ __asm__ (mov %0, %%rdx::m(args));
+ __asm__ (mov %0, %%rsi::m(args_size));
+ __asm__ (int $0x99);
+- __asm__ (pop %rsi);
+- __asm__ (pop %rdx);
+- __asm__ (pop %rcx);
+- __asm__ (pop %rbx);
++
++ /* restore registers */
++ __asm__ (mov %0, %%rbx::m(bx));
++ __asm__ (mov %0, %%rcx::m(cx));
++ __asm__ (mov %0, %%rdx::m(dx));
++ __asm__ (mov %0, %%rsi::m(si));
++
+ __asm__ (mov %%eax, %0::m(ret));
+ return ret;
+ #else
diff --git a/meta/recipes-graphics/mesa/qemugl_git.bb
b/meta/recipes-graphics/mesa/qemugl_git.bb
index e3552ec..66f4e17 100644
--- a/meta/recipes-graphics/mesa/qemugl_git.bb
+++ b/meta/recipes-graphics/mesa/qemugl_git.bb
@@ -18,7 +18,7 @@ S = ${WORKDIR}/git
SRCREV = d888bbc723c00d197d34a39b5b7448660ec1b1c0
PV = 0.0+git${SRCPV}
-PR = r8
+PR = r9
DEFAULT_PREFERENCE = -1
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] self-hosted: Fix multiple libx11 error
From: Zhai Edwin edwin.z...@intel.com
Self-hosted needs package libx11-dev, which is ambiguous as virtual/libx11 is
provided by libx11 or libx11-trim. This patch explictly set the perferred one,
libx11-trim-dev, to avoid this.
Signed-off-by: Zhai Edwin edwin.z...@intel.com
---
meta/recipes-core/tasks/task-self-hosted.bb |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/tasks/task-self-hosted.bb
b/meta/recipes-core/tasks/task-self-hosted.bb
index 586a461..a6cf75f 100644
--- a/meta/recipes-core/tasks/task-self-hosted.bb
+++ b/meta/recipes-core/tasks/task-self-hosted.bb
@@ -3,7 +3,7 @@
#
DESCRIPTION = Create Basic Image Tasks
-PR = r6
+PR = r7
LICENSE = MIT
LIC_FILES_CHKSUM =
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
@@ -189,6 +189,6 @@ RDEPENDS_task-self-hosted-graphics = \
libglu-dev \
libsdl \
libsdl-dev \
-libx11-dev \
+libx11-trim-dev \
python-pygtk \
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] vte: fix scroll issue
On Wed, Feb 22, 2012 at 11:03:01PM +, Richard Purdie wrote:
On Wed, 2012-02-22 at 13:33 +0800, edwin.z...@intel.com wrote:
From: Zhai Edwin edwin.z...@intel.com
On qemu x86-64, scrollbar in vte got broken with one commit to change the
way
of emiting changed signal. This patch revert it as work around.
[YOCTO #1906] got fixed.
This patch worries me a bit (well, a lot really). Why is this only
broken on 64 bit? How does this revert fix things? It looks like its not
the real problem to me?
The root cause is unkown. I suspect something in gtk caused the changed
signal
missing with the new method. I have created a bug for vte in gnome.org, but no
response so far.
Cheers,
Richard
Signed-off-by: Zhai Edwin edwin.z...@intel.com
---
meta/recipes-support/vte/vte.inc |3 +-
meta/recipes-support/vte/vte/scrollbar_fix.patch | 122
++
meta/recipes-support/vte/vte_0.28.2.bb |2 +-
3 files changed, 125 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-support/vte/vte/scrollbar_fix.patch
diff --git a/meta/recipes-support/vte/vte.inc
b/meta/recipes-support/vte/vte.inc
index 54bd8ae..d3406e5 100644
--- a/meta/recipes-support/vte/vte.inc
+++ b/meta/recipes-support/vte/vte.inc
@@ -6,7 +6,8 @@ RDEPENDS_libvte = vte-termcap
inherit gnome
-SRC_URI += file://introspection.patch
+SRC_URI += file://introspection.patch\
+file://scrollbar_fix.patch
EXTRA_OECONF = --disable-gtk-doc --disable-python --disable-introspection
diff --git a/meta/recipes-support/vte/vte/scrollbar_fix.patch
b/meta/recipes-support/vte/vte/scrollbar_fix.patch
new file mode 100644
index 000..707377a
--- /dev/null
+++ b/meta/recipes-support/vte/vte/scrollbar_fix.patch
@@ -0,0 +1,122 @@
+On qemu x86-64, matchbox-terminal has broken scrollbar, because of
following
+commit in vte. This patch revert it as work around.
+
+Signed-off-by: Zhai Edwin edwin.z...@intel.com
+
+Upstream-Status: Inappropriate [workaround]
+
+commit 6eadb8494797e44910b86b5e101823cf527c04e1
+Author: Kristian Høgsberg k...@bitplanet.net
+Date: Thu Jul 15 09:07:51 2010 -0400
+
+Use accessors for setting adjustment
+
+We use g_object_freeze_notify() to emit the same amount of ::changed
+signals.
+
+Index: vte-0.28.2/src/vte.c
+===
+--- vte-0.28.2.orig/src/vte.c 2011-08-29 05:31:45.0 +0800
vte-0.28.2/src/vte.c 2012-02-21 11:03:22.0 +0800
+@@ -2018,15 +2018,13 @@
+ glong v;
+ gdouble current;
+
+- g_object_freeze_notify (G_OBJECT (terminal-adjustment));
+-
+ v = _vte_ring_delta (screen-row_data);
+ current = gtk_adjustment_get_lower(terminal-adjustment);
+ if (current != v) {
+ _vte_debug_print(VTE_DEBUG_ADJ,
+ Changing lower bound from %.0f to
%ld\n,
+current, v);
+- gtk_adjustment_set_lower(terminal-adjustment, v);
++ terminal-adjustment-lower = v;
+ changed = TRUE;
+ }
+
+@@ -2039,19 +2037,19 @@
+ _vte_debug_print(VTE_DEBUG_ADJ,
+ Changing upper bound from %.0f to
%ld\n,
+current, v);
+- gtk_adjustment_set_upper(terminal-adjustment, v);
++ terminal-adjustment-upper = v;
+ changed = TRUE;
+ }
+
+- g_object_thaw_notify (G_OBJECT (terminal-adjustment));
+-
+- if (changed)
++ if (changed) {
+ _vte_debug_print(VTE_DEBUG_SIGNALS,
+ Emitting adjustment_changed.\n);
++ gtk_adjustment_changed(terminal-adjustment);
++ }
+ terminal-pvt-adjustment_changed_pending = FALSE;
+ }
+ if (terminal-pvt-adjustment_value_changed_pending) {
+- glong v, delta;
++ glong v;
+ _vte_debug_print(VTE_DEBUG_SIGNALS,
+ Emitting adjustment_value_changed.\n);
+ terminal-pvt-adjustment_value_changed_pending = FALSE;
+@@ -2062,9 +2060,9 @@
+* via the adjustment - e.g. user interaction with the
+* scrollbar
+*/
+- delta = terminal-pvt-screen-scroll_delta;
++ terminal-adjustment-value =
terminal-pvt-screen-scroll_delta;
+ terminal-pvt-screen-scroll_delta = v;
+- gtk_adjustment_set_value(terminal-adjustment, delta);
++ gtk_adjustment_value_changed(terminal-adjustment);
+ }
+ }
+
[OE-core] [PATCH 1/5] vte: fix scroll issue
From: Zhai Edwin edwin.z...@intel.com
On qemu x86-64, scrollbar in vte got broken with one commit to change the way
of emiting changed signal. This patch revert it as work around.
[YOCTO #1906] got fixed.
Signed-off-by: Zhai Edwin edwin.z...@intel.com
---
meta/recipes-support/vte/vte.inc |3 +-
meta/recipes-support/vte/vte/scrollbar_fix.patch | 122 ++
2 files changed, 124 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-support/vte/vte/scrollbar_fix.patch
diff --git a/meta/recipes-support/vte/vte.inc b/meta/recipes-support/vte/vte.inc
index 7971673..5e05608 100644
--- a/meta/recipes-support/vte/vte.inc
+++ b/meta/recipes-support/vte/vte.inc
@@ -6,7 +6,8 @@ RDEPENDS_libvte = vte-termcap
inherit gnome
-SRC_URI += file://introspection.patch
+SRC_URI += file://introspection.patch\
+file://scrollbar_fix.patch
EXTRA_OECONF = --disable-gtk-doc --disable-python --disable-introspection
diff --git a/meta/recipes-support/vte/vte/scrollbar_fix.patch
b/meta/recipes-support/vte/vte/scrollbar_fix.patch
new file mode 100644
index 000..707377a
--- /dev/null
+++ b/meta/recipes-support/vte/vte/scrollbar_fix.patch
@@ -0,0 +1,122 @@
+On qemu x86-64, matchbox-terminal has broken scrollbar, because of following
+commit in vte. This patch revert it as work around.
+
+Signed-off-by: Zhai Edwin edwin.z...@intel.com
+
+Upstream-Status: Inappropriate [workaround]
+
+commit 6eadb8494797e44910b86b5e101823cf527c04e1
+Author: Kristian Høgsberg k...@bitplanet.net
+Date: Thu Jul 15 09:07:51 2010 -0400
+
+Use accessors for setting adjustment
+
+We use g_object_freeze_notify() to emit the same amount of ::changed
+signals.
+
+Index: vte-0.28.2/src/vte.c
+===
+--- vte-0.28.2.orig/src/vte.c 2011-08-29 05:31:45.0 +0800
vte-0.28.2/src/vte.c 2012-02-21 11:03:22.0 +0800
+@@ -2018,15 +2018,13 @@
+ glong v;
+ gdouble current;
+
+- g_object_freeze_notify (G_OBJECT (terminal-adjustment));
+-
+ v = _vte_ring_delta (screen-row_data);
+ current = gtk_adjustment_get_lower(terminal-adjustment);
+ if (current != v) {
+ _vte_debug_print(VTE_DEBUG_ADJ,
+ Changing lower bound from %.0f to
%ld\n,
+current, v);
+- gtk_adjustment_set_lower(terminal-adjustment, v);
++ terminal-adjustment-lower = v;
+ changed = TRUE;
+ }
+
+@@ -2039,19 +2037,19 @@
+ _vte_debug_print(VTE_DEBUG_ADJ,
+ Changing upper bound from %.0f to
%ld\n,
+current, v);
+- gtk_adjustment_set_upper(terminal-adjustment, v);
++ terminal-adjustment-upper = v;
+ changed = TRUE;
+ }
+
+- g_object_thaw_notify (G_OBJECT (terminal-adjustment));
+-
+- if (changed)
++ if (changed) {
+ _vte_debug_print(VTE_DEBUG_SIGNALS,
+ Emitting adjustment_changed.\n);
++ gtk_adjustment_changed(terminal-adjustment);
++ }
+ terminal-pvt-adjustment_changed_pending = FALSE;
+ }
+ if (terminal-pvt-adjustment_value_changed_pending) {
+- glong v, delta;
++ glong v;
+ _vte_debug_print(VTE_DEBUG_SIGNALS,
+ Emitting adjustment_value_changed.\n);
+ terminal-pvt-adjustment_value_changed_pending = FALSE;
+@@ -2062,9 +2060,9 @@
+* via the adjustment - e.g. user interaction with the
+* scrollbar
+*/
+- delta = terminal-pvt-screen-scroll_delta;
++ terminal-adjustment-value =
terminal-pvt-screen-scroll_delta;
+ terminal-pvt-screen-scroll_delta = v;
+- gtk_adjustment_set_value(terminal-adjustment, delta);
++ gtk_adjustment_value_changed(terminal-adjustment);
+ }
+ }
+ }
+@@ -2141,15 +2139,13 @@
+
+ _vte_terminal_adjust_adjustments(terminal);
+
+-g_object_freeze_notify(G_OBJECT(terminal-adjustment));
+-
+ /* The step increment should always be one. */
+ v = gtk_adjustment_get_step_increment(terminal-adjustment);
+ if (v != 1) {
+ _vte_debug_print(VTE_DEBUG_ADJ,
+ Changing step increment from %.0lf to %ld\n,
+ v, terminal-row_count);
+- gtk_adjustment_set_step_increment(terminal-adjustment, 1);
++ terminal-adjustment-step_increment = 1;
+
Re: [OE-core] [PATCH v2] qt4.inc: depend on tiff
On Tue, Feb 28, 2012 at 03:50, Martin Jansa martin.ja...@gmail.com wrote: Not really; let's say if you had done a typo on the depends list it would be unnoticed in autobuilders and commited onto master. I see your point, but OEBasicHash will notice new dependency and then it will be rebuild at least by poky autobuilders (if they are building qt4). We're not using auto PR yet so let's keep the regular flow for now. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] qt4.inc: depend on tiff
On Tue, Feb 28, 2012 at 09:16:51AM -0300, Otavio Salvador wrote: On Tue, Feb 28, 2012 at 03:50, Martin Jansa martin.ja...@gmail.com wrote: Not really; let's say if you had done a typo on the depends list it would be unnoticed in autobuilders and commited onto master. I see your point, but OEBasicHash will notice new dependency and then it will be rebuild at least by poky autobuilders (if they are building qt4). We're not using auto PR yet so let's keep the regular flow for now. I'm not agains PR bump I'm just saying it would be rebuilt with OEBasicHash even without PR bump.. and without PRSERV -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-commits] Yi Zhao : lsbtest: Add recipe for LSB tests and automate test
On Tue, Feb 28, 2012 at 12:24:16PM +, g...@git.openembedded.org wrote:
Module: openembedded-core.git
Branch: master
Commit: b9ef6b8022a40bab83e8eb29e5fcde0886cf2988
URL:
http://git.openembedded.org/?p=openembedded-core.gita=commit;h=b9ef6b8022a40bab83e8eb29e5fcde0886cf2988
Author: Yi Zhao yi.z...@windriver.com
Date: Fri Feb 24 14:51:28 2012 +0800
lsbtest: Add recipe for LSB tests and automate test
The recipe is used for LSB tests. The script LSB_Test.sh does the following
things:
- setup LSB testing environment
- download LSB rpm packages with list file packages_list from remote
- install the packages
- execute LSB testing with profile file session
- collect the results
Install packages_list and session files into ${D}/opt/lsb-test.
[YOCTO #1567]
---
meta/recipes-extended/lsb/lsbtest/LSB_Test.sh | 510
+++
meta/recipes-extended/lsb/lsbtest/packages_list | 50 +++
meta/recipes-extended/lsb/lsbtest/session | 194 +
meta/recipes-extended/lsb/lsbtest_1.0.bb| 37 ++
S=${WORKDIR}
This breaks parsing with new strict quoting, will send patch for that,
but be more carefull next time :).
Cheers,
4 files changed, 791 insertions(+), 0 deletions(-)
Diff:
http://git.openembedded.org/?p=openembedded-core.git/?a=commitdiff;h=b9ef6b8022a40bab83e8eb29e5fcde0886cf2988
___
Openembedded-commits mailing list
openembedded-comm...@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] tcl 8.5.11: fix packaging
Op 28 feb. 2012, om 14:22 heeft Richard Purdie het volgende geschreven:
On Tue, 2012-02-28 at 08:58 +0100, Koen Kooi wrote:
Include /usr/lib/tcl8 for the msgcat and test module, force dependency on
tcl-lib since shlibs isn't picking it up.
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
---
meta/recipes-devtools/tcltk/tcl_8.5.11.bb |7 +--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
index 146021a..a9a41fb 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM =
file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11
file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \
-PR = r2
+PR = r3
BASE_SRC_URI = ${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
file://tcl-add-soname.patch
@@ -59,7 +59,10 @@ do_install() {
PACKAGES =+ ${PN}-lib
FILES_${PN}-lib = ${libdir}/libtcl8.5.so*
-FILES_${PN} += ${prefix}/lib/tcl8.5
+FILES_${PN} += ${prefix}/lib/tcl8.5 ${prefix}/lib/tcl8
FILES_${PN}-dev += ${libdir}/tclConfig.sh
+# isn't getting picked up by shlibs code
+RDEPENDS_${PN} += ${PN}-lib
+
BBCLASSEXTEND = native
ERROR: Nothing RPROVIDES 'tcl-native-lib-native' (but
virtual:native:/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly/build/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
RDEPENDS on or otherwise requires it)
NOTE: Runtime target 'tcl-native-lib-native' is unbuildable, removing.
This needs to be spelt out as tcl-lib instead of ${PN}-lib...
Argh, bitbake -b strikes again :(
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] tcl 8.5.11: fix packaging
On Tue, 2012-02-28 at 08:58 +0100, Koen Kooi wrote:
Include /usr/lib/tcl8 for the msgcat and test module, force dependency on
tcl-lib since shlibs isn't picking it up.
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
---
meta/recipes-devtools/tcltk/tcl_8.5.11.bb |7 +--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
index 146021a..a9a41fb 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM =
file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11
file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \
-PR = r2
+PR = r3
BASE_SRC_URI = ${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
file://tcl-add-soname.patch
@@ -59,7 +59,10 @@ do_install() {
PACKAGES =+ ${PN}-lib
FILES_${PN}-lib = ${libdir}/libtcl8.5.so*
-FILES_${PN} += ${prefix}/lib/tcl8.5
+FILES_${PN} += ${prefix}/lib/tcl8.5 ${prefix}/lib/tcl8
FILES_${PN}-dev += ${libdir}/tclConfig.sh
+# isn't getting picked up by shlibs code
+RDEPENDS_${PN} += ${PN}-lib
+
BBCLASSEXTEND = native
ERROR: Nothing RPROVIDES 'tcl-native-lib-native' (but
virtual:native:/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly/build/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
RDEPENDS on or otherwise requires it)
NOTE: Runtime target 'tcl-native-lib-native' is unbuildable, removing.
This needs to be spelt out as tcl-lib instead of ${PN}-lib...
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-commits] Yi Zhao : lsbtest: Add recipe for LSB tests and automate test
On Tue, 2012-02-28 at 13:41 +0100, Martin Jansa wrote:
On Tue, Feb 28, 2012 at 12:24:16PM +, g...@git.openembedded.org wrote:
Module: openembedded-core.git
Branch: master
Commit: b9ef6b8022a40bab83e8eb29e5fcde0886cf2988
URL:
http://git.openembedded.org/?p=openembedded-core.gita=commit;h=b9ef6b8022a40bab83e8eb29e5fcde0886cf2988
Author: Yi Zhao yi.z...@windriver.com
Date: Fri Feb 24 14:51:28 2012 +0800
lsbtest: Add recipe for LSB tests and automate test
The recipe is used for LSB tests. The script LSB_Test.sh does the following
things:
- setup LSB testing environment
- download LSB rpm packages with list file packages_list from remote
- install the packages
- execute LSB testing with profile file session
- collect the results
Install packages_list and session files into ${D}/opt/lsb-test.
[YOCTO #1567]
---
meta/recipes-extended/lsb/lsbtest/LSB_Test.sh | 510
+++
meta/recipes-extended/lsb/lsbtest/packages_list | 50 +++
meta/recipes-extended/lsb/lsbtest/session | 194 +
meta/recipes-extended/lsb/lsbtest_1.0.bb| 37 ++
S=${WORKDIR}
This breaks parsing with new strict quoting, will send patch for that,
but be more carefull next time :).
I ran into this and some others so I've pushed fixes for them.
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] tcl 8.5.11: fix packaging
Include /usr/lib/tcl8 for the msgcat and test module, force dependency on
tcl-lib since shlibs isn't picking it up.
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
---
Changes from v1: ${PN}-lib - tcl-lib
meta/recipes-devtools/tcltk/tcl_8.5.11.bb | 11 +++
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
index 146021a..ef1b76d 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM =
file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11
file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \
-PR = r2
+PR = r4
BASE_SRC_URI = ${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
file://tcl-add-soname.patch
@@ -57,9 +57,12 @@ do_install() {
done
}
-PACKAGES =+ ${PN}-lib
-FILES_${PN}-lib = ${libdir}/libtcl8.5.so*
-FILES_${PN} += ${prefix}/lib/tcl8.5
+PACKAGES =+ tcl-lib
+FILES_tcl-lib = ${libdir}/libtcl8.5.so*
+FILES_${PN} += ${prefix}/lib/tcl8.5 ${prefix}/lib/tcl8
FILES_${PN}-dev += ${libdir}/tclConfig.sh
+# isn't getting picked up by shlibs code
+RDEPENDS_${PN} += tcl-lib
+
BBCLASSEXTEND = native
--
1.7.2.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] tcl 8.5.11: fix packaging
On Tue, 2012-02-28 at 14:25 +0100, Koen Kooi wrote:
Include /usr/lib/tcl8 for the msgcat and test module, force dependency on
tcl-lib since shlibs isn't picking it up.
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
---
Changes from v1: ${PN}-lib - tcl-lib
meta/recipes-devtools/tcltk/tcl_8.5.11.bb | 11 +++
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
index 146021a..ef1b76d 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM =
file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11
file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \
-PR = r2
+PR = r4
BASE_SRC_URI = ${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
file://tcl-add-soname.patch
@@ -57,9 +57,12 @@ do_install() {
done
}
-PACKAGES =+ ${PN}-lib
-FILES_${PN}-lib = ${libdir}/libtcl8.5.so*
-FILES_${PN} += ${prefix}/lib/tcl8.5
+PACKAGES =+ tcl-lib
+FILES_tcl-lib = ${libdir}/libtcl8.5.so*
+FILES_${PN} += ${prefix}/lib/tcl8.5 ${prefix}/lib/tcl8
FILES_${PN}-dev += ${libdir}/tclConfig.sh
+# isn't getting picked up by shlibs code
+RDEPENDS_${PN} += tcl-lib
+
BBCLASSEXTEND = native
I'd merged the original so I've squashed a revert of that with this
commit and pushed that :/.
I've also realised we could have used BPN here but I think this fix is
fine.
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] syslinux: bump PR
The change done in 868a81e869a6193aada2073ae533d937a1c0baf4 has
changed the packaging however it haven't bump the PR making
auto-building fail.
Signed-off-by: Otavio Salvador ota...@ossystems.com.br
---
meta/recipes-devtools/syslinux/syslinux_4.03.bb |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/syslinux/syslinux_4.03.bb
b/meta/recipes-devtools/syslinux/syslinux_4.03.bb
index 862ea8b..823465c 100644
--- a/meta/recipes-devtools/syslinux/syslinux_4.03.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_4.03.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
# If you really want to run syslinux, you need mtools. We just want the
# ldlinux.* stuff for now, so skip mtools-native
DEPENDS = nasm-native
-PR = r4
+PR = r5
SRC_URI =
${KERNELORG_MIRROR}/linux/utils/boot/syslinux/4.xx/syslinux-${PV}.tar.bz2 \
file://cross-build.patch
--
1.7.2.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] syslinux: bump PR
On Tue, 2012-02-28 at 14:17 +, Otavio Salvador wrote: The change done in 868a81e869a6193aada2073ae533d937a1c0baf4 has changed the packaging however it haven't bump the PR making auto-building fail. Signed-off-by: Otavio Salvador ota...@ossystems.com.br --- meta/recipes-devtools/syslinux/syslinux_4.03.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merged to master, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] licenses.conf: fix quotting of SRC_DISTRIBUTE_LICENSES
Signed-off-by: Otavio Salvador ota...@ossystems.com.br --- meta/conf/licenses.conf |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf index e2f6149..6ed4dfe 100644 --- a/meta/conf/licenses.conf +++ b/meta/conf/licenses.conf @@ -35,7 +35,7 @@ SRC_DISTRIBUTE_LICENSES += OFL-1.1 OGTSL OLDAP-2.8 OpenSSL OSL-1.0 OSL-2.0 SRC_DISTRIBUTE_LICENSES += OSL-3.0 PD PHP-3.0 PostgreSQL Proprietary SRC_DISTRIBUTE_LICENSES += Python-2.0 QPL-1.0 RHeCos-1 RHeCos-1.1 RPL-1.5 SRC_DISTRIBUTE_LICENSES += RPSL-1.0 RSCPL Ruby SAX-PD Simple-2.0 Sleepycat -SRC_DISTRIBUTE_LICENSES += SPL-1.0 SugarCRM-1 SugarCRM-1.1.3 UCB VSL-1.0 W3C +SRC_DISTRIBUTE_LICENSES += SPL-1.0 SugarCRM-1 SugarCRM-1.1.3 UCB VSL-1.0 W3C SRC_DISTRIBUTE_LICENSES += Watcom-1.0 WXwindows XFree86-1.1 Xnet YPL-1.1 SRC_DISTRIBUTE_LICENSES += Zimbra-1.3 Zlib ZPL-1.1 ZPL-2.0 ZPL-2.1 -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] syslinux: Package unpackaged files in -misc
On Fri, Feb 24, 2012 at 16:59, Saul Wold s...@linux.intel.com wrote: Signed-off-by: Saul Wold s...@linux.intel.com This missed a PR bump and broke autobuilder; can you send a patch bumping PR please? -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bootimg bbclass: quoting fixes
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
---
meta/classes/bootimg.bbclass |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 1d1a3d0..c4a4c2a 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -35,8 +35,8 @@ ISODIR = ${S}/iso
BOOTIMG_VOLUME_ID ?= boot
BOOTIMG_EXTRA_SPACE ?= 512
-EFI = ${@base_contains(MACHINE_FEATURES, efi, 1, 0, d)}
-EFI_CLASS = ${@base_contains(MACHINE_FEATURES, efi, grub-efi, dummy,
d)}
+EFI = '${@base_contains(MACHINE_FEATURES, efi, 1, 0, d)}'
+EFI_CLASS = '${@base_contains(MACHINE_FEATURES, efi, grub-efi, dummy,
d)}'
# Include legacy boot if MACHINE_FEATURES includes pcbios or if it does not
# contain efi. This way legacy is supported by default if neither is
--
1.7.2.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] Including the kernel in the image
Hi all, For some boot configurations (e.g. kexecboot) having the kernel binary in the image is required. In OE Classic, task-boot used to always include the kernel binary in the image (via RRECOMMENDS, so it could be uninstalled). We don't currently have this in OE-Core and I was wondering what the new preferred way to have this done would be. Obviously we could go and add it to various images or even to task-core-boot again but I'm not sure that's ideal. Wanting the kernel in the image is really machine-specific (or to be precise, boot method specific); so I'm wondering if adding it to MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS for all machines likely to need it is the right thing to do? Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Including the kernel in the image
Op 28 feb. 2012, om 16:48 heeft Paul Eggleton het volgende geschreven: Hi all, For some boot configurations (e.g. kexecboot) having the kernel binary in the image is required. In OE Classic, task-boot used to always include the kernel binary in the image (via RRECOMMENDS, so it could be uninstalled). We don't currently have this in OE-Core and I was wondering what the new preferred way to have this done would be. As long as the solution doesn't end up with the FILES_kernel = crap we had in OE-classic. Obviously we could go and add it to various images or even to task-core-boot again but I'm not sure that's ideal. Wanting the kernel in the image is really machine-specific (or to be precise, boot method specific); so I'm wondering if adding it to MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS for all machines likely to need it is the right thing to do? I think so, maybe that will get people motivated to make BAD_RECOMMENDATIONS work with all package formats :) regards, Koen ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] bootimg bbclass: quoting fixes
On 02/28/2012 07:50 AM, Koen Kooi wrote:
Signed-off-by: Koen Kooik...@dominion.thruhere.net
---
meta/classes/bootimg.bbclass |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 1d1a3d0..c4a4c2a 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -35,8 +35,8 @@ ISODIR = ${S}/iso
BOOTIMG_VOLUME_ID ?= boot
BOOTIMG_EXTRA_SPACE ?= 512
-EFI = ${@base_contains(MACHINE_FEATURES, efi, 1, 0, d)}
-EFI_CLASS = ${@base_contains(MACHINE_FEATURES, efi, grub-efi, dummy,
d)}
+EFI = '${@base_contains(MACHINE_FEATURES, efi, 1, 0, d)}'
+EFI_CLASS = '${@base_contains(MACHINE_FEATURES, efi, grub-efi, dummy,
d)}'
# Include legacy boot if MACHINE_FEATURES includes pcbios or if it does not
# contain efi. This way legacy is supported by default if neither is
This actually needs more changes, see my patch.
Sau!
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bootimg: Fix Quoting
Signed-off-by: Saul Wold s...@linux.intel.com
---
meta/classes/bootimg.bbclass |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 1d1a3d0..f4981d8 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -35,8 +35,8 @@ ISODIR = ${S}/iso
BOOTIMG_VOLUME_ID ?= boot
BOOTIMG_EXTRA_SPACE ?= 512
-EFI = ${@base_contains(MACHINE_FEATURES, efi, 1, 0, d)}
-EFI_CLASS = ${@base_contains(MACHINE_FEATURES, efi, grub-efi, dummy,
d)}
+EFI = ${@base_contains(MACHINE_FEATURES, efi, 1, 0, d)}
+EFI_CLASS = ${@base_contains(MACHINE_FEATURES, efi, grub-efi, dummy,
d)}
# Include legacy boot if MACHINE_FEATURES includes pcbios or if it does not
# contain efi. This way legacy is supported by default if neither is
@@ -52,8 +52,8 @@ def pcbios_class(d):
return syslinux
return dummy
-PCBIOS = ${@pcbios(d)}
-PCBIOS_CLASS = ${@pcbios_class(d)}
+PCBIOS = ${@pcbios(d)}
+PCBIOS_CLASS = ${@pcbios_class(d)}
inherit ${PCBIOS_CLASS}
inherit ${EFI_CLASS}
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] bootimg bbclass: quoting fixes
Op 28 feb. 2012, om 17:48 heeft Saul Wold het volgende geschreven:
On 02/28/2012 07:50 AM, Koen Kooi wrote:
Signed-off-by: Koen Kooik...@dominion.thruhere.net
---
meta/classes/bootimg.bbclass |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 1d1a3d0..c4a4c2a 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -35,8 +35,8 @@ ISODIR = ${S}/iso
BOOTIMG_VOLUME_ID ?= boot
BOOTIMG_EXTRA_SPACE ?= 512
-EFI = ${@base_contains(MACHINE_FEATURES, efi, 1, 0, d)}
-EFI_CLASS = ${@base_contains(MACHINE_FEATURES, efi, grub-efi,
dummy, d)}
+EFI = '${@base_contains(MACHINE_FEATURES, efi, 1, 0, d)}'
+EFI_CLASS = '${@base_contains(MACHINE_FEATURES, efi, grub-efi,
dummy, d)}'
# Include legacy boot if MACHINE_FEATURES includes pcbios or if it does
not
# contain efi. This way legacy is supported by default if neither is
This actually needs more changes, see my patch.
Indeed, I resorted to using 'rm' for fix quoting issues :)
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] introduce pulseaudio to DISTRO_FEATURES
This patch adds a pulseaudio feature to DISTRO_FEATURES, using DISTRO_FEATURES_BACKFILL to preserve existing distro configuration, and makes Qt 4 respect it. There are a few other recipes that should respect this feature as well, however I wanted to send the qt4 one in as soon as possible as it addresses actual observed build failures. The following changes since commit 3cb519598d9ce044b2d6a52a3c0933433501: tcl 8.5.11: fix packaging for native version (2012-02-28 13:33:22 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/qt4-pulseaudio-fix http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/qt4-pulseaudio-fix Paul Eggleton (1): qt4: make pulseaudio support conditional upon DISTRO_FEATURES meta/conf/bitbake.conf |2 +- meta/recipes-qt/qt4/qt-4.7.4.inc |1 + .../qt4/qt-4.7.4/pulseaudio-config.patch | 45 meta/recipes-qt/qt4/qt-4.8.0.inc |1 + .../qt4/qt-4.8.0/pulseaudio-config.patch | 45 meta/recipes-qt/qt4/qt4.inc|2 + 6 files changed, 95 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/pulseaudio-config.patch create mode 100644 meta/recipes-qt/qt4/qt-4.8.0/pulseaudio-config.patch -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] qt4: make pulseaudio support conditional upon DISTRO_FEATURES
Add a pulseaudio DISTRO_FEATURES item and disable pulseaudio support in
phonon within Qt4 if it is not present; otherwise it is a race condition
as to whether it is enabled or disabled or breaks the build.
Note that this adds pulseaudio to DISTRO_FEATURES_BACKFILL thus leaving
existing distro configurations unaffected.
Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com
---
meta/conf/bitbake.conf |2 +-
meta/recipes-qt/qt4/qt-4.7.4.inc |1 +
.../qt4/qt-4.7.4/pulseaudio-config.patch | 45
meta/recipes-qt/qt4/qt-4.8.0.inc |1 +
.../qt4/qt-4.8.0/pulseaudio-config.patch | 45
meta/recipes-qt/qt4/qt4.inc|2 +
6 files changed, 95 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/pulseaudio-config.patch
create mode 100644 meta/recipes-qt/qt4/qt-4.8.0/pulseaudio-config.patch
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f67bf50..18879c8 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -700,7 +700,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?=
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?=
IMAGE_FEATURES += ${EXTRA_IMAGE_FEATURES}
-DISTRO_FEATURES_BACKFILL =
+DISTRO_FEATURES_BACKFILL = pulseaudio
DISTRO_FEATURES_append = ${@oe.utils.distro_features_backfill(d)}
COMBINED_FEATURES = \
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc
index 216472c..f8956f7 100644
--- a/meta/recipes-qt/qt4/qt-4.7.4.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.4.inc
@@ -16,6 +16,7 @@ SRC_URI =
http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
file://fix-translations.patch \
file://add_nostrip_for_debug_packages.diff \
file://target_qmake.patch \
+ file://pulseaudio-config.patch \
file://g++.conf \
file://linux.conf \
file://fix-qtbug-20925.patch \
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/pulseaudio-config.patch
b/meta/recipes-qt/qt4/qt-4.7.4/pulseaudio-config.patch
new file mode 100644
index 000..bbdc8bf
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.7.4/pulseaudio-config.patch
@@ -0,0 +1,45 @@
+From 85f9264773407f2bf8d0495c9fc8bd83683ab2f0 Mon Sep 17 00:00:00 2001
+From: Paul Eggleton paul.eggle...@linux.intel.com
+Date: Wed, 23 Nov 2011 14:36:10 +
+Subject: [PATCH] configure: make pulseaudio a configurable option
+
+Allows disabling pulseaudio support within phonon at configure time.
+(This is the Qt 4.7.4 version.)
+
+Upstream-Status: Pending
+
+Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com
+---
+ configure |9 -
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 3b7a1f3..7616fd3 100755
+--- a/configure
b/configure
+@@ -941,7 +941,7 @@ while [ $# -gt 0 ]; do
+ VAL=no
+ ;;
+ #Qt style yes options
+-
-incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles)
++
-incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-pulseaudio|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles)
+ VAR=`echo $1 | sed s,^-\(.*\),\1,`
+ VAL=yes
+ ;;
+@@ -1863,6 +1863,13 @@ while [ $# -gt 0 ]; do
+ UNKNOWN_OPT=yes
+ fi
+ ;;
++pulseaudio)
++if [ $VAL = yes ] || [ $VAL = no ]; then
++CFG_PULSEAUDIO=$VAL
++else
++UNKNOWN_OPT=yes
++fi
++;;
+ gtkstyle)
+ if [ $VAL = yes ] || [ $VAL = no ]; then
+ CFG_QGTKSTYLE=$VAL
+--
+1.7.5.4
+
diff --git
Re: [OE-core] [PATCH 1/2] arch-powerpc{, 64}.inc: update/add PACKAGE_EXTRA_ARCHS for powerpc/powerpc64
On 02/22/2012 10:21 PM, Matthew McClintock wrote:
Signed-off-by: Matthew McClintockm...@freescale.com
---
meta/conf/machine/include/powerpc/arch-powerpc.inc |4 +---
.../machine/include/powerpc/arch-powerpc64.inc |1 +
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc
b/meta/conf/machine/include/powerpc/arch-powerpc.inc
index 8347f86..c9b2829 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
@@ -30,6 +30,4 @@ BASE_LIB_tune-powerpc-nf = lib
PACKAGE_EXTRA_ARCHS_tune-powerpc-nf = powerpc-nf
TUNE_FEATURES_tune-powerpc ?= m32 fpu-hard
BASE_LIB_tune-powerpc = lib
-PACKAGE_EXTRA_ARCHS_tune-powerpc = ${PACKAGE_EXTRA_ARCHS_tune-powerpc-nf}
powerpc
-
-
+PACKAGE_EXTRA_ARCHS_tune-powerpc = powerpc
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
index 7ef8ddc..48cd08e 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
@@ -10,3 +10,4 @@ TUNE_ARCH .= ${@bb.utils.contains(TUNE_FEATURES, [ m64 ],
powerpc64, ,
AVAILTUNES += powerpc64
TUNE_FEATURES_tune-powerpc64 ?= m64 fpu-hard
BASE_LIB_tune-powerpc64 = lib64
+PACKAGE_EXTRA_ARCHS_tune-powerpc64 = powerpc64
Both of the patches in this series are merged it OE-core
Thanks
Sau!
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2 0/3] lsbtest: Add recipe for LSB tests and automate test
On 02/23/2012 11:02 PM, Yi Zhao wrote:
Hi,
The pull request is to address [YOCTO #1567] - Add recipe for lsb tests and
automate test.
LSB testing is different from LTP or POSIX testing. We don't need to build the
cases from sources but need to install a set of pre-build binary packages in
lsb image.
I add a script and 2 list files in this recipe. The script is used for setting
up lsb test environment, download lsb rpm packages from remote, install
packages, execute the test and collect the results.
When run this script in the target, the lsb will be downloaded, installed and
executed automatically.
The version 2 patch add a RDEPENDS_${PN} in .bb file.
The following changes since commit 5aca6a7e940d2d0878279b47db0c399d92d5b4f6:
update-rc.d.bbclass: do nothing for extended cross packages (2012-02-24
00:47:51 +)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib yizhao/bug1567v2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=yizhao/bug1567v2
Yi Zhao (3):
lsbtest: Add recipe for LSB tests and automate test
distro_tracking_fields: add information for lsbtest
task-core-lsb: add lsbtest to RDEPENDS_task-core-misc list
.../conf/distro/include/distro_tracking_fields.inc |4 +
meta/recipes-extended/lsb/lsbtest/LSB_Test.sh | 510
meta/recipes-extended/lsb/lsbtest/packages_list| 50 ++
meta/recipes-extended/lsb/lsbtest/session | 194
meta/recipes-extended/lsb/lsbtest_1.0.bb | 37 ++
meta/recipes-extended/tasks/task-core-lsb.bb |3 +-
6 files changed, 797 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
create mode 100644 meta/recipes-extended/lsb/lsbtest/packages_list
create mode 100644 meta/recipes-extended/lsb/lsbtest/session
create mode 100644 meta/recipes-extended/lsb/lsbtest_1.0.bb
Merged into OE-core
Thanks
Sau!
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/3] linux-yocto: consolidated pull request
On 02/27/2012 11:34 AM, Bruce Ashfield wrote: Richard/Saul, Here's a consolidated pull reqeset for the some kernel items. - a bump of 3.0 to 3.0.22 - a bump of 3.2 to 3.2.7 - A fix for yocto 2032 You can cherry pick the bug fix by itself. As for the version updates, I've built and booted them on my development machine and on a clean machine, so they are safe for everything that I've been able to test. cc: Darren Hartdvh...@linux.intel.com Cheers, Bruce The following changes since commit f420fb3de1f588a51dd6009452c7836903fa9158: Richard Purdie (1): glib-2.0: Disable fam, we don't depend on it are available in the git repository at: git://git.pokylinux.org/poky-contrib zedd/kernel http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel Bruce Ashfield (3): linux-yocto: update 3.0 kernel to v3.0.22 linux-yocto: update 3.2 kernel to v3.2.7 linux-yocto: allow non-branched repositories to check out meta/classes/kernel-yocto.bbclass |2 +- meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |8 meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb |9 + meta/recipes-kernel/linux/linux-yocto-tiny_3.0.bb |6 +++--- meta/recipes-kernel/linux/linux-yocto_3.0.bb | 18 +- meta/recipes-kernel/linux/linux-yocto_3.2.bb | 19 ++- 6 files changed, 32 insertions(+), 30 deletions(-) Merged into OE-core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] multilib.bbclass: allow TARGET_VENDOR_virtclass-multilib to be overriden
On 02/27/2012 11:38 AM, Matthew McClintock wrote:
If we set this bit, we can override the ugly pokymllib32 to back to
poky (powerpc-pokymllib32-linux-gcc - powerpc-poky-linux-gcc). I've
left this unset by default, but can be set by adding the following:
TARGET_VENDOR_virtclass-multilib-lib32 = -poky
Signed-off-by: Matthew McClintockm...@freescale.com
---
meta/classes/multilib.bbclass |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 87d0cd4..61b7765 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -26,7 +26,8 @@ python multilib_virtclass_handler () {
e.data.setVar(MLPREFIX, variant + -)
e.data.setVar(PN, variant + - + e.data.getVar(PN, False))
e.data.setVar(SHLIBSDIR_virtclass-multilib- + variant ,e.data.getVar(SHLIBSDIR,
False) + / + variant)
-e.data.setVar(TARGET_VENDOR_virtclass-multilib- + variant,
e.data.getVar(TARGET_VENDOR, False) + ml + variant)
+if e.data.getVar(TARGET_VENDOR_virtclass-multilib- + variant, False) is
None:
+ e.data.setVar(TARGET_VENDOR_virtclass-multilib- + variant,
e.data.getVar(TARGET_VENDOR, False) + ml + variant)
e.data.setVar(OVERRIDES, e.data.getVar(OVERRIDES, False) + override)
}
Patches 1, 2, and 4 from this series where pulled into OE-core
Thanks
Sau!
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] mtd-utils: Don't use host 'ranlib' or 'ar'.
On 02/27/2012 07:49 PM, James Limbouris wrote:
If ranlib, ar, or cc are not supplied to make, it attempts to use ${CROSS}xxx.
Since ${CROSS} is not set, host ranlib may run, producing an unusable .a file
on some platforms.
Signed-off-by: James Limbourisja...@digitalmatter.com.au
---
meta/recipes-devtools/mtd/mtd-utils_1.4.9.bb |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/mtd/mtd-utils_1.4.9.bb
b/meta/recipes-devtools/mtd/mtd-utils_1.4.9.bb
index 519472c..4228b51 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_1.4.9.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_1.4.9.bb
@@ -11,9 +11,9 @@ SRC_URI =
git://git.infradead.org/mtd-utils.git;protocol=git;tag=995cfe51b0a3cf
S = ${WORKDIR}/git/
-PR = r0
+PR = r1
-EXTRA_OEMAKE = 'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR'
'BUILDDIR=${S}'
+EXTRA_OEMAKE = 'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS}
-I${S}/include -DWITHOUT_XATTR' 'BUILDDIR=${S}'
do_install () {
oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir}
INCLUDEDIR=${includedir}
Merged into OE-core
Thanks
Sau!
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] licenses.conf: fix quotting of SRC_DISTRIBUTE_LICENSES
On 02/28/2012 07:02 AM, Otavio Salvador wrote: Signed-off-by: Otavio Salvadorota...@ossystems.com.br --- meta/conf/licenses.conf |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf index e2f6149..6ed4dfe 100644 --- a/meta/conf/licenses.conf +++ b/meta/conf/licenses.conf @@ -35,7 +35,7 @@ SRC_DISTRIBUTE_LICENSES += OFL-1.1 OGTSL OLDAP-2.8 OpenSSL OSL-1.0 OSL-2.0 SRC_DISTRIBUTE_LICENSES += OSL-3.0 PD PHP-3.0 PostgreSQL Proprietary SRC_DISTRIBUTE_LICENSES += Python-2.0 QPL-1.0 RHeCos-1 RHeCos-1.1 RPL-1.5 SRC_DISTRIBUTE_LICENSES += RPSL-1.0 RSCPL Ruby SAX-PD Simple-2.0 Sleepycat -SRC_DISTRIBUTE_LICENSES += SPL-1.0 SugarCRM-1 SugarCRM-1.1.3 UCB VSL-1.0 W3C +SRC_DISTRIBUTE_LICENSES += SPL-1.0 SugarCRM-1 SugarCRM-1.1.3 UCB VSL-1.0 W3C SRC_DISTRIBUTE_LICENSES += Watcom-1.0 WXwindows XFree86-1.1 Xnet YPL-1.1 SRC_DISTRIBUTE_LICENSES += Zimbra-1.3 Zlib ZPL-1.1 ZPL-2.0 ZPL-2.1 Merged into OE-core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] qt4.inc: depend on tiff
On 02/27/2012 05:02 PM, Andreas Oberritter wrote:
From fdececee9146f4d23494361d29a34877d67b879b Mon Sep 17 00:00:00 2001
From: Andreas Oberrittero...@opendreambox.org
Date: Mon, 27 Feb 2012 18:03:22 +0100
Subject: [PATCH] qt4.inc: depend on tiff
* Fixes the following error with qt4-embedded-4.8.0 and possibly others:
| ../../../gui/image/qtiffhandler.cpp:48:20: fatal error: tiffio.h: No such
file or directory
Signed-off-by: Andreas Oberrittero...@opendreambox.org
---
meta/recipes-qt/qt4/qt4-embedded.inc |2 +-
meta/recipes-qt/qt4/qt4-x11-free.inc |2 +-
meta/recipes-qt/qt4/qt4.inc |4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc
b/meta/recipes-qt/qt4/qt4-embedded.inc
index e472af5..80948f3 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -2,7 +2,7 @@ DESCRIPTION = Qt is a versatile cross-platform application
framework -- this is
SECTION = libs
HOMEPAGE =http://qt.nokia.com;
DEPENDS += directfb tslib
-INC_PR = r40
+INC_PR = r41
QT_BASE_LIB ?= libqt-embedded
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc
b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 40939de..75487f7 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE =http://qt.nokia.com;
SECTION = x11/libs
DEPENDS += virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender
libxrandr libxcursor
-INC_PR = r37
+INC_PR = r38
QT_GLFLAGS ?= ${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl',
'-no-opengl', d)}
QT_GLFLAGS_qemux86 = -opengl
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index ea868ff..161daa3 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -1,6 +1,6 @@
inherit qmake_base
-DEPENDS += qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0
gstreamer gst-plugins-base sqlite3
+DEPENDS += qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0
gstreamer gst-plugins-base sqlite3 tiff
require qt4_arch.inc
QT_ARCH := ${@qt_arch(d)}
@@ -15,7 +15,7 @@ QT_GLFLAGS ?=
QT_CONFIG_FLAGS += -release -no-cups -reduce-relocations \
-shared -no-nas-sound -no-nis \
--system-libjpeg -system-libpng -system-zlib \
+-system-libjpeg -system-libpng -system-libtiff
-system-zlib \
-no-pch -qdbus -stl -glib -phonon -webkit \
-xmlpatterns -no-rpath -qt3support -silent \
${QT_SQL_DRIVER_FLAGS} \
-- 1.7.5.4
Merged into OE-core
Thanks
Sau!
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] image_types: Refactor compression code into a generic compression solution
Op 27 feb. 2012, om 13:43 heeft Richard Purdie het volgende geschreven: The current approach of adding each different compressed image type doesn't scale. This patch changes the code so compressed images for each form are automatically available using the form type.compression type in IMAGE_FSTYPES. This doesn't change any existing externally visible behaviour and the image generation process becomes more efficient as a result too. There's a a few -f's missing in this patch, e.g. bz2 images now fail with: bzip2: ERROR: Function failed: do_rootfs (see /OE/tentacle/build/tmp-angstrom_2010_x-eglibc/work/beagleboard-angstrom-linux-gnueabi/systemd-image-1.0-r0/temp/log.do_rootfs.3174 for further information) Output file Angstrom-systemd-image-eglibc-ipk-v2012.02-core-beagleboard.rootfs.tar.bz2 already exists. A quick look suggests at least bz2 and xz images can't get rebuilt. regards, Koen ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] linux-yocto: make kernel_checkout reentrant
The steps in do_kernel_checkout modify the source tree in WORKDIR.
If it is called multiple times, or interrupted, the tree is left
in an inconsistent state.
This change adds protections around branch names, and around the
manipulations of directories to ensure that it is safe to call
at any point.
Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com
---
meta/classes/kernel-yocto.bbclass | 33 -
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass
b/meta/classes/kernel-yocto.bbclass
index 5f3cb63..187e3cc 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -139,17 +139,17 @@ do_patch() {
}
do_kernel_checkout() {
- # we build out of {S}, so ensure that ${S} is clean and present
- rm -rf ${S}
- mkdir -p ${S}/.git
-
set +e
# A linux yocto SRC_URI should use the bareclone option. That
# ensures that all the branches are available in the WORKDIR version
# of the repository. If it wasn't passed, we should detect it, and put
# out a useful error message
- if [ -d ${WORKDIR}/git/.git ]; then
+ if [ -d ${WORKDIR}/git/ ] [ -d ${WORKDIR}/git/.git ]; then
+ # we build out of {S}, so ensure that ${S} is clean and present
+ rm -rf ${S}
+ mkdir -p ${S}/.git
+
echo WARNING. ${WORKDIR}/git is not a bare clone.
echo Ensure that the SRC_URI includes the 'bareclone=1'
option.
@@ -158,12 +158,14 @@ do_kernel_checkout() {
mv ${WORKDIR}/git/.git ${S}
rm -rf ${WORKDIR}/git/
cd ${S}
- git branch -a | grep -q ${KMETA}
- if [ $? -ne 0 ]; then
- echo ERROR. The branch '${KMETA}' is required and was
not
- echo found. Ensure that the SRC_URI points to a valid
linux-yocto
- echo kernel repository
- exit 1
+ if [ -n ${YOCTO_KERNEL_META_DATA} ] [ -n ${KMETA} ]; then
+ git branch -a | grep -q ${KMETA}
+ if [ $? -ne 0 ]; then
+ echo ERROR. The branch '${KMETA}' is required
and was not
+ echo found. Ensure that the SRC_URI points to
a valid linux-yocto
+ echo kernel repository
+ exit 1
+ fi
fi
if [ -z ${YOCTO_KERNEL_EXTERNAL_BRANCH} ] [ -n
${KBRANCH} ] ; then
git branch -a | grep -q ${KBRANCH}
@@ -174,10 +176,15 @@ do_kernel_checkout() {
exit 1
fi
fi
- else
+ fi
+ if [ -d ${WORKDIR}/git/ ] [ ! -d ${WORKDIR}/git/.git ]; then
+ # we build out of {S}, so ensure that ${S} is clean and present
+ rm -rf ${S}
+ mkdir -p ${S}/.git
+
mv ${WORKDIR}/git/* ${S}/.git
rm -rf ${WORKDIR}/git/
- cd ${S}
+ cd ${S}
git config core.bare false
fi
# end debare
--
1.7.0.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] linux-yocto: revision bump + pvr + checkout fix
Richard/Saul, Naturally right after I sent my previous version bump to 3.2.7, 3.2.8 came out with an x86 floating point fix that was worth picking up. Hence my quick bump to 3.2.8. The other update to the 3.0/3.2 trees stages content for PVR functionality in some future BSP work. And finally, I added some extra checks and safety to the kernel checkout code, since Saul was reporting issues that I couldn't reproduce, I can't be sure if they fix his problem. But they do fix issues with aborted builds and the korg recipe. I've built many kernels and as many recipes as possible with these in place. cc: Kishore Bodke kishore.k.bo...@intel.com Cheers, Bruce The following changes since commit d86e3082e695cde555df276a2436873fa5381130: Otavio Salvador (1): licenses.conf: fix quotting of SRC_DISTRIBUTE_LICENSES are available in the git repository at: git://git.pokylinux.org/poky-contrib zedd/kernel http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel Bruce Ashfield (3): linux-yocto: make kernel_checkout reentrant linux-yocto/meta: add pvr feature description linux-yocto: update to v3.2.8 meta/classes/kernel-yocto.bbclass | 33 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |2 +- meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb |8 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_3.0.bb |2 +- meta/recipes-kernel/linux/linux-yocto_3.0.bb |2 +- meta/recipes-kernel/linux/linux-yocto_3.2.bb | 16 +- 6 files changed, 35 insertions(+), 28 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] linux-yocto/meta: add pvr feature description
Updating the 3.0 and 3.2 kernel SRCREVS to make the PVR feature
description available to machines with the appropriate hardware.
Signed-off-by: Kishore Bodke kishore.k.bo...@intel.com
Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com
---
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |2 +-
meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb |2 +-
meta/recipes-kernel/linux/linux-yocto-tiny_3.0.bb |2 +-
meta/recipes-kernel/linux/linux-yocto_3.0.bb |2 +-
meta/recipes-kernel/linux/linux-yocto_3.2.bb |2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index 41a37fe..8090535 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = preempt-rt
SRCREV_machine ?= 03705f7f066d83b4cd3a6088781d47e3b9e45b71
SRCREV_machine_qemuppc ?= c8b184e8171f6f5a8017be4c5bf1e7a38c3f3002
-SRCREV_meta ?= 808b49474268040ab27c8ee687b60807a11547b4
+SRCREV_meta ?= d7b46785d6781e2c23d754f35f09bebd3b74b5bb
PR = r1
PV = ${LINUX_VERSION}+git${SRCPV}
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
index 3370729..b0dacb4 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = preempt-rt
SRCREV_machine ?= 2043e8b786dfd06a41a66780141f731d2d788696
SRCREV_machine_qemuppc ?= ec400326633f011c3b7d390beb765ad955145a29
-SRCREV_meta ?= 5db8963f9aefc70b4483ca4ccce8f2ef6964e2c3
+SRCREV_meta ?= 4c648bbbc7d2204d1b24f444aebb10f91c4ecae3
PR = r0
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.0.bb
b/meta/recipes-kernel/linux/linux-yocto-tiny_3.0.bb
index f4eedb7..32d502f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.0.bb
@@ -8,7 +8,7 @@ KBRANCH = ${KMACHINE}
LINUX_VERSION ?= 3.0.22
SRCREV_machine ?= c578f3a1f357142a6e02a1df4ae9aa16f45094d6
-SRCREV_meta ?= 808b49474268040ab27c8ee687b60807a11547b4
+SRCREV_meta ?= d7b46785d6781e2c23d754f35f09bebd3b74b5bb
PR = r1
PV = ${LINUX_VERSION}+git${SRCPV}
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index 8e7842e..58e1f6b 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?=
804aff4612bb7a53ac4679412c2a78bc06e3c4ce
SRCREV_machine_qemux86 ?= 7b0476fde681e828417d8fa86c47b0ca539ade70
SRCREV_machine_qemux86-64 ?= 14fe1742198bd5a85fbcf6e53d336838ff87b2ef
SRCREV_machine ?= c578f3a1f357142a6e02a1df4ae9aa16f45094d6
-SRCREV_meta ?= 808b49474268040ab27c8ee687b60807a11547b4
+SRCREV_meta ?= d7b46785d6781e2c23d754f35f09bebd3b74b5bb
PR = r3
PV = ${LINUX_VERSION}+git${SRCPV}
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb
b/meta/recipes-kernel/linux/linux-yocto_3.2.bb
index 9be1bd9..65e1ea0 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.2.bb
@@ -24,7 +24,7 @@ SRCREV_machine_qemuppc ?=
8fc0489fffe4c626f9a8053ad86014e75073a3d0
SRCREV_machine_qemux86 ?= 0fae9c2722039df3e93398d314ee10e3f4330b86
SRCREV_machine_qemux86-64 ?= 0fae9c2722039df3e93398d314ee10e3f4330b86
SRCREV_machine ?= 0fae9c2722039df3e93398d314ee10e3f4330b86
-SRCREV_meta ?= 5db8963f9aefc70b4483ca4ccce8f2ef6964e2c3
+SRCREV_meta ?= 4c648bbbc7d2204d1b24f444aebb10f91c4ecae3
PR = r0
PV = ${LINUX_VERSION}+git${SRCPV}
--
1.7.0.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] linux-yocto: update to v3.2.8
3.2.8 was released and contains a floating point fix for x86 32 bit and some x86-64 fixes. So it's worth picking up right away. Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb |6 +++--- meta/recipes-kernel/linux/linux-yocto_3.2.bb| 14 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb index b0dacb4..bbb227f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb @@ -11,11 +11,11 @@ KMACHINE_qemumips = mti-malta32-be KBRANCH = standard/preempt-rt/base KBRANCH_qemuppc = standard/preempt-rt/qemu-ppc32 -LINUX_VERSION ?= 3.2.7 +LINUX_VERSION ?= 3.2.8 LINUX_KERNEL_TYPE = preempt-rt -SRCREV_machine ?= 2043e8b786dfd06a41a66780141f731d2d788696 -SRCREV_machine_qemuppc ?= ec400326633f011c3b7d390beb765ad955145a29 +SRCREV_machine ?= 6ab03c43328172425a6f632bff694a8da6c99f0e +SRCREV_machine_qemuppc ?= 470deb222a704f84f3acf3a013a19d2da399d511 SRCREV_meta ?= 4c648bbbc7d2204d1b24f444aebb10f91c4ecae3 diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb b/meta/recipes-kernel/linux/linux-yocto_3.2.bb index 65e1ea0..ecde039 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.2.bb @@ -15,15 +15,15 @@ KBRANCH_qemuppc = standard/default/qemu-ppc32 KBRANCH_qemumips = standard/default/mti-malta32-be KBRANCH_qemuarm = standard/default/arm-versatile-926ejs -LINUX_VERSION ?= 3.2.7 +LINUX_VERSION ?= 3.2.8 -SRCREV_machine_qemuarm ?= c2028a144fe035719af7c5e9989fedc62ccf3c2c -SRCREV_machine_qemumips ?= 7dfffd937d4755cba0fcf3f2b9b69a1c62262084 -SRCREV_machine_qemuppc ?= 8fc0489fffe4c626f9a8053ad86014e75073a3d0 -SRCREV_machine_qemux86 ?= 0fae9c2722039df3e93398d314ee10e3f4330b86 -SRCREV_machine_qemux86-64 ?= 0fae9c2722039df3e93398d314ee10e3f4330b86 -SRCREV_machine ?= 0fae9c2722039df3e93398d314ee10e3f4330b86 +SRCREV_machine_qemuarm ?= 2fdc18ce2b9bf95519a02640cb45930ae7587dd4 +SRCREV_machine_qemumips ?= 2b2a6bad57fe403f1180c4b9021210da87d02c20 +SRCREV_machine_qemuppc ?= eabeabc4c8a17822772895d3ba22989ae18a58c3 +SRCREV_machine_qemux86 ?= ea5bd45e564520ca4ecdb10f7af63263d5fe33f7 +SRCREV_machine_qemux86-64 ?= f54af84c64408a0259a919d1fd2405c0115c0a0b +SRCREV_machine ?= 21ab5dca134a6bf1316aa59f69f9ee9e091d5702 SRCREV_meta ?= 4c648bbbc7d2204d1b24f444aebb10f91c4ecae3 PR = r0 -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] sudo upgrade
Hello,
This upgrade to sudo fixes a significant security vulnerability.
The following changes since commit 61216d2743502ef38955054aad6a4f2ed63e6d43:
licenses.conf: fix quotting of SRC_DISTRIBUTE_LICENSES (2012-02-28 17:51:42
+)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib sgarman/sudo-upgrade-final
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/sudo-upgrade-final
Scott Garman (1):
sudo: upgrade to 1.8.4
meta/recipes-extended/sudo/sudo.inc|7 ---
.../sudo/{sudo_1.8.3.bb = sudo_1.8.4.bb} |4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
rename meta/recipes-extended/sudo/{sudo_1.8.3.bb = sudo_1.8.4.bb} (84%)
--
1.7.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] sudo: upgrade to 1.8.4
During the upgrade to 1.8.4, the UCB-licensed fnmatch.c was replaced
with a non-recursive BSD-licensed version, hence the removal of UCB
and addition of BSD in the LICENSE field. This led to checksum changes
in the doc/LICENSE file, and we now additionally track the comment
headers in redblack.c.
These changes were confirmed on the sudo mailing list:
http://www.sudo.ws/pipermail/sudo-workers/2012-February/000736.html
This upgrade also fixes CVE-2012-0809.
Signed-off-by: Scott Garman scott.a.gar...@intel.com
---
meta/recipes-extended/sudo/sudo.inc|7 ---
.../sudo/{sudo_1.8.3.bb = sudo_1.8.4.bb} |4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
rename meta/recipes-extended/sudo/{sudo_1.8.3.bb = sudo_1.8.4.bb} (84%)
diff --git a/meta/recipes-extended/sudo/sudo.inc
b/meta/recipes-extended/sudo/sudo.inc
index 83dd209..2168690 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -3,9 +3,10 @@ DESCRIPTION = Sudo (superuser do) allows a system
administrator to give certain
HOMEPAGE = http://www.sudo.ws;
BUGTRACKER = http://www.sudo.ws/bugs/;
SECTION = admin
-LICENSE = ISC UCB Zlib
-LIC_FILES_CHKSUM = file://doc/LICENSE;md5=54f1b46c2459ecec3d892618eab44302 \
-
file://compat/fnmatch.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85
\
+LICENSE = ISC BSD Zlib
+LIC_FILES_CHKSUM = file://doc/LICENSE;md5=19f95c610f585c26a836975654807669 \
+
file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=fba1c1dca0951819964dfdc618e81724
\
+
file://compat/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd
\
file://compat/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681
\
file://compat/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85
\
file://compat/snprintf.c;beginline=6;endline=31;md5=c98b24f02967c095d7a70ae2e4d4d4ea
diff --git a/meta/recipes-extended/sudo/sudo_1.8.3.bb
b/meta/recipes-extended/sudo/sudo_1.8.4.bb
similarity index 84%
rename from meta/recipes-extended/sudo/sudo_1.8.3.bb
rename to meta/recipes-extended/sudo/sudo_1.8.4.bb
index 99fe5b9..dfa7291 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.3.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.4.bb
@@ -8,8 +8,8 @@ SRC_URI = http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
PAM_SRC_URI = file://sudo.pam
-SRC_URI[md5sum] = 9e5517bbf3aee420b38c2d1d7a71bcad
-SRC_URI[sha256sum] =
ff1fcc410c5465063ee4912912e29936ea39f017d9a8a57ec76b0ded71b7c3c4
+SRC_URI[md5sum] = 5a54dde137618bbc1dd46bb0ef725d7d
+SRC_URI[sha256sum] =
17a91da1857954aa73445197e6f73d5d50cc8c48719f6db457723bb8badc32a5
DEPENDS += ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}
RDEPENDS_${PN} += ${@base_contains('DISTRO_FEATURES', 'pam',
'pam-plugin-limits pam-plugin-keyinit', '', d)}
--
1.7.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] qemu.inc do_install question / qemu-targets.inc
All,
I'm wanting to remove this:
diff --git a/meta/recipes-devtools/qemu/qemu.inc
b/meta/recipes-devtools/qemu/qemu.inc
index 58049b9..3be46f2 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -49,13 +49,6 @@ do_configure() {
test ! -e ${S}/target-i386/beginend_funcs.sh || chmod a+x
${S}/target-i386/beginend_funcs.s
}
-do_install () {
- export STRIP=true
- autotools_do_install
- install -d ${D}${datadir}/qemu
- install -m 0755 ${WORKDIR}/powerpc_rom.bin ${D}${datadir}/qemu
-}
-
Can anyone comment why it's there? Can we move it up a level to a
specific recipe? We don't want to include this powerpc_rom.bin..
should we just fork our qemu recipe instead?
Also, can we make this change? I don't think we want ppc-linux-user on
our ppc-softmmu target.
diff --git a/meta/recipes-devtools/qemu/qemu-targets.inc
b/meta/recipes-devtools/qemu/qemu-targe
index 550a7fe..8423aa1 100644
--- a/meta/recipes-devtools/qemu/qemu-targets.inc
+++ b/meta/recipes-devtools/qemu/qemu-targets.inc
@@ -6,7 +6,7 @@ def get_qemu_target_list(d):
import bb
archs = bb.data.getVar('QEMU_TARGETS', d, True).split()
targets =
-for arch in ['mips64', 'mips64el', 'ppcemb']:
+for arch in ['mips64', 'mips64el', 'ppcemb', 'ppc']:
if arch in archs:
targets += arch + -softmmu,
archs.remove(arch)
-M
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Including the kernel in the image
On Tue, Feb 28, 2012 at 5:16 PM, Matthew McClintock m...@freescale.com wrote: On Tue, Feb 28, 2012 at 9:48 AM, Paul Eggleton paul.eggle...@linux.intel.com wrote: Hi all, For some boot configurations (e.g. kexecboot) having the kernel binary in the image is required. In OE Classic, task-boot used to always include the kernel binary in the image (via RRECOMMENDS, so it could be uninstalled). We don't currently have this in OE-Core and I was wondering what the new preferred way to have this done would be. Obviously we could go and add it to various images or even to task-core-boot again but I'm not sure that's ideal. Wanting the kernel in the image is really machine-specific (or to be precise, boot method specific); so I'm wondering if adding it to MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS for all machines likely to need it is the right thing to do? kexec and qemu/kvm could use this... And I meant to finish by saying qemu/kvm can also use a rootfs in a rootfs... -M ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Including the kernel in the image
On Tue, Feb 28, 2012 at 9:48 AM, Paul Eggleton paul.eggle...@linux.intel.com wrote: Hi all, For some boot configurations (e.g. kexecboot) having the kernel binary in the image is required. In OE Classic, task-boot used to always include the kernel binary in the image (via RRECOMMENDS, so it could be uninstalled). We don't currently have this in OE-Core and I was wondering what the new preferred way to have this done would be. Obviously we could go and add it to various images or even to task-core-boot again but I'm not sure that's ideal. Wanting the kernel in the image is really machine-specific (or to be precise, boot method specific); so I'm wondering if adding it to MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS for all machines likely to need it is the right thing to do? kexec and qemu/kvm could use this... -M ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] image_types: Refactor compression code into a generic compression solution
On Tue, Feb 28, 2012 at 9:19 PM, Koen Kooi k...@dominion.thruhere.net wrote: Op 27 feb. 2012, om 13:43 heeft Richard Purdie het volgende geschreven: The current approach of adding each different compressed image type doesn't scale. This patch changes the code so compressed images for each form are automatically available using the form type.compression type in IMAGE_FSTYPES. This doesn't change any existing externally visible behaviour and the image generation process becomes more efficient as a result too. There's a a few -f's missing in this patch, e.g. bz2 images now fail with: bzip2: ERROR: Function failed: do_rootfs (see /OE/tentacle/build/tmp-angstrom_2010_x-eglibc/work/beagleboard-angstrom-linux-gnueabi/systemd-image-1.0-r0/temp/log.do_rootfs.3174 for further information) Output file Angstrom-systemd-image-eglibc-ipk-v2012.02-core-beagleboard.rootfs.tar.bz2 already exists. A quick look suggests at least bz2 and xz images can't get rebuilt. Issues with cpio.lzma as well: | ln: failed to create symbolic link `/oe/oe-core/build/tmp-eglibc/deploy/images/initramfs-kexecboot-klibc-image-poodle.cpio.lzma': File exists Looking at run.do_rootfs I see runimagecmd is called twice. In the log.do_rootfs there is also a strange + sed sERROR: Function failed: do_rootfs (see /oe/oe-core/build/tmp-eglibc/work/poodle-oe-linux-gnueabi/initramfs-kexecboot-klibc-image-1.0-r0/temp/log.do_rootfs.31195 for further information) /generic_//g Regards Andrea regards, Koen ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] image_types: Refactor compression code into a generic compression solution
On Tue, Feb 28, 2012 at 20:41, Andrea Adami andrea.ad...@gmail.com wrote: | ln: failed to create symbolic link `/oe/oe-core/build/tmp-eglibc/deploy/images/initramfs-kexecboot-klibc-image-poodle.cpio.lzma': File exists Looking at run.do_rootfs I see runimagecmd is called twice. In the log.do_rootfs there is also a strange I found many issues with shell variable expanding in current bitbake; I described the issue in #yocto but it seems I am the only one to have those problems. Basically it seems: export FOO=bar Parses fine but /don't work/. export FOO=bar Works. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] bootimg.bbclass: Quoting fixes
From: Elizabeth Flanagan elizabeth.flana...@intel.com
More quoting issues during an fri build. Fixing as per standard.
Signed-off-by: Elizabeth Flanagan elizabeth.flana...@intel.com
---
meta/classes/bootimg.bbclass |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 1d1a3d0..dd37034 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -35,8 +35,8 @@ ISODIR = ${S}/iso
BOOTIMG_VOLUME_ID ?= boot
BOOTIMG_EXTRA_SPACE ?= 512
-EFI = ${@base_contains(MACHINE_FEATURES, efi, 1, 0, d)}
-EFI_CLASS = ${@base_contains(MACHINE_FEATURES, efi, grub-efi, dummy,
d)}
+EFI = '${@base_contains(MACHINE_FEATURES, efi, 1, 0, d)}'
+EFI_CLASS = '${@base_contains(MACHINE_FEATURES, efi, grub-efi, dummy,
d)}'
# Include legacy boot if MACHINE_FEATURES includes pcbios or if it does not
# contain efi. This way legacy is supported by default if neither is
@@ -52,8 +52,8 @@ def pcbios_class(d):
return syslinux
return dummy
-PCBIOS = ${@pcbios(d)}
-PCBIOS_CLASS = ${@pcbios_class(d)}
+PCBIOS = '${@pcbios(d)}'
+PCBIOS_CLASS = '${@pcbios_class(d)}'
inherit ${PCBIOS_CLASS}
inherit ${EFI_CLASS}
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Quote fixes.
I found these ParseError quoting issues in the fri2 layer. I fixed other quoting issues in the class while I was there. The following changes since commit d86e3082e695cde555df276a2436873fa5381130: licenses.conf: fix quotting of SRC_DISTRIBUTE_LICENSES (2012-02-28 17:51:52 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib eflanagan/quote_fixes http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/quote_fixes Elizabeth Flanagan (1): bootimg.bbclass: Quoting fixes meta/classes/bootimg.bbclass |8 1 files changed, 4 insertions(+), 4 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] image_types: Refactor compression code into a generic compression solution
On Wed, Feb 29, 2012 at 12:48 AM, Otavio Salvador ota...@ossystems.com.br wrote: On Tue, Feb 28, 2012 at 20:41, Andrea Adami andrea.ad...@gmail.com wrote: | ln: failed to create symbolic link `/oe/oe-core/build/tmp-eglibc/deploy/images/initramfs-kexecboot-klibc-image-poodle.cpio.lzma': File exists Looking at run.do_rootfs I see runimagecmd is called twice. Note that I set INITRAMFS_FSTYPES ?= cpio.gz cpio.lzma If I only have one single fstype (cpio.lzma) all is fine. Cheers Andrea In the log.do_rootfs there is also a strange I found many issues with shell variable expanding in current bitbake; I described the issue in #yocto but it seems I am the only one to have those problems. Basically it seems: export FOO=bar Parses fine but /don't work/. export FOO=bar Works. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] bootimg.bbclass: Quoting fixes
On Tue, Feb 28, 2012 at 21:23, Beth Flanagan elizabeth.flana...@intel.com wrote: More quoting issues during an fri build. Fixing as per standard. Already done by Saul :) -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] initscripts: Create the volatiles cache atomically.
If a machine loses power while building the volatiles cache, it will
continue to operate with an incomplete set of volatiles. Fix this by
updating atomically.
Signed-off-by: James Limbouris ja...@digitalmatter.com.au
---
.../initscripts-1.0/populate-volatile.sh | 10 ++
meta/recipes-core/initscripts/initscripts_1.0.bb |2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
index 1813fd1..4a99aff 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -22,7 +22,7 @@ create_file() {
chown ${TUSER}.${TGROUP} $1 || echo \Failed to set owner -${TUSER}-
for -$1-.\ /dev/tty0 21;
chmod ${TMODE} $1 || echo \Failed to set mode -${TMODE}- for -$1-.\
/dev/tty0 21
- test $VOLATILE_ENABLE_CACHE = yes echo $EXEC
/etc/volatile.cache
+ test $VOLATILE_ENABLE_CACHE = yes echo $EXEC
/etc/volatile.cache.build
[ -e $1 ] {
[ ${VERBOSE} != no ] echo Target already exists. Skipping.
@@ -37,7 +37,7 @@ mk_dir() {
chown ${TUSER}.${TGROUP} $1 || echo \Failed to set owner -${TUSER}-
for -$1-.\ /dev/tty0 21;
chmod ${TMODE} $1 || echo \Failed to set mode -${TMODE}- for -$1-.\
/dev/tty0 21
- test $VOLATILE_ENABLE_CACHE = yes echo $EXEC
/etc/volatile.cache
+ test $VOLATILE_ENABLE_CACHE = yes echo $EXEC
/etc/volatile.cache.build
[ -e $1 ] {
[ ${VERBOSE} != no ] echo Target already exists. Skipping.
@@ -49,7 +49,7 @@ mk_dir() {
link_file() {
EXEC=test -e \$2\ -o -L $2 || ln -s \$1\ \$2\ /dev/tty0 21
- test $VOLATILE_ENABLE_CACHE = yes echo$EXEC
/etc/volatile.cache
+ test $VOLATILE_ENABLE_CACHE = yes echo$EXEC
/etc/volatile.cache.build
[ -e $2 ] {
echo Cannot create link over existing -${TNAME}-. 2
@@ -185,10 +185,12 @@ if test -e /etc/volatile.cache -a
$VOLATILE_ENABLE_CACHE = yes -a x$1 !=
then
sh /etc/volatile.cache
else
- rm -f /etc/volatile.cache
+ rm -f /etc/volatile.cache /etc/volatile.cache.build
for file in `ls -1 ${CFGDIR} | sort`; do
apply_cfgfile ${CFGDIR}/${file}
done
+
+ [ -e /etc/volatile.cache.build ] sync mv
/etc/volatile.cache.build /etc/volatile.cache
fi
if test -f /etc/ld.so.cache -a ! -f /var/run/ld.so.cache
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb
b/meta/recipes-core/initscripts/initscripts_1.0.bb
index e16f19f..68701ce 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = Initscripts provide the basic system startup
initialization scrip
SECTION = base
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe
-PR = r131
+PR = r132
INHIBIT_DEFAULT_DEPS = 1
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] psuedo-native strangeness on 64 bit build machine
I did a clean build on an Ubuntu 64 bit build machine a couple of days ago with no issues. After a pull of today I did an image build for an OMAP3 machine and encountered an issue with psuedo-native. First I got this familiar message: Pseudo is not present but is required, building this first before the main build which seemed a bit strange since pseudo was built in the previous clean build. The build proceeded until task 75 and then failed with the following error: NOTE: Running task 75 of 77 (ID: 6, virtual:native:/home/steve/source/yocto/poky/meta/recipes-devtools/pseudo/pseudo_1.2.bb, do_compile) NOTE: package pseudo-native-1.2-r5: task do_compile: Started ERROR: Function failed: do_compile (see /media/data/yocto/tmp/work/x86_64-linux/pseudo-native-1.2-r5/temp/log.do_compile.32657 for further information) ERROR: Logfile of failure stored in: /media/data/yocto/tmp/work/x86_64-linux/pseudo-native-1.2-r5/temp/log.do_compile.32657 Log data follows: | ERROR: Function failed: do_compile (see /media/data/yocto/tmp/work/x86_64-linux/pseudo-native-1.2-r5/temp/log.do_compile.32657 for further information) | SQLite header for version 3007010 found. | NOTE: make -j 4 -e MAKEFLAGS= libpseudo | ccache gcc -isystem/media/data/yocto/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -pipe -std=gnu99 -Wall -W -Wextra -fPIC -D_LARGEFILE64_SOURCE -D_ATFILE_SOURCE -m32 -DPSEUDO_PREFIX='/media/data/yocto/tmp/sysroots/x86_64-linux/usr' -DPSEUDO_SUFFIX='' -DPSEUDO_BINDIR='bin' -DPSEUDO_LIBDIR='lib/pseudo/lib' -DPSEUDO_LOCALSTATEDIR='var/pseudo' -DPSEUDO_VERSION='1.2' -O2 -g -L/media/data/yocto/tmp/sysroots/x86_64-linux/usr/lib -I/media/data/yocto/tmp/sysroots/x86_64-linux/usr/include -Wl,-R/media/data/yocto/tmp/sysroots/x86_64-linux/usr/lib -shared -o lib/pseudo/lib/libpseudo.so \ | pseudo_client.o pseudo_ipc.o \ | pseudo_wrappers.o pseudo_tables.o pseudo_util.o -ldl -lpthread | /usr/bin/ld: i386:x86-64 architecture of input file `pseudo_client.o' is incompatible with i386 output | /usr/bin/ld: i386:x86-64 architecture of input file `pseudo_ipc.o' is incompatible with i386 output | /usr/bin/ld: i386:x86-64 architecture of input file `pseudo_wrappers.o' is incompatible with i386 output | /usr/bin/ld: i386:x86-64 architecture of input file `pseudo_tables.o' is incompatible with i386 output | /usr/bin/ld: i386:x86-64 architecture of input file `pseudo_util.o' is incompatible with i386 output | /usr/bin/ld: final link failed: Invalid operation | collect2: ld returned 1 exit status | make: *** [lib/pseudo/lib/libpseudo.so] Error 1 | ERROR: oe_runmake failed NOTE: package pseudo-native-1.2-r5: task do_compile: Failed ERROR: Task 6 (virtual:native:/home/steve/source/yocto/poky/meta/recipes-devtools/pseudo/pseudo_1.2.bb, do_compile) failed with exit code '1' NOTE: Tasks Summary: Attempted 75 tasks of which 74 didn't need to be rerun and 1 failed. Summary: 1 task failed: virtual:native:/home/steve/source/yocto/poky/meta/recipes-devtools/pseudo/pseudo_1.2.bb, do_compile Summary: There was 1 ERROR message shown, returning a non-zero exit code. Has anyone else been successful building on 64 bit machines? I see no issues on my 32 bit build machines. Forcing a clean build of pseudo (by hand, since -c cleansstate obviously won't work with pseudo-native!) resulted in a good build, both of psuedo-native and the image. Any ideas? Steve ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] psuedo-native strangeness on 64 bit build machine
On 2/28/12 10:35 PM, Steve Sakoman wrote: I did a clean build on an Ubuntu 64 bit build machine a couple of days ago with no issues. After a pull of today I did an image build for an OMAP3 machine and encountered an issue with psuedo-native. First I got this familiar message: Pseudo is not present but is required, building this first before the main build which seemed a bit strange since pseudo was built in the previous clean build. The build proceeded until task 75 and then failed with the following error: NOTE: Running task 75 of 77 (ID: 6, virtual:native:/home/steve/source/yocto/poky/meta/recipes-devtools/pseudo/pseudo_1.2.bb, do_compile) NOTE: package pseudo-native-1.2-r5: task do_compile: Started ERROR: Function failed: do_compile (see /media/data/yocto/tmp/work/x86_64-linux/pseudo-native-1.2-r5/temp/log.do_compile.32657 for further information) ERROR: Logfile of failure stored in: /media/data/yocto/tmp/work/x86_64-linux/pseudo-native-1.2-r5/temp/log.do_compile.32657 Log data follows: | ERROR: Function failed: do_compile (see /media/data/yocto/tmp/work/x86_64-linux/pseudo-native-1.2-r5/temp/log.do_compile.32657 for further information) | SQLite header for version 3007010 found. | NOTE: make -j 4 -e MAKEFLAGS= libpseudo | ccache gcc -isystem/media/data/yocto/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -pipe -std=gnu99 -Wall -W -Wextra -fPIC -D_LARGEFILE64_SOURCE -D_ATFILE_SOURCE -m32 -DPSEUDO_PREFIX='/media/data/yocto/tmp/sysroots/x86_64-linux/usr' -DPSEUDO_SUFFIX='' -DPSEUDO_BINDIR='bin' -DPSEUDO_LIBDIR='lib/pseudo/lib' -DPSEUDO_LOCALSTATEDIR='var/pseudo' -DPSEUDO_VERSION='1.2' -O2 -g -L/media/data/yocto/tmp/sysroots/x86_64-linux/usr/lib -I/media/data/yocto/tmp/sysroots/x86_64-linux/usr/include -Wl,-R/media/data/yocto/tmp/sysroots/x86_64-linux/usr/lib -shared -o lib/pseudo/lib/libpseudo.so \ | pseudo_client.o pseudo_ipc.o \ | pseudo_wrappers.o pseudo_tables.o pseudo_util.o -ldl -lpthread | /usr/bin/ld: i386:x86-64 architecture of input file `pseudo_client.o' is incompatible with i386 output | /usr/bin/ld: i386:x86-64 architecture of input file `pseudo_ipc.o' is incompatible with i386 output | /usr/bin/ld: i386:x86-64 architecture of input file `pseudo_wrappers.o' is incompatible with i386 output | /usr/bin/ld: i386:x86-64 architecture of input file `pseudo_tables.o' is incompatible with i386 output | /usr/bin/ld: i386:x86-64 architecture of input file `pseudo_util.o' is incompatible with i386 output | /usr/bin/ld: final link failed: Invalid operation | collect2: ld returned 1 exit status | make: *** [lib/pseudo/lib/libpseudo.so] Error 1 | ERROR: oe_runmake failed NOTE: package pseudo-native-1.2-r5: task do_compile: Failed ERROR: Task 6 (virtual:native:/home/steve/source/yocto/poky/meta/recipes-devtools/pseudo/pseudo_1.2.bb, do_compile) failed with exit code '1' NOTE: Tasks Summary: Attempted 75 tasks of which 74 didn't need to be rerun and 1 failed. Summary: 1 task failed: virtual:native:/home/steve/source/yocto/poky/meta/recipes-devtools/pseudo/pseudo_1.2.bb, do_compile Summary: There was 1 ERROR message shown, returning a non-zero exit code. Has anyone else been successful building on 64 bit machines? I'm building pseudo on 64-bit machines right now, no problem. The error you are seeing is pseudo attempting to build both a 64-bit and a 32-bit wrapper. The 32-bit wrapper is built when the recipe detects support for both 32-bit and 64-bit userspace. It does this by looking first that your host is 64-bit, and then for /usr/include/gnu/stubs-32.h. Assuming it finds those, it assumes your system has 32-bit binaries on it. To avoid a 32-bit build of pseudo, on a 64-bit machine. You need to set NO32LIBS = 1. This instructs pseudo to avoid the 32-bit binary build. (If your machine has 32-bit binaries on it, you need to fix your compiler to allow for 32-bit userspace builds, otherwise pseudo will be incapable of wrapping any 32-bit binaries, resulting in a potential mismatch of user, groups and modes set by any 32-bit applications. --Mark I see no issues on my 32 bit build machines. Forcing a clean build of pseudo (by hand, since -c cleansstate obviously won't work with pseudo-native!) resulted in a good build, both of psuedo-native and the image. Any ideas? Steve ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] psuedo-native strangeness on 64 bit build machine
On Tue, Feb 28, 2012 at 9:13 PM, Mark Hatle mark.ha...@windriver.com wrote: I'm building pseudo on 64-bit machines right now, no problem. The error you are seeing is pseudo attempting to build both a 64-bit and a 32-bit wrapper. The 32-bit wrapper is built when the recipe detects support for both 32-bit and 64-bit userspace. It does this by looking first that your host is 64-bit, and then for /usr/include/gnu/stubs-32.h. Assuming it finds those, it assumes your system has 32-bit binaries on it. Thanks for the quick reply. My 64 bit build machine has the ia32-libs package installed and /usr/include/gnu/stubs-32.h exists. Any idea why the initial clean build succeeds, but the rebuild triggered by the pull fails? To avoid a 32-bit build of pseudo, on a 64-bit machine. You need to set NO32LIBS = 1. This instructs pseudo to avoid the 32-bit binary build. (If your machine has 32-bit binaries on it, you need to fix your compiler to allow for 32-bit userspace builds, otherwise pseudo will be incapable of wrapping any 32-bit binaries, resulting in a potential mismatch of user, groups and modes set by any 32-bit applications. Could you give me a pointer on how to fix my compiler to allow for 32-bit userspace builds? Thanks! Steve ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] initscripts: Make /etc/timestamp consistent again.
Hi,
I think we need to add BUSYBOX_CONFIG_FEATURE_TEST_64 to the busybox defconfig
after this patch.
On my build (which had neither BUSYBOX_CONFIG_FEATURE_TEST_64 nor
BUSYBOX_CONFIG_EXPR_MATH_SUPPORT_64) I was getting 'out of range' errors.
Regards
James Limbouris
-Original Message-
From: openembedded-core-boun...@lists.openembedded.org
[mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf
Of Saul Wold
Sent: Saturday, 25 February 2012 2:31 AM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH] initscripts: Make /etc/timestamp consistent
again.
On 02/10/2012 08:16 AM, Gary Thomas wrote:
Commit cc8695 changed the way timestamps were handled
and added some extra munging to be able to compare them
reliably. This change makes the timestamp value the same
everywhere and simplifies how the check to set the system
clock based on the timestamp is done.
Also, if the value stored in /etc/timestamp is newer
[at all] than the current system time, set the system clock
from the stored value, down to the minute, not just the day.
Signed-off-by: Gary Thomasg...@mlbassoc.com
---
.../initscripts/initscripts-1.0/bootmisc.sh|4 ++--
.../initscripts/initscripts-1.0/save-rtc.sh|2 +-
meta/recipes-core/initscripts/initscripts_1.0.bb |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
index d9e8ffa..20ec0a0 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
@@ -68,9 +68,9 @@ fi
/etc/init.d/hwclock.sh start
if test -e /etc/timestamp
then
- SYSTEMDATE=`date -u +%4Y%2m%2d`
+ SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M`
read TIMESTAMP /etc/timestamp
- if [ ${TIMESTAMP#}${TIMESTAMP%} -gt
$SYSTEMDATE ]; then
+ if [ ${TIMESTAMP} -gt $SYSTEMDATE ]; then
date -u $TIMESTAMP
/etc/init.d/hwclock.sh stop
fi
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
index 3d8e850..1f804e2 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
@@ -10,4 +10,4 @@
### END INIT INFO
# Update the timestamp
-date -u +%2m%2d%2H%2M%4Y /etc/timestamp
+date -u +%4Y%2m%2d%2H%2M /etc/timestamp
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb
b/meta/recipes-
core/initscripts/initscripts_1.0.bb
index 203c605..b56c55c 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = Initscripts provide the basic system
startup initialization scrip
SECTION = base
LICENSE = GPLv2
LIC_FILES_CHKSUM =
file://COPYING;md5=751419260aa954499f7abaabaa882bbe
-PR = r129
+PR = r130
INHIBIT_DEFAULT_DEPS = 1
Merged into OE-core
Thanks
Sau!
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] psuedo-native strangeness on 64 bit build machine
On 2/28/12 11:29 PM, Steve Sakoman wrote: On Tue, Feb 28, 2012 at 9:13 PM, Mark Hatlemark.ha...@windriver.com wrote: I'm building pseudo on 64-bit machines right now, no problem. The error you are seeing is pseudo attempting to build both a 64-bit and a 32-bit wrapper. The 32-bit wrapper is built when the recipe detects support for both 32-bit and 64-bit userspace. It does this by looking first that your host is 64-bit, and then for /usr/include/gnu/stubs-32.h. Assuming it finds those, it assumes your system has 32-bit binaries on it. Thanks for the quick reply. My 64 bit build machine has the ia32-libs package installed and /usr/include/gnu/stubs-32.h exists. Any idea why the initial clean build succeeds, but the rebuild triggered by the pull fails? To avoid a 32-bit build of pseudo, on a 64-bit machine. You need to set NO32LIBS = 1. This instructs pseudo to avoid the 32-bit binary build. (If your machine has 32-bit binaries on it, you need to fix your compiler to allow for 32-bit userspace builds, otherwise pseudo will be incapable of wrapping any 32-bit binaries, resulting in a potential mismatch of user, groups and modes set by any 32-bit applications. Could you give me a pointer on how to fix my compiler to allow for 32-bit userspace builds? I don't use Ubuntu much, and when I do, it's only with 64-bit binaries. (Fedora and RHEL I often use with mixed size systems...) Most distributions have a 32-bit devel package, or set of packages. I assume ubuntu does as well. (I've recently been doing a lot of builds on 64-bit Mint 12.) A quick google found me some references to: glibc-devel-32bit, gcc-32bit You might want to try apt-get those and see if that will work. Under the hood, you'll need the 32-bit glibc development files, and libgcc. Once you have that, I believe pseudo will build both 32-bit and 64-bit properly. --Mark Thanks! Steve ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] Pending patches from O.S. Systems' tree
The following changes since commit 61216d2743502ef38955054aad6a4f2ed63e6d43: licenses.conf: fix quotting of SRC_DISTRIBUTE_LICENSES (2012-02-28 17:51:42 +) are available in the git repository at: git://github.com/OSSystems/oe-core master https://github.com/OSSystems/oe-core/tree/HEAD Otavio Salvador (3): image.bbclass: do not create image manifest link if IMAGE_LINK_NAME is empty image_types.bbclass: properly support IMAGE_LINK_NAME as empty image_types.bbclass: fix bzip2 and xz compression commands meta/classes/image.bbclass |6 -- meta/classes/image_types.bbclass | 18 +++--- 2 files changed, 15 insertions(+), 9 deletions(-) -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] image.bbclass: do not create image manifest link if IMAGE_LINK_NAME is empty
Signed-off-by: Otavio Salvador ota...@ossystems.com.br
---
meta/classes/image.bbclass |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 4db55ff..ec75cc1 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -322,8 +322,10 @@ make_zimage_symlink_relative () {
write_image_manifest () {
rootfs_${IMAGE_PKGTYPE}_write_manifest
- rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest
-ln -s ${IMAGE_NAME}.rootfs.manifest
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest
+ if [ -n ${IMAGE_LINK_NAME} ]; then
+ rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest
+ ln -s ${IMAGE_NAME}.rootfs.manifest
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest
+ fi
}
# Make login manager(s) enable automatic login.
--
1.7.2.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] image_types.bbclass: properly support IMAGE_LINK_NAME as empty
Signed-off-by: Otavio Salvador ota...@ossystems.com.br
---
meta/classes/image_types.bbclass | 14 +-
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 74071c1..f9ed49f 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -25,7 +25,9 @@ def get_imagecmds(d):
types.append(ext3)
types.remove(live)
-cmds += rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.*
+if len(d.getVar('IMAGE_LINK_NAME', True)) 0:
+cmds += rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.*
+
for type in types:
ccmd = []
subimages = []
@@ -55,10 +57,12 @@ runimagecmd () {
# Now create the needed compressed versions
cd ${DEPLOY_DIR_IMAGE}/
${ccmd}
- # And create the symlinks
-for type in ${subimages}; do
- ln -s ${IMAGE_NAME}.rootfs.$type
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type
- done
+# And create the symlinks
+if [ -n ${IMAGE_LINK_NAME} ]; then
+for type in ${subimages}; do
+ln -s ${IMAGE_NAME}.rootfs.$type
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type
+done
+fi
}
def imagetypes_getdepends(d):
--
1.7.2.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] image_types.bbclass: fix bzip2 and xz compression commands
We need to use -f (force) or the command fails in the image file
already exists.
Signed-off-by: Otavio Salvador ota...@ossystems.com.br
---
meta/classes/image_types.bbclass |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index f9ed49f..0c25a92 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -188,8 +188,8 @@ IMAGE_TYPES = jffs2 sum.jffs2 cramfs ext2 ext2.gz ext2.bz2
ext3 ext3.gz ext2.lz
COMPRESSIONTYPES = gz bz2 lzma xz
COMPRESS_CMD_lzma = lzma -k -f -7 ${IMAGE_NAME}.rootfs.${type}
COMPRESS_CMD_gz = gzip -f -9 -c ${IMAGE_NAME}.rootfs.${type}
${IMAGE_NAME}.rootfs.${type}.gz
-COMPRESS_CMD_bz2 = bzip2 -k ${IMAGE_NAME}.rootfs.${type}
-COMPRESS_CMD_xz = xz -k -c ${XZ_COMPRESSION_LEVEL}
--check=${XZ_INTEGRITY_CHECK} ${IMAGE_NAME}.rootfs.${type}
+COMPRESS_CMD_bz2 = bzip2 -f -k ${IMAGE_NAME}.rootfs.${type}
+COMPRESS_CMD_xz = xz -f -k -c ${XZ_COMPRESSION_LEVEL}
--check=${XZ_INTEGRITY_CHECK} ${IMAGE_NAME}.rootfs.${type}
COMPRESS_DEPENDS_lzma = xz-native
COMPRESS_DEPENDS_gz =
COMPRESS_DEPENDS_bz2 =
--
1.7.2.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] syslinux: fix packaging of ${PN} and ${PN}-staticdev
- ${PN} where not being build due ordering;
- ${PN}-staticdev lacked the ${libdir} files.
Signed-off-by: Otavio Salvador ota...@ossystems.com.br
---
meta/recipes-devtools/syslinux/syslinux_4.03.bb |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/syslinux/syslinux_4.03.bb
b/meta/recipes-devtools/syslinux/syslinux_4.03.bb
index 823465c..2ab6878 100644
--- a/meta/recipes-devtools/syslinux/syslinux_4.03.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_4.03.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
# If you really want to run syslinux, you need mtools. We just want the
# ldlinux.* stuff for now, so skip mtools-native
DEPENDS = nasm-native
-PR = r5
+PR = r6
SRC_URI =
${KERNELORG_MIRROR}/linux/utils/boot/syslinux/4.xx/syslinux-${PV}.tar.bz2 \
file://cross-build.patch
@@ -46,7 +46,7 @@ do_install() {
install -m 644 ${S}/core/ldlinux.bss ${D}${libdir}/syslinux/
}
-PACKAGES =+ ${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux
${PN}-isolinux ${PN}-misc
+PACKAGES += ${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux
${PN}-isolinux ${PN}-misc
RDEPENDS_${PN} += mtools
@@ -57,7 +57,7 @@ FILES_${PN}-chain = ${libdir}/${PN}/chain.c32
FILES_${PN}-isolinux = ${libdir}/${PN}/isolinux.bin
FILES_${PN}-pxelinux = ${libdir}/${PN}/pxelinux.0
FILES_${PN}-dev += ${datadir}/${PN}/com32/lib*${SOLIBS}
${datadir}/${PN}/com32/include ${datadir}/${PN}/com32/com32.ld
-FILES_${PN}-staticdev += ${datadir}/${PN}/com32/lib*.a
+FILES_${PN}-staticdev += ${datadir}/${PN}/com32/lib*.a
${libdir}/${PN}/com32/lib*.a
FILES_${PN}-misc = ${libdir}/${PN}/* ${bindir}/*
BBCLASSEXTEND = native
--
1.7.2.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] initscripts: Make /etc/timestamp consistent again.
Also, CONFIG_FEATURE_DATE_COMPAT=y has to be removed - it mungs the
MMddhhmm string into hhmmMMdd !
-Original Message-
From: James Limbouris
Sent: Wednesday, 29 February 2012 1:32 PM
To: Patches and discussions about the oe-core layer
Subject: RE: [OE-core] [PATCH] initscripts: Make /etc/timestamp consistent
again.
Hi,
I think we need to add BUSYBOX_CONFIG_FEATURE_TEST_64 to the
busybox defconfig after this patch.
On my build (which had neither BUSYBOX_CONFIG_FEATURE_TEST_64 nor
BUSYBOX_CONFIG_EXPR_MATH_SUPPORT_64) I was getting 'out of range'
errors.
Regards
James Limbouris
-Original Message-
From: openembedded-core-boun...@lists.openembedded.org
[mailto:openembedded-core-boun...@lists.openembedded.org] On
Behalf
Of Saul Wold
Sent: Saturday, 25 February 2012 2:31 AM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH] initscripts: Make /etc/timestamp consistent
again.
On 02/10/2012 08:16 AM, Gary Thomas wrote:
Commit cc8695 changed the way timestamps were handled
and added some extra munging to be able to compare them
reliably. This change makes the timestamp value the same
everywhere and simplifies how the check to set the system
clock based on the timestamp is done.
Also, if the value stored in /etc/timestamp is newer
[at all] than the current system time, set the system clock
from the stored value, down to the minute, not just the day.
Signed-off-by: Gary Thomasg...@mlbassoc.com
---
.../initscripts/initscripts-1.0/bootmisc.sh|4 ++--
.../initscripts/initscripts-1.0/save-rtc.sh|2 +-
meta/recipes-core/initscripts/initscripts_1.0.bb |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
index d9e8ffa..20ec0a0 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
@@ -68,9 +68,9 @@ fi
/etc/init.d/hwclock.sh start
if test -e /etc/timestamp
then
- SYSTEMDATE=`date -u +%4Y%2m%2d`
+ SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M`
read TIMESTAMP /etc/timestamp
- if [ ${TIMESTAMP#}${TIMESTAMP%} -gt
$SYSTEMDATE ]; then
+ if [ ${TIMESTAMP} -gt $SYSTEMDATE ]; then
date -u $TIMESTAMP
/etc/init.d/hwclock.sh stop
fi
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
index 3d8e850..1f804e2 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
@@ -10,4 +10,4 @@
### END INIT INFO
# Update the timestamp
-date -u +%2m%2d%2H%2M%4Y /etc/timestamp
+date -u +%4Y%2m%2d%2H%2M /etc/timestamp
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb
b/meta/recipes-
core/initscripts/initscripts_1.0.bb
index 203c605..b56c55c 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = Initscripts provide the basic system
startup initialization scrip
SECTION = base
LICENSE = GPLv2
LIC_FILES_CHKSUM =
file://COPYING;md5=751419260aa954499f7abaabaa882bbe
-PR = r129
+PR = r130
INHIBIT_DEFAULT_DEPS = 1
Merged into OE-core
Thanks
Sau!
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] busybox: Enable 64 bit shell tests, and disable non-standard date format interpretation.
Without 64 bit shell tests, the timestamp comparison in initscripts' bootmisc.sh throws 'out of range' errors. With CONFIG_FEATURE_DATE_COMPAT, date reads the MMddhhmm string as hhmmMMdd when setting the time from the timestamp in bootmisc.sh. Signed-off-by: James Limbouris ja...@digitalmatter.com.au --- meta/recipes-core/busybox/busybox-1.19.3/defconfig |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/busybox/busybox-1.19.3/defconfig b/meta/recipes-core/busybox/busybox-1.19.3/defconfig index fa9c078..ca49671 100644 --- a/meta/recipes-core/busybox/busybox-1.19.3/defconfig +++ b/meta/recipes-core/busybox/busybox-1.19.3/defconfig @@ -172,11 +172,11 @@ CONFIG_CAT=y CONFIG_DATE=y # CONFIG_FEATURE_DATE_ISOFMT is not set # CONFIG_FEATURE_DATE_NANO is not set -CONFIG_FEATURE_DATE_COMPAT=y +# CONFIG_FEATURE_DATE_COMPAT is not set CONFIG_ID=y CONFIG_GROUPS=y CONFIG_TEST=y -# CONFIG_FEATURE_TEST_64 is not set +CONFIG_FEATURE_TEST_64=y CONFIG_TOUCH=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
