[OE-core] [for-denzil 1/3] bitbake: command: add error to return of runCommand
From: Christopher Larson
Currently, command.py can return an error message from runCommand, due to
being unable to run the command, yet few of our UIs (just hob) can handle it
today. This can result in seeing a TypeError with traceback in certain rare
circumstances.
To resolve this, we need a clean way to get errors back from runCommand,
without having to isinstance() the return value. This implements such a thing
by making runCommand also return an error (or None if no error occurred).
As runCommand now has a method of returning errors, we can also alter the
getCmdLineAction bits such that the returned value is just the action, not an
additional message. If a sync command wants to return an error, it raises
CommandError(message), and the message will be passed to the caller
appropriately.
Example Usage:
result, error = server.runCommand(...)
if error:
log.error('Unable to run command: %s' % error)
return 1
(Bitbake rev: 717831b8315cb3904d9b590e633000bc897e8fb6)
Signed-off-by: Christopher Larson
Signed-off-by: Richard Purdie
---
bitbake/lib/bb/command.py | 43 +++--
bitbake/lib/bb/server/process.py|2 +-
bitbake/lib/bb/ui/crumbs/hobeventhandler.py |5 ++-
bitbake/lib/bb/ui/depexp.py | 38 ++
bitbake/lib/bb/ui/goggle.py | 17 +-
bitbake/lib/bb/ui/knotty.py | 45 ++-
bitbake/lib/bb/ui/ncurses.py| 21 -
7 files changed, 112 insertions(+), 59 deletions(-)
diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py
index fd8912a..00b854e 100644
--- a/bitbake/lib/bb/command.py
+++ b/bitbake/lib/bb/command.py
@@ -44,6 +44,9 @@ class CommandFailed(CommandExit):
self.error = message
CommandExit.__init__(self, 1)
+class CommandError(Exception):
+pass
+
class Command:
"""
A queue of asynchronous commands for bitbake
@@ -57,21 +60,25 @@ class Command:
self.currentAsyncCommand = None
def runCommand(self, commandline):
-try:
-command = commandline.pop(0)
-if command in CommandsSync.__dict__:
-# Can run synchronous commands straight away
-return getattr(CommandsSync, command)(self.cmds_sync, self,
commandline)
-if self.currentAsyncCommand is not None:
-return "Busy (%s in progress)" % self.currentAsyncCommand[0]
-if command not in CommandsAsync.__dict__:
-return "No such command"
-self.currentAsyncCommand = (command, commandline)
-self.cooker.server_registration_cb(self.cooker.runCommands,
self.cooker)
-return True
-except:
-import traceback
-return traceback.format_exc()
+command = commandline.pop(0)
+if hasattr(CommandsSync, command):
+# Can run synchronous commands straight away
+command_method = getattr(self.cmds_sync, command)
+try:
+result = command_method(self, commandline)
+except CommandError as exc:
+return None, exc.args[0]
+except Exception:
+return None, traceback.format_exc()
+else:
+return result, None
+if self.currentAsyncCommand is not None:
+return None, "Busy (%s in progress)" % self.currentAsyncCommand[0]
+if command not in CommandsAsync.__dict__:
+return None, "No such command"
+self.currentAsyncCommand = (command, commandline)
+self.cooker.server_registration_cb(self.cooker.runCommands,
self.cooker)
+return True, None
def runAsyncCommand(self):
try:
@@ -139,7 +146,11 @@ class CommandsSync:
"""
Get any command parsed from the commandline
"""
-return command.cooker.commandlineAction
+cmd_action = command.cooker.commandlineAction
+if cmd_action['msg']:
+raise CommandError(msg)
+else:
+return cmd_action['action']
def getVariable(self, command, params):
"""
diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py
index ba91336..3ae9ede 100644
--- a/bitbake/lib/bb/server/process.py
+++ b/bitbake/lib/bb/server/process.py
@@ -48,7 +48,7 @@ class ServerCommunicator():
if self.connection.poll(.5):
return self.connection.recv()
else:
-return None
+return None, "Timeout while attempting to communicate with
bitbake server"
except KeyboardInterrupt:
pass
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index 52acec1..21bea23 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/bitbake/lib/bb/ui/crumbs/ho
Re: [OE-core] split mtd-utils
Along the lines of the oe classic patch I propose to split as follows: mtd-utils-jffs2 package containing jffs2dump jffs2reader mkfs.jffs2 mtd-utils-ubifs package containing: mkfs.ubifs ubiattach ubicrc32 ubidetach ubiformat ubimkvol ubinfo ubinize ubirename ubirmvol ubirsvol ubiupdatevol mtd-utils package containing: docfdisk doc_loadbios flashcp flash_erase flash_eraseall flash_lock flash_otp_dump flash_otp_info flash_unlock ftl_check ftl_format mtd_debug mtdinfo nanddump nandtest nandwrite nftldump nftl_format recv_image rfddump rfdformat serve_image sumtool Or do we need to make additional packages (like e.g. for (n)tfl ) Best regards, Frans 2013/1/10 Frans Meulenbroeks > Cool, I'll have a peek at the oe classic recipe and give it a stab along > the same spirit. > > Best regards, Frans > > > 2013/1/10 Andrea Adami > >> On Wed, Jan 9, 2013 at 6:17 PM, Richard Purdie >> wrote: >> > On Wed, 2013-01-09 at 17:12 +0100, Frans Meulenbroeks wrote: >> >> As I am involved in embedded systems where flash is somewhat sparse >> >> I'm always eager to save a few bytes where possible. >> >> >> >> Today I noticed that mtd-utils (1.5.0 from danny) generates for my >> >> architecture (powerpc) roughly 780k of binaries in usr/sbin. 423k of >> >> it is due to ubifs related files. >> >> >> >> Would it be desired to put this in a separate package? >> >> >> >> e.g. mtd-utils-ubi and mtd-utils-nonubi with mtd-utils itself being >> >> empty but rdepend on those two? >> >> that way mtd-utils will still give all packages but those only wanting >> >> the non ubi stuff can limit themselves to that. >> >> >> >> If desired I can give this a stab. >> > >> > Sounds like a sensible split to me... >> > >> > Cheers, >> > >> > Richard >> > >> > >> > >> > ___ >> > Openembedded-core mailing list >> > Openembedded-core@lists.openembedded.org >> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >> >> OE-Classic already has one packaging split: >> PACKAGES =+ "mkfs-jffs2 mkfs-ubifs >> >> Recently I faced this same issue: for ubiattach we have to install >> full mtd-utils (>700KiB) >> FYI there is a recipe for ubi-utils-klibc for more extreme size >> optimization. >> >> >> http://cgit.openembedded.org/meta-openembedded/tree/meta-initramfs/recipes-devtools/mtd >> >> Cheers >> >> Andrea >> > > ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] split mtd-utils
2013/1/11 Eric Bénard > Hi Frans, > > [...] > IIRC sumtol is used for jffs2 images (to create the erase block > summary) so that may better fit into mtd-utils-jffs2 > > Also, nftl* rfd* doc* ftl* serve_image may go into a separate packate > (mtd-utils-misc ?) as I believe those tools are not very usefull in > most configurations using mtd with nowadays's flashs. > > Eric > Hi Eric, Thanks for the feedback. I'm not into the details of all tools in the package (I typically only use the flash* mtd* and jffs2 things) Seems a good plan to me to put these in a misc package (actually I also considered moving all other stuff that is in my proposal in mtd-utils into a differently named package, e.g. mtd-utils-core) and have mtd-utils as an umbrella package dragging in what it does now (so it should RDEPEND on the meta-utils-* packages but have no other stuff in it). Best regards, Frans. PS: partially related: I have filed yocto bug 3702 asking for more fine-grained control on what is included in an image. https://bugzilla.yoctoproject.org/show_bug.cgi?id=3702 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] split mtd-utils
Hi Frans, Le Fri, 11 Jan 2013 09:40:43 +0100, Frans Meulenbroeks a écrit : > Along the lines of the oe classic patch I propose to split as follows: > > > mtd-utils-jffs2 package containing > jffs2dump > jffs2reader > mkfs.jffs2 > > mtd-utils-ubifs package containing: > mkfs.ubifs > ubiattach > ubicrc32 > ubidetach > ubiformat > ubimkvol > ubinfo > ubinize > ubirename > ubirmvol > ubirsvol > ubiupdatevol > > mtd-utils package containing: > docfdisk > doc_loadbios > flashcp > flash_erase > flash_eraseall > flash_lock > flash_otp_dump > flash_otp_info > flash_unlock > ftl_check > ftl_format > mtd_debug > mtdinfo > nanddump > nandtest > nandwrite > nftldump > nftl_format > recv_image > rfddump > rfdformat > serve_image > sumtool > IIRC sumtol is used for jffs2 images (to create the erase block summary) so that may better fit into mtd-utils-jffs2 Also, nftl* rfd* doc* ftl* serve_image may go into a separate packate (mtd-utils-misc ?) as I believe those tools are not very usefull in most configurations using mtd with nowadays's flashs. Eric ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] glib2.0 and dbus dependency
On 01/11/2013 02:31 AM, Yi Qingliang wrote: when compiling using 4 threads, I got following error. the glib2.0-native want find dbus header file. If I compiled dbus/dbus-natigve, and then compile glib2.0 OK. when grep glib2.0 bb files, I can't find dbus in dependency, why? Hi, What's the error message? Cheers, Chen Qi ERROR: Function failed: do_compile (see /mnt/src/arm9plf- build/tmp/work/x86_64-linux/glib-2.0-native/1_2.34.3- r0/temp/log.do_compile.28193 for further information) ERROR: Task 1851 (virtual:native:/mnt/src/optimus/poky/meta/recipes- core/glib-2.0/glib-2.0_2.34.3.bb, do_compile) failed with exit code '1' NOTE: Tasks Summary: Attempted 929 tasks of which 925 didn't need to be rerun and 1 failed. Waiting for 0 running tasks to finish: Summary: 1 task failed: virtual:native:/mnt/src/optimus/poky/meta/recipes- core/glib-2.0/glib-2.0_2.34.3.bb, do_compile Summary: There was 1 ERROR message shown, returning a non-zero exit code. ___ 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 V2] connman: upgrade to 1.10
On 10 January 2013 23:59, Richard Purdie wrote: > Please don't use "qemu", use something like qemuall or allqemu since I > have some thoughts about how this might interact with the qemu class, > most involving the word "badly" ;-). That was my fault, I thought it was neater. Interaction with classes didn't come into my mind. Sorry for the churn Cristian. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-commits] Otavio Salvador : libnl: Update to 3.2.18
On Thu, Jan 10, 2013 at 11:52:29PM +, g...@git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master
> Commit: 5de138939c42b0a6d80732130b2617fd60a7d545
> URL:
> http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5de138939c42b0a6d80732130b2617fd60a7d545
>
> Author: Otavio Salvador
> Date: Tue Jan 8 12:19:39 2013 -0200
>
> libnl: Update to 3.2.18
>
> This release fixes the build failures found when building against old
> Linux kernel headers and also includes the fix for to use 'flex'
> instead of 'lex'.
>
> Signed-off-by: Otavio Salvador
> Signed-off-by: Saul Wold
Warning for those who are still using OEBasic or not using PR service.
.so version changed, libnl-route-3-200, libnl-3-200, libnl-nf-3-200 are
gone if you're using debian.bbclass. All recipes (r)depending on one of
those need to be rebuild and reinstalled on target (ideally PR bumped)
to rebuild against libnl-route-3-201, libnl-3-201, libnl-nf-3-201.
Cheers,
>
> ---
>
> .../libnl/libnl/fix-build-using-flex.patch | 55
>
> .../libnl/libnl/fix-pktloc_syntax_h-race.patch |2 +-
> .../libnl/{libnl_3.2.16.bb => libnl_3.2.18.bb} |7 +--
> 3 files changed, 4 insertions(+), 60 deletions(-)
>
> diff --git a/meta/recipes-support/libnl/libnl/fix-build-using-flex.patch
> b/meta/recipes-support/libnl/libnl/fix-build-using-flex.patch
> deleted file mode 100644
> index 89a36ba..000
> --- a/meta/recipes-support/libnl/libnl/fix-build-using-flex.patch
> +++ /dev/null
> @@ -1,55 +0,0 @@
> -From 89ab8d4f1229a1d2605193686cc00e6b2c9786ff Mon Sep 17 00:00:00 2001
> -From: Otavio Salvador
> -Date: Mon, 7 Jan 2013 15:44:38 -0200
> -Subject: [PATCH] Fix build using flex
> -
> -Upstream-Status: Backport [3.2.17]
>
> - lib/Makefile.am |4 ++--
> - src/lib/Makefile.am |4 ++--
> - 2 files changed, 4 insertions(+), 4 deletions(-)
> -
> -diff --git a/lib/Makefile.am b/lib/Makefile.am
> -index 98c7b90..89cc5d2 100644
> a/lib/Makefile.am
> -+++ b/lib/Makefile.am
> -@@ -43,14 +43,14 @@ CLEANFILES = \
> - route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h
> - route/pktloc_grammar.h: route/pktloc_grammar.c
> - route/pktloc_grammar.c: route/pktloc_grammar.l
> --$(AM_V_GEN) $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@
> $^
> -+$(AM_V_GEN) $(FLEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o
> $@ $^
> -
> - route/pktloc_syntax.h: route/pktloc_syntax.c
> - route/pktloc_syntax.c: route/pktloc_syntax.y
> - $(AM_V_GEN) $(YACC) -d $(YFLAGS) -o $@ $^
> -
> - route/cls/ematch_grammar.c: route/cls/ematch_grammar.l
> --$(AM_V_GEN) $(LEX) --header-file=route/cls/ematch_grammar.h $(LFLAGS)
> -o $@ $^
> -+$(AM_V_GEN) $(FLEX) --header-file=route/cls/ematch_grammar.h $(LFLAGS)
> -o $@ $^
> -
> - route/cls/ematch_syntax.c: route/cls/ematch_syntax.y
> - $(AM_V_GEN) $(YACC) -d $(YFLAGS) -o $@ $^
> -diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
> -index 6688e7c..507635d 100644
> a/src/lib/Makefile.am
> -+++ b/src/lib/Makefile.am
> -@@ -11,13 +11,13 @@ AM_LDFLAGS = \
> - #cls_ematch_cmp_la_LDFLAGS = -module -version-info 2:0:0
> -
> - #cls/ematch_grammar.c: cls/ematch_grammar.l
> --# $(LEX) --header-file=cls/ematch_grammar.h $(LFLAGS) -o $@ $^
> -+# $(FLEX) --header-file=cls/ematch_grammar.h $(LFLAGS) -o $@ $^
> -
> - #cls/ematch_syntax.c: cls/ematch_syntax.y
> - # $(YACC) -d $(YFLAGS) -o $@ $^
> -
> - #cls/pktloc_grammar.c: cls/pktloc_grammar.l
> --# $(LEX) --header-file=cls/pktloc_grammar.h $(LFLAGS) -o $@ $^
> -+# $(FLEX) --header-file=cls/pktloc_grammar.h $(LFLAGS) -o $@ $^
> -
> - #cls/pktloc_syntax.c: cls/pktloc_syntax.y
> - # $(YACC) -d $(YFLAGS) -o $@ $^
> ---
> -1.7.10.4
> -
> diff --git a/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
> b/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
> index 332ec01..b93d97b 100644
> --- a/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
> +++ b/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
> @@ -17,7 +17,7 @@ Index: libnl-3.2.14/lib/Makefile.am
> +route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h
> +route/pktloc_grammar.h: route/pktloc_grammar.c
> route/pktloc_grammar.c: route/pktloc_grammar.l
> - $(AM_V_GEN) $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@
> $^
> + $(AM_V_GEN) $(FLEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o
> $@ $^
>
> +route/pktloc_syntax.h: route/pktloc_syntax.c
> route/pktloc_syntax.c: route/pktloc_syntax.y
> diff --git a/meta/recipes-support/libnl/libnl_3.2.16.bb
> b/meta/recipes-support/libnl/libnl_3.2.18.bb
> similarity index 87%
> rename from meta/recipes-support/libnl/libnl_3.2.16.bb
> rename to meta/recipes-support/libnl/libnl_3.2.18.bb
> index db9ae9d..0da7f20 100644
> --- a/meta/recipes-support/libnl/libnl_3.2.16.bb
> +++ b/meta/recipes-support/libnl/libnl_3.2.18.bb
> @@ -3,7 +3,7 @@ HOMEPA
[OE-core] [PATCH V3 1/2] connman: upgrade to 1.10
0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch
- adapted to the new version
0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch
- patch removed (it is included in the new version)
inet-fix-ip-cleanup-functions.patch: added
- fix for ip cleanup functions
Signed-off-by: Constantin Musca
Signed-off-by: Cristian Iorga
---
...If-there-is-no-d_type-support-use-fstatat.patch | 61
...If-there-is-no-d_type-support-use-fstatat.patch | 38 +++-
.../connman/inet-fix-ip-cleanup-functions.patch| 40 +
.../connman/{connman_1.4.bb => connman_1.10.bb}|8 ++-
4 files changed, 67 insertions(+), 80 deletions(-)
delete mode 100644
meta/recipes-connectivity/connman/connman/0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch
create mode 100644
meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch
rename meta/recipes-connectivity/connman/{connman_1.4.bb => connman_1.10.bb}
(71%)
diff --git
a/meta/recipes-connectivity/connman/connman/0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch
b/meta/recipes-connectivity/connman/connman/0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch
deleted file mode 100644
index 3bced52..000
---
a/meta/recipes-connectivity/connman/connman/0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From f2094e6b2e4542adf458d8fa58d7bccd5edb762e Mon Sep 17 00:00:00 2001
-From: Andrei Gherzan
-Date: Tue, 17 Jul 2012 17:27:39 +0300
-Subject: [PATCH V3 1/2] timezone.c: If there is no d_type support use
- fstatat()
-
-This is useful for filesystems where d_type is always DT_UNKNOWN.
-In this case use fstatat() function.
-
-Signed-off-by: Andrei Gherzan
-Upstream-Status: Submitted
-
- src/timezone.c | 24
- 1 file changed, 24 insertions(+)
-
-diff --git a/src/timezone.c b/src/timezone.c
-index 173d658..f951f6b 100644
a/src/timezone.c
-+++ b/src/timezone.c
-@@ -157,6 +157,8 @@ static char *find_origin(void *src_map, struct stat
*src_st,
- DIR *dir;
- struct dirent *d;
- char *str, pathname[PATH_MAX];
-+ struct stat buf;
-+ int ret;
-
- if (subpath == NULL)
- strncpy(pathname, basepath, sizeof(pathname));
-@@ -205,6 +207,28 @@ static char *find_origin(void *src_map, struct stat
*src_st,
- return str;
- }
- break;
-+ case DT_UNKNOWN:
-+ /*
-+ * If there is no d_type support use fstatat()
-+ * to check if directory
-+ */
-+ ret = fstatat(dirfd(dir), d->d_name, &buf, 0);
-+ if (ret < 0)
-+ continue;
-+ if (!(buf.st_mode & S_IFDIR))
-+ continue;
-+ if (subpath == NULL)
-+ strncpy(pathname, d->d_name, sizeof(pathname));
-+ else
-+ snprintf(pathname, sizeof(pathname),
-+ "%s/%s", subpath, d->d_name);
-+
-+ str = find_origin(src_map, src_st, basepath, pathname);
-+ if (str != NULL) {
-+ closedir(dir);
-+ return str;
-+ }
-+ break;
- }
- }
-
---
-1.7.9.5
-
diff --git
a/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch
b/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch
index d3205c0..7315545 100644
---
a/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch
+++
b/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch
@@ -8,20 +8,33 @@ This is useful for filesystems where d_type is always
DT_UNKNOWN.
In this case use fstatat() function.
Signed-off-by: Andrei Gherzan
+Signed-off-by: Constantin Musca
Upstream-Status: Submitted
---
src/storage.c | 19 +++
1 file changed, 19 insertions(+)
-diff --git a/src/storage.c b/src/storage.c
-index 47bd0cb..0491a52 100644
a/src/storage.c
-+++ b/src/storage.c
-@@ -206,6 +206,25 @@ gchar **connman_storage_get_services()
+Index: git/src/storage.c
+===
+--- git.orig/src/storage.c
git/src/storage.c
+@@ -193,7 +193,6 @@ gchar **connman_storage_get_services()
- g_string_append_printf(result, "%s/", d->d_name);
- break;
+ switch (d->d_type) {
+ case DT_DIR:
+- case DT_UNKNOWN:
+
[OE-core] [PATCH V3 2/2] connman-conf: configures connman in qemu machines
For qemu machines, connman should not configure
virtual wired interfaces. Wired interfaces (eth0)
are assigned static IP addresses by the virtual machine
manager (qemu). This packages places the eth0 interface in
a list of blacklisted interfaces, forbiding connman
administering wired interfaces for qemu machines.
Fixes [YOCTO #3227].
Signed-off-by: Cristian Iorga
---
meta/conf/layer.conf |1 +
meta/conf/machine/include/qemu.inc |2 ++
meta/recipes-connectivity/connman/connman-conf.bb| 18 ++
.../connman/connman-conf/qemuall/main.conf |3 +++
4 files changed, 24 insertions(+)
create mode 100644 meta/recipes-connectivity/connman/connman-conf.bb
create mode 100644
meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 78ceae9..3259e5c 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -22,6 +22,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
shadow-securetty \
opkg-config-base \
netbase \
+ connman-conf \
formfactor \
xserver-xf86-config \
pointercal \
diff --git a/meta/conf/machine/include/qemu.inc
b/meta/conf/machine/include/qemu.inc
index 5d59a7f..c1012ab 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -10,6 +10,8 @@ XSERVER ?= "xserver-xorg \
MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen"
+MACHINEOVERRIDES .= ":qemuall"
+
IMAGE_FSTYPES += "tar.bz2 ext3"
ROOT_FLASH_SIZE = "280"
diff --git a/meta/recipes-connectivity/connman/connman-conf.bb
b/meta/recipes-connectivity/connman/connman-conf.bb
new file mode 100644
index 000..7c7ef26
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman-conf.bb
@@ -0,0 +1,18 @@
+#connman config to ignore wired interfaces on qemu machines
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+
+SRC_URI_append_qemuall = " file://main.conf"
+
+PR = "r0"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_install() {
+#Blacklist ethn network interface in case of qemu* machines
+if test -e ${WORKDIR}/main.conf; then
+install -d ${D}${sysconfdir}/connman
+install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/connman
+fi
+}
diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
b/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
new file mode 100644
index 000..01973e7
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
@@ -0,0 +1,3 @@
+[General]
+
+NetworkInterfaceBlacklist = eth
--
1.7.10.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 0/2] connman 1.10 upgrade and qemu networking fix
This set of patches will:
- update connman to 1.10
- solve the issue of lost connectivity with qemu machines
connman will clear previous configuration for a network
interface, rendering qemu machines eth0 unusable, because
there is no DHCP server to be used, and the static configuration
of eth0 will be cleared when connman starts.
connman-conf solves this.
Cristian Iorga (2):
connman: upgrade to 1.10
connman-conf: configures connman in qemu machines
meta/conf/layer.conf |1 +
meta/conf/machine/include/qemu.inc |2 +
meta/recipes-connectivity/connman/connman-conf.bb | 18 ++
.../connman/connman-conf/qemuall/main.conf |3 +
...If-there-is-no-d_type-support-use-fstatat.patch | 61
...If-there-is-no-d_type-support-use-fstatat.patch | 38 +++-
.../connman/inet-fix-ip-cleanup-functions.patch| 40 +
.../connman/{connman_1.4.bb => connman_1.10.bb}|8 ++-
8 files changed, 91 insertions(+), 80 deletions(-)
create mode 100644 meta/recipes-connectivity/connman/connman-conf.bb
create mode 100644
meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
delete mode 100644
meta/recipes-connectivity/connman/connman/0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch
create mode 100644
meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch
rename meta/recipes-connectivity/connman/{connman_1.4.bb => connman_1.10.bb}
(71%)
--
1.7.10.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V3 2/2] connman-conf: configures connman in qemu machines
On Fri, Jan 11, 2013 at 12:53:38PM +0200, Cristian Iorga wrote:
> For qemu machines, connman should not configure
> virtual wired interfaces. Wired interfaces (eth0)
> are assigned static IP addresses by the virtual machine
> manager (qemu). This packages places the eth0 interface in
> a list of blacklisted interfaces, forbiding connman
> administering wired interfaces for qemu machines.
This should be applied before 1/2 which is RRECOMMENDING this.
Cheers,
> Fixes [YOCTO #3227].
>
> Signed-off-by: Cristian Iorga
> ---
> meta/conf/layer.conf |1 +
> meta/conf/machine/include/qemu.inc |2 ++
> meta/recipes-connectivity/connman/connman-conf.bb| 18
> ++
> .../connman/connman-conf/qemuall/main.conf |3 +++
> 4 files changed, 24 insertions(+)
> create mode 100644 meta/recipes-connectivity/connman/connman-conf.bb
> create mode 100644
> meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
>
> diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
> index 78ceae9..3259e5c 100644
> --- a/meta/conf/layer.conf
> +++ b/meta/conf/layer.conf
> @@ -22,6 +22,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
>shadow-securetty \
>opkg-config-base \
>netbase \
> + connman-conf \
>formfactor \
>xserver-xf86-config \
>pointercal \
> diff --git a/meta/conf/machine/include/qemu.inc
> b/meta/conf/machine/include/qemu.inc
> index 5d59a7f..c1012ab 100644
> --- a/meta/conf/machine/include/qemu.inc
> +++ b/meta/conf/machine/include/qemu.inc
> @@ -10,6 +10,8 @@ XSERVER ?= "xserver-xorg \
>
> MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen"
>
> +MACHINEOVERRIDES .= ":qemuall"
> +
> IMAGE_FSTYPES += "tar.bz2 ext3"
>
> ROOT_FLASH_SIZE = "280"
> diff --git a/meta/recipes-connectivity/connman/connman-conf.bb
> b/meta/recipes-connectivity/connman/connman-conf.bb
> new file mode 100644
> index 000..7c7ef26
> --- /dev/null
> +++ b/meta/recipes-connectivity/connman/connman-conf.bb
> @@ -0,0 +1,18 @@
> +#connman config to ignore wired interfaces on qemu machines
> +
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM =
> "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
> +
> +SRC_URI_append_qemuall = " file://main.conf"
> +
> +PR = "r0"
> +
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
> +
> +do_install() {
> +#Blacklist ethn network interface in case of qemu* machines
> +if test -e ${WORKDIR}/main.conf; then
> +install -d ${D}${sysconfdir}/connman
> +install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/connman
> +fi
> +}
> diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
> b/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
> new file mode 100644
> index 000..01973e7
> --- /dev/null
> +++ b/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
> @@ -0,0 +1,3 @@
> +[General]
> +
> +NetworkInterfaceBlacklist = eth
> --
> 1.7.10.4
>
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
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 V3 2/2] connman-conf: configures connman in qemu machines
Yes, I think I missed that. Should I resend the patches?
-Original Message-
From: Martin Jansa [mailto:martin.ja...@gmail.com]
Sent: Friday, January 11, 2013 1:28 PM
To: Iorga, Cristian
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH V3 2/2] connman-conf: configures connman in qemu
machines
On Fri, Jan 11, 2013 at 12:53:38PM +0200, Cristian Iorga wrote:
> For qemu machines, connman should not configure virtual wired
> interfaces. Wired interfaces (eth0) are assigned static IP addresses
> by the virtual machine manager (qemu). This packages places the eth0
> interface in a list of blacklisted interfaces, forbiding connman
> administering wired interfaces for qemu machines.
This should be applied before 1/2 which is RRECOMMENDING this.
Cheers,
> Fixes [YOCTO #3227].
>
> Signed-off-by: Cristian Iorga
> ---
> meta/conf/layer.conf |1 +
> meta/conf/machine/include/qemu.inc |2 ++
> meta/recipes-connectivity/connman/connman-conf.bb| 18
> ++
> .../connman/connman-conf/qemuall/main.conf |3 +++
> 4 files changed, 24 insertions(+)
> create mode 100644 meta/recipes-connectivity/connman/connman-conf.bb
> create mode 100644
> meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
>
> diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index
> 78ceae9..3259e5c 100644
> --- a/meta/conf/layer.conf
> +++ b/meta/conf/layer.conf
> @@ -22,6 +22,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
>shadow-securetty \
>opkg-config-base \
>netbase \
> + connman-conf \
>formfactor \
>xserver-xf86-config \
>pointercal \
> diff --git a/meta/conf/machine/include/qemu.inc
> b/meta/conf/machine/include/qemu.inc
> index 5d59a7f..c1012ab 100644
> --- a/meta/conf/machine/include/qemu.inc
> +++ b/meta/conf/machine/include/qemu.inc
> @@ -10,6 +10,8 @@ XSERVER ?= "xserver-xorg \
>
> MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen"
>
> +MACHINEOVERRIDES .= ":qemuall"
> +
> IMAGE_FSTYPES += "tar.bz2 ext3"
>
> ROOT_FLASH_SIZE = "280"
> diff --git a/meta/recipes-connectivity/connman/connman-conf.bb
> b/meta/recipes-connectivity/connman/connman-conf.bb
> new file mode 100644
> index 000..7c7ef26
> --- /dev/null
> +++ b/meta/recipes-connectivity/connman/connman-conf.bb
> @@ -0,0 +1,18 @@
> +#connman config to ignore wired interfaces on qemu machines
> +
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM =
> "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
> +
> +SRC_URI_append_qemuall = " file://main.conf"
> +
> +PR = "r0"
> +
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
> +
> +do_install() {
> +#Blacklist ethn network interface in case of qemu* machines
> +if test -e ${WORKDIR}/main.conf; then
> +install -d ${D}${sysconfdir}/connman
> +install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/connman
> +fi
> +}
> diff --git
> a/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
> b/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
> new file mode 100644
> index 000..01973e7
> --- /dev/null
> +++ b/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
> @@ -0,0 +1,3 @@
> +[General]
> +
> +NetworkInterfaceBlacklist = eth
> --
> 1.7.10.4
>
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V3 2/2] connman-conf: configures connman in qemu machines
Cristian Iorga writes: > For qemu machines, connman should not configure virtual wired interfaces. This is not a qemu-only problem but affects all platforms with nfs rootfs, isn't it? Setup whether to disable configuration of interface should be done dynamically and based on e.g. whether rootfs is on nfs and/or if kernel cmdline contains 'ip=...'. > Wired interfaces (eth0) are assigned static IP addresses by the virtual > machine manager (qemu). This packages places the eth0 interface in a > list of blacklisted interfaces, forbiding connman administering wired > interfaces for qemu machines. Unfortunatly, this breaks DNS in the machine because DNS server information are not retrieved from DHCP anymore :( Enrico ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V3 2/2] connman-conf: configures connman in qemu machines
Hello Enrico, see my answers below. Regards, Cristian -Original Message- From: Enrico Scholz [mailto:enrico.sch...@sigma-chemnitz.de] Sent: Friday, January 11, 2013 2:23 PM To: openembedded-core@lists.openembedded.org Cc: Cristian Iorga Subject: Re: [PATCH V3 2/2] connman-conf: configures connman in qemu machines Cristian Iorga writes: > For qemu machines, connman should not configure virtual wired interfaces. This is not a qemu-only problem but affects all platforms with nfs rootfs, isn't it? In this particular case, it's only related to qemu in the network environment presented to a virtual machine. There is a separate patch for the $nfsroot issue. Setup whether to disable configuration of interface should be done dynamically and based on e.g. whether rootfs is on nfs and/or if kernel cmdline contains 'ip=...'. In my opinion, that's debatable. Qemu images for sure won't have a DHCP to send request too (as the setup is done now); as such, the build system can decide in advance to blacklist ethn to connman. To me, the $nfsroot fix is OK. It is done dynamically done, and on need by need base. > Wired interfaces (eth0) are assigned static IP addresses by the > virtual machine manager (qemu). This packages places the eth0 > interface in a list of blacklisted interfaces, forbiding connman > administering wired interfaces for qemu machines. Unfortunatly, this breaks DNS in the machine because DNS server information are not retrieved from DHCP anymore :( In which machine? qemu*? Is there a DHCP server to work with? That's the main problem that I am seeing, that there is no DHCP server, and, in the end, connman will assign a Zeroconf IP address to eth0. As far as I know, there will be no DNS server set if Zeroconf is used. Enrico ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] add meta-toolchain-qt
- this allows the creation of a SDK containing all the needed
libraries to develop QT4 for X applications
- the recipes were factorized to share as much code as possible
- binaries generated using the toolchain were run tested on an
ARMv7 target
- both qt & qte toolchains were build tested for qemuarm target
and for an ARMv7 target
Signed-off-by: Eric Bénard
---
meta/recipes-qt/meta/meta-toolchain-qt.bb |5 +++
meta/recipes-qt/meta/meta-toolchain-qt.inc | 31 ++
meta/recipes-qt/meta/meta-toolchain-qte.bb | 32 ++-
.../nativesdk-packagegroup-qt-toolchain-host.bb|3 ++
.../nativesdk-packagegroup-qt-toolchain-host.inc |6
.../nativesdk-packagegroup-qte-toolchain-host.bb |5 +--
.../packagegroup-qt-toolchain-target.bb| 11 +++
.../packagegroup-qt-toolchain-target.inc | 33
.../packagegroup-qte-toolchain-target.bb | 32 ++-
9 files changed, 94 insertions(+), 64 deletions(-)
create mode 100644 meta/recipes-qt/meta/meta-toolchain-qt.bb
create mode 100644 meta/recipes-qt/meta/meta-toolchain-qt.inc
create mode 100644
meta/recipes-qt/packagegroups/nativesdk-packagegroup-qt-toolchain-host.bb
create mode 100644
meta/recipes-qt/packagegroups/nativesdk-packagegroup-qt-toolchain-host.inc
create mode 100644
meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
create mode 100644
meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc
diff --git a/meta/recipes-qt/meta/meta-toolchain-qt.bb
b/meta/recipes-qt/meta/meta-toolchain-qt.bb
new file mode 100644
index 000..a10103a
--- /dev/null
+++ b/meta/recipes-qt/meta/meta-toolchain-qt.bb
@@ -0,0 +1,5 @@
+# Qt toolchain
+QTNAME = "qt"
+QT_DIR_NAME = "qt4"
+
+require meta-toolchain-qt.inc
diff --git a/meta/recipes-qt/meta/meta-toolchain-qt.inc
b/meta/recipes-qt/meta/meta-toolchain-qt.inc
new file mode 100644
index 000..107ba19
--- /dev/null
+++ b/meta/recipes-qt/meta/meta-toolchain-qt.inc
@@ -0,0 +1,31 @@
+TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-${QTNAME}-toolchain-host
packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+TOOLCHAIN_TARGET_TASK = "packagegroup-${QTNAME}-toolchain-target"
+TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-${QTNAME}-${DISTRO_VERSION}"
+
+require recipes-core/meta/meta-toolchain.bb
+
+QT_TOOLS_PREFIX = "${SDKPATHNATIVE}${bindir_nativesdk}"
+
+toolchain_create_sdk_env_script_append() {
+echo 'export OE_QMAKE_CFLAGS="$CFLAGS"' >> $script
+echo 'export OE_QMAKE_CXXFLAGS="$CXXFLAGS"' >> $script
+echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script
+echo 'export OE_QMAKE_CC=$CC' >> $script
+echo 'export OE_QMAKE_CXX=$CXX' >> $script
+echo 'export OE_QMAKE_LINK=$LD' >> $script
+echo 'export OE_QMAKE_AR=$AR' >> $script
+echo 'export OE_QMAKE_LIBDIR_QT=${SDKTARGETSYSROOT}/${libdir}' >> $script
+echo 'export
OE_QMAKE_INCDIR_QT=${SDKTARGETSYSROOT}/${includedir}/${QT_DIR_NAME}' >> $script
+echo 'export OE_QMAKE_MOC=${QT_TOOLS_PREFIX}/moc4' >> $script
+echo 'export OE_QMAKE_UIC=${QT_TOOLS_PREFIX}/uic4' >> $script
+echo 'export OE_QMAKE_UIC3=${QT_TOOLS_PREFIX}/uic34' >> $script
+echo 'export OE_QMAKE_RCC=${QT_TOOLS_PREFIX}/rcc4' >> $script
+echo 'export OE_QMAKE_QDBUSCPP2XML=${QT_TOOLS_PREFIX}/qdbuscpp2xml4' >>
$script
+echo 'export OE_QMAKE_QDBUSXML2CPP=${QT_TOOLS_PREFIX}/qdbusxml2cpp4' >>
$script
+echo 'export
OE_QMAKE_QT_CONFIG=${SDKTARGETSYSROOT}/${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri'
>> $script
+echo 'export
QMAKESPEC=${SDKTARGETSYSROOT}/${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >>
$script
+
+# make a symbolic link to mkspecs for compatibility with Nokia's SDK
+# and QTCreator
+(cd ${SDK_OUTPUT}/${QT_TOOLS_PREFIX}/..; ln -s
${SDKTARGETSYSROOT}/usr/share/${QT_DIR_NAME}/mkspecs mkspecs;)
+}
diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb
b/meta/recipes-qt/meta/meta-toolchain-qte.bb
index 7c2ae49..9113f48 100644
--- a/meta/recipes-qt/meta/meta-toolchain-qte.bb
+++ b/meta/recipes-qt/meta/meta-toolchain-qte.bb
@@ -1,34 +1,6 @@
# Qt Embedded toolchain
PR = "r6"
-TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-qte-toolchain-host
packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
-TOOLCHAIN_TARGET_TASK = "packagegroup-qte-toolchain-target"
-TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-qte-${DISTRO_VERSION}"
-
-require recipes-core/meta/meta-toolchain.bb
-
+QTNAME = "qte"
QT_DIR_NAME = "qtopia"
-QT_TOOLS_PREFIX = "${SDKPATHNATIVE}${bindir_nativesdk}"
-
-toolchain_create_sdk_env_script_append() {
-echo 'export OE_QMAKE_CFLAGS="$CFLAGS"' >> $script
-echo 'export OE_QMAKE_CXXFLAGS="$CXXFLAGS"' >> $script
-echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script
-echo 'export OE_QMAKE_CC=$CC' >> $script
-echo 'export OE_QMAKE_CXX=$CXX' >> $script
-echo 'export OE_QMAKE_LINK=$LD' >> $script
-echo 'export OE_QMAKE_AR=$A
[OE-core] [PATCH 1/2] gitignore: only ignore meta- directories
else for example meta-toolchain-qte.bb is also ignored. Signed-off-by: Eric Bénard --- .gitignore |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a2141f0..6ece6b8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ pyshtables.py pstage/ scripts/oe-git-proxy-socks sources/ -meta-* +meta-*/ !meta-skeleton !meta-hob hob-image-*.bb @@ -15,5 +15,3 @@ hob-image-*.bb *.orig *.rej *~ - - -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/5] lib/oe/path.py: Use shutil.rmtree if the path we wish to remove is a directory.
On Thu, Jan 10, 2013 at 11:27 PM, Martin Ertsaas wrote: > On 01/10/13 15:15, Chris Larson wrote: > > > On Thu, Jan 10, 2013 at 1:50 AM, Martin Ertsaas wrote: > >> On mac, os.unlink can not be done to remove directories, and so we have to >> explicitly use shutil.rmtree instead to support mac. >> > > As pointed out for the bitbake patch, the functions can already handle > this case if you pass recurse=True, and mac isn't at all special in this > context. > -- > Christopher Larson > > True. In this case though, I feel the patch is still valid though, and > that I should instead change the commit message. What I want from this > patch, as I see it again now, is to not duplicate the same code in both > bitbake and oe-core, when the oe-core function 'remove' can just be calling > bb.utils.remove. So personally I still want this patch, I just wish to > change the commit message to something sane. Agreed? > Agreed. -- Christopher Larson ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 00/21][RFC v3] systemd Integration
On 01/10/2013 08:27 PM, Khem Raj wrote: On Thu, Jan 10, 2013 at 12:02 AM, Radu Moisan wrote: On 01/09/2013 07:14 PM, Khem Raj wrote: On Tue, Jan 8, 2013 at 4:24 AM, Radu Moisan wrote: As Ross suggested I've done the following changes to the previous set: * added two patches (the first two) that address multiple init systems support,\ as in shifting from default hardcoded sysvinit to something more generic while the default values still remains on sysvinit * moved automatic setting of PREFERRED_PROVIDER_udev into default_providers.inc * removed ahavi-systemd since all it provided was service files; now service files are pulled in by avahi-daemon * also rebased on master btw. there has been more merges into meta-systemd in meta-openembedded since these patches were created I cant accertain that you picked those too but please redo this series so the history is a bit better for tracking purposes. I've tried to get in sync with meta-openembedded until they upgraded systemd to v196. hmm that would also explain the -lrt problem that Saul is seeing but I dont. Not quite, the problem Soul is seeing is probably because he is using eglibc v2.17 I'm running a world build right now (with eglibc v2.16) and I don't see those problems. I tried to upgrade but something changed in the latest version and dbus-daemon didn't start anymore and because of that a few other services depending on it. I spent some time debugging it but eventually I decided we should go with the previous version and address the update after we merge. More details about this at https://bugzilla.yoctoproject.org/show_bug.cgi?id=1625 but we have to fix it I think weather you merge it or not since I dont expect us to stay at 195 forever and especially when folks who use meta-systemd are already using 196 we wont be able to discard meta-systemd. It's not a question of fixing it or not, rather of when will we fix it. My approach was to have a buildable version that is also stable at runtime and merge that into oe-core. The we will address systemd upgrade as a normal package upgrate, since package upgrade is routine task anyway and we do it for all packages. I also took a look over latest patches on meta-openembedded since systemd update, and there aren't that many changes that are relevant to oe-core. Any way I'll get back with a new separate branch for review (with systemd v196). Radu ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] connman: upgrade to 1.10
On Thu, 2013-01-10 at 23:59 +, Richard Purdie wrote: > On Thu, 2013-01-10 at 20:26 +, Burton, Ross wrote: > > On 10 January 2013 18:42, Cristian Iorga wrote: > > > 0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch > > > - adapted to the new version > > > > > > 0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch > > > - patch removed (it is included in the new version) > > > > > > inet-fix-ip-cleanup-functions.patch: added > > > - fix for ip cleanup functions > > > > > > Signed-off-by: Constantin Musca > > > Signed-off-by: Cristian Iorga > > > > Also document the point of connman-conf. > > > > > diff --git a/meta/conf/machine/include/qemu.inc > > > b/meta/conf/machine/include/qemu.inc > > > index 5d59a7f..41fe552 100644 > > > --- a/meta/conf/machine/include/qemu.inc > > > +++ b/meta/conf/machine/include/qemu.inc > > > @@ -10,6 +10,8 @@ XSERVER ?= "xserver-xorg \ > > > > > > MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen" > > > > > > +MACHINEOVERRIDES .= ":qemu" > > > + > > > > Please submit this as a separate patch, it's effectively unrelated to > > connman. > > Please don't use "qemu", use something like qemuall or allqemu since I > have some thoughts about how this might interact with the qemu class, > most involving the word "badly" ;-). Saul included this change in MUT on the autobuilders. I've just lost a load of time wondering why we had an odd world autobuilder failure: http://autobuilder.yoctoproject.org:8010/builders/nightly-world/builds/439/steps/shell_43/logs/stdio This override patch was why :(. Cheers, Richard ___ 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] gcc: enable multilib for target gcc
On Wed, 2013-01-09 at 11:00 +0200, Constantin Musca wrote:
> - add a task to setup multilib configuration for target gcc
> - this commit adapts Nitin Kamble's work to gcc 4.7
>
> Tests:
> root@qemux86-64:~# gcc -m64 t.c -o t
> root@qemux86-64:~# file t
> t: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), dynamically linked
> (uses shared libs), for GNU/Linux 2.6.16, not stripped
> root@qemux86-64:~# ./t
> Hello World !
> root@qemux86-64:~# gcc -m32 t.c -o t
> root@qemux86-64:~# file t
> t: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), dynamically
> linked (uses shared libs), for GNU/Linux 2.6.16, not stripped
> root@qemux86-64:~# ./t
> Hello World !
>
> [YOCTO #1369]
>
> Signed-off-by: Constantin Musca
> ---
> meta/recipes-devtools/gcc/gcc-4.7.inc | 2 +-
> meta/recipes-devtools/gcc/gcc-common.inc | 23
> meta/recipes-devtools/gcc/gcc-configure-common.inc | 2 +-
> meta/recipes-devtools/gcc/gcc-configure-target.inc | 1 +
> meta/recipes-devtools/gcc/gcc-multilib-config.inc | 132
> +
> meta/recipes-devtools/gcc/libgcc_4.7.bb| 44 +++
> 6 files changed, 202 insertions(+), 2 deletions(-)
> create mode 100644 meta/recipes-devtools/gcc/gcc-multilib-config.inc
This triggered some build failures:
http://autobuilder.yoctoproject.org:8010/builders/nightly-mips/builds/769/steps/shell_29/logs/stdio
> diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc
> b/meta/recipes-devtools/gcc/gcc-4.7.inc
> index 2fad764..13a1e7e 100644
> --- a/meta/recipes-devtools/gcc/gcc-4.7.inc
> +++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
> @@ -1,6 +1,6 @@
> require gcc-common.inc
>
> -PR = "r14"
> +PR = "r15"
>
> # Third digit in PV should be incremented after a minor release
> # happens from this branch on gcc e.g. currently its 4.7.1
> diff --git a/meta/recipes-devtools/gcc/gcc-common.inc
> b/meta/recipes-devtools/gcc/gcc-common.inc
> index 6e64441..0d29800 100644
> --- a/meta/recipes-devtools/gcc/gcc-common.inc
> +++ b/meta/recipes-devtools/gcc/gcc-common.inc
> @@ -34,6 +34,29 @@ def get_gcc_multiarch_setting(bb, d):
> return multiarch_options[target_arch]
> return ""
>
> +# this is used by the multilib setup of gcc
> +def get_tune_parameters(tune, d):
> +availtunes = d.getVar('AVAILTUNES', True)
> +if tune not in availtunes.split():
> +bb.error('The tune: %s is not one of the available tunes: %s', tune,
> availtunes)
> +
> +localdata = bb.data.createCopy(d)
> +override = ':tune-' + tune
> +localdata.setVar('OVERRIDES', localdata.getVar('OVERRIDES', False) +
> override)
> +bb.data.update_data(localdata)
> +
> +retdict = {}
> +retdict['tune'] = tune
> +retdict['ccargs'] = localdata.getVar('TUNE_CCARGS', True)
> +retdict['features'] = localdata.getVar('TUNE_FEATURES', True)
> +retdict['baselib'] = localdata.getVar('BASE_LIB', True)
> +retdict['arch'] = localdata.getVar('TUNE_ARCH', True)
> +retdict['abiextension'] = localdata.getVar('ABIEXTENSION', True)
> +retdict['target_fpu'] = localdata.getVar('TARGET_FPU', True)
> +retdict['pkgarch'] = localdata.getVar('TUNE_PKGARCH', True)
> +retdict['package_extra_archs'] = localdata.getVar('PACKAGE_EXTRA_ARCHS',
> True)
> +return retdict
> +
> # We really need HOST_SYS here for some packages and TARGET_SYS for others.
> # For now, libgcc is most important so we fix for that - RP.
> SHLIBSDIR = "${STAGING_DIR_TARGET}/shlibs"
> diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc
> b/meta/recipes-devtools/gcc/gcc-configure-common.inc
> index 4eb59fd..08cc98e 100644
> --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
> +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
> @@ -25,7 +25,7 @@ EXTRA_OECONF_PATHS ?= ""
> EXTRA_OECONF_INITIAL ?= ""
> EXTRA_OECONF_INTERMEDIATE ?= ""
>
> -GCCMULTILIB = "--disable-multilib"
> +GCCMULTILIB ?= "--disable-multilib"
> GCCTHREADS ?= "posix"
>
> EXTRA_OECONF = "${@['--enable-clocale=generic', ''][d.getVar('USE_NLS',
> True) != 'no']} \
> diff --git a/meta/recipes-devtools/gcc/gcc-configure-target.inc
> b/meta/recipes-devtools/gcc/gcc-configure-target.inc
> index f41301f..809f937 100644
> --- a/meta/recipes-devtools/gcc/gcc-configure-target.inc
> +++ b/meta/recipes-devtools/gcc/gcc-configure-target.inc
> @@ -1,4 +1,5 @@
> require gcc-configure-common.inc
> +require gcc-multilib-config.inc
>
> EXTRA_OECONF_PATHS = " \
> --with-sysroot=/ \
> diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc
> b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
> new file mode 100644
> index 000..3d9c026
> --- /dev/null
> +++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
> @@ -0,0 +1,132 @@
> +GCCMULTILIB = "--enable-multilib"
> +
> +addtask gcc_multilib_setup after do_patch before do_configure
> +
> +# following code modifies these definitions in the gcc config
> +#MULTILIB_OPTIONS
> +#MULTILIB_DIRNAME
Re: [OE-core] [PATCH 3/3] gcc: enable multilib for target gcc
On Fri, 2013-01-11 at 15:20 +, Richard Purdie wrote: > On Wed, 2013-01-09 at 11:00 +0200, Constantin Musca wrote: > > - add a task to setup multilib configuration for target gcc > > - this commit adapts Nitin Kamble's work to gcc 4.7 > > > > Tests: > > root@qemux86-64:~# gcc -m64 t.c -o t > > root@qemux86-64:~# file t > > t: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), dynamically linked > > (uses shared libs), for GNU/Linux 2.6.16, not stripped > > root@qemux86-64:~# ./t > > Hello World ! > > root@qemux86-64:~# gcc -m32 t.c -o t > > root@qemux86-64:~# file t > > t: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), dynamically > > linked (uses shared libs), for GNU/Linux 2.6.16, not stripped > > root@qemux86-64:~# ./t > > Hello World ! > > > > [YOCTO #1369] > > > > Signed-off-by: Constantin Musca > > --- > > meta/recipes-devtools/gcc/gcc-4.7.inc | 2 +- > > meta/recipes-devtools/gcc/gcc-common.inc | 23 > > meta/recipes-devtools/gcc/gcc-configure-common.inc | 2 +- > > meta/recipes-devtools/gcc/gcc-configure-target.inc | 1 + > > meta/recipes-devtools/gcc/gcc-multilib-config.inc | 132 > > + > > meta/recipes-devtools/gcc/libgcc_4.7.bb| 44 +++ > > 6 files changed, 202 insertions(+), 2 deletions(-) > > create mode 100644 meta/recipes-devtools/gcc/gcc-multilib-config.inc > > This triggered some build failures: > > http://autobuilder.yoctoproject.org:8010/builders/nightly-mips/builds/769/steps/shell_29/logs/stdio and a different more subtle issue in: http://autobuilder.yoctoproject.org:8010/builders/nightly-x86-64-lsb/builds/191/steps/shell_29/logs/stdio which I suspect is related since a build of master just before this without the patch worked. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] bitbake hangs forever when PR serv is enabled
When building world which takes long time to finish I sometimes see bitbake hanging forever. It didn't happen until I've enabled PR Service. But maybe it's not caused by PR Service and it's just coincidence. I've to kill python processes manually and this traceback shown: Exception in thread Thread-1: Traceback (most recent call last): File "/usr/lib/python2.7/threading.py", line 551, in __bootstrap_inner self.run() File "/usr/lib/python2.7/threading.py", line 504, in run self.__target(*self.__args, **self.__kwargs) File "/home/jenkins/oe/shr-core-branches/shr-core/bitbake/lib/prserv/serv.py", line 173, in _work self.prserv.work_forever() File "/home/jenkins/oe/shr-core-branches/shr-core/bitbake/lib/prserv/serv.py", line 93, in work_forever self.handle_request() File "/usr/lib/python2.7/SocketServer.py", line 265, in handle_request fd_sets = select.select([self], [], [], timeout) error: (4, 'Interrupted system call') When this happens, there is only one python process doing something for very long time: 29299 jenkins20 0 0 0 0 Z 0.0 0.0 26:13.66 | | | `- python and when I've tried to connect to it with strace it was looping between 2 pipes both returning EAGAIN. Usually last cooker output is rm_work_all in gimp, but I don't see anything special in gimp recipe and it could be some other thread in background. NOTE: Running task 22874 of 23570 (ID: 996, /home/jenkins/oe/shr-core-branches/shr-core/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb, do_rm_work_all) NOTE: recipe gimp-2.8.2-r0: task do_rm_work_all: Started NOTE: recipe gimp-2.8.2-r0: task do_rm_work_all: Succeeded Exception in thread Thread-1: .. traceback from above Anyone seen this too? Any hints? 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 V2] connman: upgrade to 1.10
Hello Richard, Saul, Which versions of connman upgrade patches were used? V2 or V3? Also, does the issue will be present with V3 also? Regards, Cristian -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Richard Purdie Sent: Friday, January 11, 2013 5:12 PM To: Burton, Ross Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH V2] connman: upgrade to 1.10 On Thu, 2013-01-10 at 23:59 +, Richard Purdie wrote: > On Thu, 2013-01-10 at 20:26 +, Burton, Ross wrote: > > On 10 January 2013 18:42, Cristian Iorga wrote: > > > 0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch > > > - adapted to the new version > > > > > > 0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch > > > - patch removed (it is included in the new version) > > > > > > inet-fix-ip-cleanup-functions.patch: added > > > - fix for ip cleanup functions > > > > > > Signed-off-by: Constantin Musca > > > Signed-off-by: Cristian Iorga > > > > Also document the point of connman-conf. > > > > > diff --git a/meta/conf/machine/include/qemu.inc > > > b/meta/conf/machine/include/qemu.inc > > > index 5d59a7f..41fe552 100644 > > > --- a/meta/conf/machine/include/qemu.inc > > > +++ b/meta/conf/machine/include/qemu.inc > > > @@ -10,6 +10,8 @@ XSERVER ?= "xserver-xorg \ > > > > > > MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen" > > > > > > +MACHINEOVERRIDES .= ":qemu" > > > + > > > > Please submit this as a separate patch, it's effectively unrelated to > > connman. > > Please don't use "qemu", use something like qemuall or allqemu since I > have some thoughts about how this might interact with the qemu class, > most involving the word "badly" ;-). Saul included this change in MUT on the autobuilders. I've just lost a load of time wondering why we had an odd world autobuilder failure: http://autobuilder.yoctoproject.org:8010/builders/nightly-world/builds/439/steps/shell_43/logs/stdio This override patch was why :(. Cheers, Richard ___ 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] db: upgrade to 5.3.21
License file changed the year,
triggering a change in checksum
Signed-off-by: Cristian Iorga
---
meta/recipes-support/db/{db_5.3.15.bb => db_5.3.21.bb} |8
1 file changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-support/db/{db_5.3.15.bb => db_5.3.21.bb} (93%)
diff --git a/meta/recipes-support/db/db_5.3.15.bb
b/meta/recipes-support/db/db_5.3.21.bb
similarity index 93%
rename from meta/recipes-support/db/db_5.3.15.bb
rename to meta/recipes-support/db/db_5.3.21.bb
index 509c567..23d6c4e 100644
--- a/meta/recipes-support/db/db_5.3.15.bb
+++ b/meta/recipes-support/db/db_5.3.21.bb
@@ -14,15 +14,15 @@ HOMEPAGE =
"http://www.oracle.com/technology/products/berkeley-db/db/index.html";
LICENSE = "Sleepycat"
VIRTUAL_NAME ?= "virtual/db"
RCONFLICTS_${PN} = "db3"
-PR = "r9"
+PR = "r0"
SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz";
SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.."
-SRC_URI[md5sum] = "5493fb5f7cc3915887c836b096f18773"
-SRC_URI[sha256sum] =
"4f4f7d548984dde3584fcda0e4f96901cb8bafb08033a7781aec64ef2ea1f579"
+SRC_URI[md5sum] = "3fda0b004acdaa6fa350bfc41a3b95ca"
+SRC_URI[sha256sum] =
"ddd92a930317df92021054c03992392db9ea5cddba43bef8920d392a82114fb8"
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=12cc3ff983ed4ecc6cc091370ee4dbc3"
+LIC_FILES_CHKSUM = "file://../LICENSE;md5=32aefa5a8e7318be1f657432cbe2e768"
inherit autotools
--
1.7.10.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] quota: upgrade to 4.01
Signed-off-by: Cristian Iorga
---
meta/recipes-extended/quota/{quota_4.00.bb => quota_4.01.bb} |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/quota/{quota_4.00.bb => quota_4.01.bb} (85%)
diff --git a/meta/recipes-extended/quota/quota_4.00.bb
b/meta/recipes-extended/quota/quota_4.01.bb
similarity index 85%
rename from meta/recipes-extended/quota/quota_4.00.bb
rename to meta/recipes-extended/quota/quota_4.01.bb
index 25f6381..e2b7ad7 100644
--- a/meta/recipes-extended/quota/quota_4.00.bb
+++ b/meta/recipes-extended/quota/quota_4.01.bb
@@ -10,8 +10,8 @@ PR = "r0"
SRC_URI =
"${SOURCEFORGE_MIRROR}/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz"
-SRC_URI[md5sum] = "975f587ff761a60ac25dbe6c00865925"
-SRC_URI[sha256sum] =
"eb2b045f58b98299edc568b8607b95b10735b4a131fa5196f41c89b51fb409ba"
+SRC_URI[md5sum] = "5c2c31e321d2e1322ce12d69ae5c66d6"
+SRC_URI[sha256sum] =
"a36300bbc126b79b745bf937245092808b4585aa3309ef3335d4ab9d873cd206"
S = "${WORKDIR}/quota-tools"
--
1.7.10.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] db: upgrade to 5.3.21
On 1/11/13 10:18 AM, Cristian Iorga wrote:
License file changed the year,
triggering a change in checksum
Any change is BerkleyDB versions requires us to verify RPM and Smart
functionality. I don't have any objections to the change -- just pointing that out.
--Mark
Signed-off-by: Cristian Iorga
---
meta/recipes-support/db/{db_5.3.15.bb => db_5.3.21.bb} |8
1 file changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-support/db/{db_5.3.15.bb => db_5.3.21.bb} (93%)
diff --git a/meta/recipes-support/db/db_5.3.15.bb
b/meta/recipes-support/db/db_5.3.21.bb
similarity index 93%
rename from meta/recipes-support/db/db_5.3.15.bb
rename to meta/recipes-support/db/db_5.3.21.bb
index 509c567..23d6c4e 100644
--- a/meta/recipes-support/db/db_5.3.15.bb
+++ b/meta/recipes-support/db/db_5.3.21.bb
@@ -14,15 +14,15 @@ HOMEPAGE =
"http://www.oracle.com/technology/products/berkeley-db/db/index.html";
LICENSE = "Sleepycat"
VIRTUAL_NAME ?= "virtual/db"
RCONFLICTS_${PN} = "db3"
-PR = "r9"
+PR = "r0"
SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz";
SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.."
-SRC_URI[md5sum] = "5493fb5f7cc3915887c836b096f18773"
-SRC_URI[sha256sum] =
"4f4f7d548984dde3584fcda0e4f96901cb8bafb08033a7781aec64ef2ea1f579"
+SRC_URI[md5sum] = "3fda0b004acdaa6fa350bfc41a3b95ca"
+SRC_URI[sha256sum] =
"ddd92a930317df92021054c03992392db9ea5cddba43bef8920d392a82114fb8"
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=12cc3ff983ed4ecc6cc091370ee4dbc3"
+LIC_FILES_CHKSUM = "file://../LICENSE;md5=32aefa5a8e7318be1f657432cbe2e768"
inherit autotools
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] db: upgrade to 5.3.21
Noted. Thanks, I will do that on Monday.
Regards,
Cristian
-Original Message-
From: openembedded-core-boun...@lists.openembedded.org
[mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Mark
Hatle
Sent: Friday, January 11, 2013 6:36 PM
To: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH] db: upgrade to 5.3.21
On 1/11/13 10:18 AM, Cristian Iorga wrote:
> License file changed the year,
> triggering a change in checksum
Any change is BerkleyDB versions requires us to verify RPM and Smart
functionality. I don't have any objections to the change -- just pointing that
out.
--Mark
> Signed-off-by: Cristian Iorga
> ---
> meta/recipes-support/db/{db_5.3.15.bb => db_5.3.21.bb} |8
> 1 file changed, 4 insertions(+), 4 deletions(-)
> rename meta/recipes-support/db/{db_5.3.15.bb => db_5.3.21.bb} (93%)
>
> diff --git a/meta/recipes-support/db/db_5.3.15.bb
> b/meta/recipes-support/db/db_5.3.21.bb
> similarity index 93%
> rename from meta/recipes-support/db/db_5.3.15.bb
> rename to meta/recipes-support/db/db_5.3.21.bb
> index 509c567..23d6c4e 100644
> --- a/meta/recipes-support/db/db_5.3.15.bb
> +++ b/meta/recipes-support/db/db_5.3.21.bb
> @@ -14,15 +14,15 @@ HOMEPAGE =
> "http://www.oracle.com/technology/products/berkeley-db/db/index.html";
> LICENSE = "Sleepycat"
> VIRTUAL_NAME ?= "virtual/db"
> RCONFLICTS_${PN} = "db3"
> -PR = "r9"
> +PR = "r0"
>
> SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz";
> SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.."
>
> -SRC_URI[md5sum] = "5493fb5f7cc3915887c836b096f18773"
> -SRC_URI[sha256sum] =
> "4f4f7d548984dde3584fcda0e4f96901cb8bafb08033a7781aec64ef2ea1f579"
> +SRC_URI[md5sum] = "3fda0b004acdaa6fa350bfc41a3b95ca"
> +SRC_URI[sha256sum] =
> "ddd92a930317df92021054c03992392db9ea5cddba43bef8920d392a82114fb8"
>
> -LIC_FILES_CHKSUM = "file://../LICENSE;md5=12cc3ff983ed4ecc6cc091370ee4dbc3"
> +LIC_FILES_CHKSUM = "file://../LICENSE;md5=32aefa5a8e7318be1f657432cbe2e768"
>
> inherit autotools
>
>
___
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 00/21][RFC v3] systemd Integration
On 01/11/2013 07:12 AM, Radu Moisan wrote: On 01/10/2013 08:27 PM, Khem Raj wrote: On Thu, Jan 10, 2013 at 12:02 AM, Radu Moisan wrote: On 01/09/2013 07:14 PM, Khem Raj wrote: On Tue, Jan 8, 2013 at 4:24 AM, Radu Moisan wrote: As Ross suggested I've done the following changes to the previous set: * added two patches (the first two) that address multiple init systems support,\ as in shifting from default hardcoded sysvinit to something more generic while the default values still remains on sysvinit * moved automatic setting of PREFERRED_PROVIDER_udev into default_providers.inc * removed ahavi-systemd since all it provided was service files; now service files are pulled in by avahi-daemon * also rebased on master btw. there has been more merges into meta-systemd in meta-openembedded since these patches were created I cant accertain that you picked those too but please redo this series so the history is a bit better for tracking purposes. I've tried to get in sync with meta-openembedded until they upgraded systemd to v196. hmm that would also explain the -lrt problem that Saul is seeing but I dont. Not quite, the problem Soul is seeing is probably because he is using eglibc v2.17 I'm running a world build right now (with eglibc v2.16) and I don't see those problems. Radu, you I was testing with 2.17, and we need to prepare for the 2.17 update occuring, if it occurs before systemd or after these fixes will be needed to happen. I tried to upgrade but something changed in the latest version and dbus-daemon didn't start anymore and because of that a few other services depending on it. I spent some time debugging it but eventually I decided we should go with the previous version and address the update after we merge. More details about this at https://bugzilla.yoctoproject.org/show_bug.cgi?id=1625 but we have to fix it I think weather you merge it or not since I dont expect us to stay at 195 forever and especially when folks who use meta-systemd are already using 196 we wont be able to discard meta-systemd. It's not a question of fixing it or not, rather of when will we fix it. My approach was to have a buildable version that is also stable at runtime and merge that into oe-core. The we will address systemd upgrade as a normal package upgrate, since package upgrade is routine task anyway and we do it for all packages. As mentioned above, we will need the updated version of systemd & friends before we can update eglibc, we want both systemd and eglibc in for the M3 build. I also took a look over latest patches on meta-openembedded since systemd update, and there aren't that many changes that are relevant to oe-core. Any way I'll get back with a new separate branch for review (with systemd v196). Radu ___ 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 V2] connman: upgrade to 1.10
On 01/11/2013 07:35 AM, Iorga, Cristian wrote: Hello Richard, Saul, Which versions of connman upgrade patches were used? V2 or V3? I used the V2 version since that what I had available, I wanted to get a sanity run it for that and the gcc multilib changes (which also broke gcc-runtime). Sau! Also, does the issue will be present with V3 also? The v3 patch should split out the qemu change from the patch and it should be 3 patches total. Sau! Regards, Cristian -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Richard Purdie Sent: Friday, January 11, 2013 5:12 PM To: Burton, Ross Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH V2] connman: upgrade to 1.10 On Thu, 2013-01-10 at 23:59 +, Richard Purdie wrote: On Thu, 2013-01-10 at 20:26 +, Burton, Ross wrote: On 10 January 2013 18:42, Cristian Iorga wrote: 0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch - adapted to the new version 0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch - patch removed (it is included in the new version) inet-fix-ip-cleanup-functions.patch: added - fix for ip cleanup functions Signed-off-by: Constantin Musca Signed-off-by: Cristian Iorga Also document the point of connman-conf. diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 5d59a7f..41fe552 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -10,6 +10,8 @@ XSERVER ?= "xserver-xorg \ MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen" +MACHINEOVERRIDES .= ":qemu" + Please submit this as a separate patch, it's effectively unrelated to connman. Please don't use "qemu", use something like qemuall or allqemu since I have some thoughts about how this might interact with the qemu class, most involving the word "badly" ;-). Saul included this change in MUT on the autobuilders. I've just lost a load of time wondering why we had an odd world autobuilder failure: http://autobuilder.yoctoproject.org:8010/builders/nightly-world/builds/439/steps/shell_43/logs/stdio This override patch was why :(. Cheers, Richard ___ 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] [CONSOLIDATED PULL 00/28] Automake patches & other fixes
Richard,
Another batch of automake related changes from Marko (Thanks Marko!)
Along with some other fixes and patches, I have again included the
cairo patch as I am not sure what your objection to it is.
Sau!
The following changes since commit 1e63a3b7b7915d40bb59976a02b9f53968997ed3:
linux-libc-headers: fix headers install in long path name environments
(2013-01-10 23:53:47 +)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
Chen Qi (1):
initscripts: remove finish.sh
Constantin Musca (1):
gcc: add missing dependency (zlib)
Eric Bénard (1):
gitignore: only ignore meta- directories
Felipe F. Tonello (1):
connman: fixed init script so connman can runs over nfs
Hongxu Jia (2):
qemu-native:add option march to BUILD_CFLAGS
glib-2.0-native:add option march to BUILD_CFLAGS
Marko Lindqvist (17):
libxdamage: update to upstream version 1.1.4
coreutils: fix license segment md5sum boundary
help2man: update to upstream version 1.40.13
dbus-glib: replace obsolete automake macros with working ones
tslib: replace obsolete automake macros with working ones
makedepend: replace obsolete automake macros with working ones
alsa-lib: replace obsolete automake macros with working ones
python: replace obsolete automake macros with working ones
libogg: replace obsolete automake macros with working ones
libmad: replace obsolete automake macros with working ones
libvorbis: replace obsolete automake macros with working ones
opensp: replace obsolete automake macros with working ones
gconf: replace obsolete automake macros with working ones
startup-notification: replace obsolete automake macros with working
ones
gtk+: replace obsolete automake macros with working ones
gmp: replace obsolete automake macros with working ones
bluez4: replace obsolete automake macros with working ones
Martin Ertsaas (4):
sanity: Make the required utilities more platform specific.
sstate: Do not add the --no-run-if-empty arguement to xargs when on
Darwin, as it is not supported.
quilt: Remove non-gnu.patch, and added configure flags for darwin.
quilt: Don't use BUILD_ROOT on darwin.
Noor Ahsan (1):
cairo: Adds libxext in X11DEPENDS.
.gitignore | 4 +-
meta/classes/sanity.bbclass| 10 +-
meta/classes/sstate.bbclass| 10 +-
.../bluez4-4.101/obsolete_automake_macros.patch| 14 ++
meta/recipes-connectivity/bluez/bluez4_4.101.bb| 6 +-
meta/recipes-connectivity/connman/connman/connman | 6 +-
meta/recipes-core/coreutils/coreutils_8.14.bb | 2 +-
.../dbus-glib-0.100/obsolete_automake_macros.patch | 15 ++
meta/recipes-core/dbus/dbus-glib.inc | 1 +
meta/recipes-core/dbus/dbus-glib_0.100.bb | 2 +-
meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb | 7 +-
.../initscripts/initscripts-1.0/finish.sh | 14 --
meta/recipes-core/initscripts/initscripts_1.0.bb | 7 +-
meta/recipes-devtools/gcc/gcc-4.7.inc | 4 +-
...native_1.38.2.bb => help2man-native_1.40.13.bb} | 6 +-
.../opensp-1.5.2/obsolete_automake_macros.patch| 15 ++
meta/recipes-devtools/opensp/opensp_1.5.2.bb | 6 +-
.../obsolete_automake_macros.patch | 14 ++
meta/recipes-devtools/python/python-dbus_1.1.1.bb | 6 +-
.../obsolete_automake_macros.patch | 23 +++
.../python/python-pygobject_2.27.91.bb | 6 +-
meta/recipes-devtools/qemu/qemu.inc| 5 +
meta/recipes-devtools/quilt/quilt-0.60.inc | 9 +-
meta/recipes-devtools/quilt/quilt-native.inc | 1 -
meta/recipes-devtools/quilt/quilt/non-gnu.patch| 225 -
.../gconf-3.2.5/obsolete_automake_macros.patch | 14 ++
meta/recipes-gnome/gnome/gconf_3.2.5.bb| 6 +-
.../gtk+-2.24.14/obsolete_automake_macros.patch| 23 +++
meta/recipes-gnome/gtk+/gtk+_2.24.14.bb| 1 +
meta/recipes-graphics/cairo/cairo.inc | 6 +-
.../obsolete_automake_macros.patch | 15 ++
.../startup-notification_0.12.bb | 4 +-
.../tslib/tslib/obsolete_automake_macros.patch | 15 ++
meta/recipes-graphics/tslib/tslib_1.0.bb | 6 +-
.../{libxdamage_1.1.3.bb => libxdamage_1.1.4.bb} | 6 +-
.../obsolete_automake_macros.patch | 15 ++
.../recipes-graphics/xorg-util/makedepend_1.0.4.bb | 4 +-
.../alsa-lib-1.0.25/obsolete_automake_macros.patch | 15 ++
meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb| 6 +-
.../libmad/libmad/obsolete_automake_macros.patch | 14 ++
meta/recipes-multimedia/libmad/libmad_0.15.1b.bb | 6 +-
.../libogg-1.3.0/obsolete_automake_macros.patch| 14 ++
meta/recipes-multimedia/libogg/libogg_1.3.0.bb | 6 +-
.../libvorbis
[OE-core] [PATCH 2/5] lttng2-ust: rename to lttng-ust
From: Tom Zanussi
recipes-kernel/lttng/lttng-ust was removed by a previous patch, which
also removed the naming conflict that caused the lttng-2.0 version of
lttng-ust to be named lttng2-ust. lttng2-ust was the only lttng-2.0
recipe to be named in this way and since that was entirely due to the
conflict, we can go back to the consistent naming for it.
Signed-off-by: Tom Zanussi
---
meta-yocto/conf/distro/include/distro_alias.inc | 1 -
meta-yocto/conf/distro/include/maintainers.inc | 1 -
meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | 2 +-
meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb | 2 +-
.../lttng-2.0/{lttng2-ust_2.1.0.bb => lttng-ust_2.1.0.bb}| 5 +
5 files changed, 7 insertions(+), 4 deletions(-)
rename meta/recipes-kernel/lttng-2.0/{lttng2-ust_2.1.0.bb =>
lttng-ust_2.1.0.bb} (87%)
diff --git a/meta-yocto/conf/distro/include/distro_alias.inc
b/meta-yocto/conf/distro/include/distro_alias.inc
index 0699c5f..1994e27 100644
--- a/meta-yocto/conf/distro/include/distro_alias.inc
+++ b/meta-yocto/conf/distro/include/distro_alias.inc
@@ -226,7 +226,6 @@ DISTRO_PN_ALIAS_pn-lttng-modules = "OSPDT
upstream=http://lttng.org/";
DISTRO_PN_ALIAS_pn-lttng-tools = "OSPDT upstream=http://lttng.org/";
DISTRO_PN_ALIAS_pn-lttng-ust = "OSPDT upstream=http://lttng.org/";
DISTRO_PN_ALIAS_pn-lttng-viewer = "OSPDT upstream=http://lttng.org/";
-DISTRO_PN_ALIAS_pn-lttng2-ust = "OSPDT upstream=http://lttng.org/";
DISTRO_PN_ALIAS_pn-makedepend = "Mandriva=makedepend Ubuntu=xutils-dev"
DISTRO_PN_ALIAS_pn-makedevs = "OE-Core"
DISTRO_PN_ALIAS_pn-matchbox-config-gtk = "OpenedHand"
diff --git a/meta-yocto/conf/distro/include/maintainers.inc
b/meta-yocto/conf/distro/include/maintainers.inc
index 5efb7d0..6de57dc 100644
--- a/meta-yocto/conf/distro/include/maintainers.inc
+++ b/meta-yocto/conf/distro/include/maintainers.inc
@@ -490,7 +490,6 @@ RECIPE_MAINTAINER_pn-lsbtest = "Yi Zhao
"
RECIPE_MAINTAINER_pn-lsb = "Yi Zhao "
RECIPE_MAINTAINER_pn-lsof = "Bogdan Marinescu "
RECIPE_MAINTAINER_pn-ltp = "Mihai Lindner "
-RECIPE_MAINTAINER_pn-lttng2-ust = "Bogdan Marinescu
"
RECIPE_MAINTAINER_pn-lttng-control = "Bogdan Marinescu
"
RECIPE_MAINTAINER_pn-lttng-modules = "Bogdan Marinescu
"
RECIPE_MAINTAINER_pn-lttng-tools = "Bogdan Marinescu
"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 591f33f..8f40c4e 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -46,7 +46,7 @@ SYSTEMTAP_aarch64 = ""
# which means we can not use syscall() to call it. So we ignore
# it for x86_64/uclibc
-LTTNGUST = "lttng2-ust"
+LTTNGUST = "lttng-ust"
LTTNGUST_libc-uclibc = ""
LTTNGUST_mips = ""
LTTNGUST_aarch64 = ""
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
index 482b9a6..16e1ccc 100644
--- a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
+++ b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"
-DEPENDS = "liburcu popt lttng2-ust"
+DEPENDS = "liburcu popt lttng-ust"
SRCREV = "917f768512b5d336d553b801f6c5308d90252a89"
PV = "v2.1.0"
diff --git a/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb
b/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
similarity index 87%
rename from meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb
rename to meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
index 439e006..1076bde 100644
--- a/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb
+++ b/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
@@ -12,6 +12,11 @@ inherit autotools
DEPENDS = "liburcu util-linux"
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "lttng2-ust"
+RREPLACES_${PN} = "lttng2-ust"
+RCONFLICTS_${PN} = "lttng2-ust"
+
SRCREV = "0c9ad44b7604040dfcd1e67b18afc3dc5d025b19"
PV = "2.1.0"
PR = "r0"
--
1.7.11.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] lttng: remove references to legacy lttng recipes
From: Tom Zanussi 'legacy' lttng was removed, so we need to remove the references to the legacy lttng recipes, namely lttng-control and lttng-viewer. Signed-off-by: Tom Zanussi --- meta-yocto/conf/distro/include/distro_alias.inc | 2 -- meta-yocto/conf/distro/include/maintainers.inc | 2 -- meta-yocto/conf/distro/include/recipe_color.inc | 2 -- 3 files changed, 6 deletions(-) diff --git a/meta-yocto/conf/distro/include/distro_alias.inc b/meta-yocto/conf/distro/include/distro_alias.inc index 1994e27..879ae60 100644 --- a/meta-yocto/conf/distro/include/distro_alias.inc +++ b/meta-yocto/conf/distro/include/distro_alias.inc @@ -221,11 +221,9 @@ DISTRO_PN_ALIAS_pn-lsbinitscripts = "Windriver" DISTRO_PN_ALIAS_pn-lsbsetup = "Windriver" DISTRO_PN_ALIAS_pn-lsbtest = "Windriver" DISTRO_PN_ALIAS_pn-ltp = "Ubuntu=ltp" -DISTRO_PN_ALIAS_pn-lttng-control = "OSPDT upstream=http://lttng.org/"; DISTRO_PN_ALIAS_pn-lttng-modules = "OSPDT upstream=http://lttng.org/"; DISTRO_PN_ALIAS_pn-lttng-tools = "OSPDT upstream=http://lttng.org/"; DISTRO_PN_ALIAS_pn-lttng-ust = "OSPDT upstream=http://lttng.org/"; -DISTRO_PN_ALIAS_pn-lttng-viewer = "OSPDT upstream=http://lttng.org/"; DISTRO_PN_ALIAS_pn-makedepend = "Mandriva=makedepend Ubuntu=xutils-dev" DISTRO_PN_ALIAS_pn-makedevs = "OE-Core" DISTRO_PN_ALIAS_pn-matchbox-config-gtk = "OpenedHand" diff --git a/meta-yocto/conf/distro/include/maintainers.inc b/meta-yocto/conf/distro/include/maintainers.inc index 6de57dc..69595b3 100644 --- a/meta-yocto/conf/distro/include/maintainers.inc +++ b/meta-yocto/conf/distro/include/maintainers.inc @@ -490,11 +490,9 @@ RECIPE_MAINTAINER_pn-lsbtest = "Yi Zhao " RECIPE_MAINTAINER_pn-lsb = "Yi Zhao " RECIPE_MAINTAINER_pn-lsof = "Bogdan Marinescu " RECIPE_MAINTAINER_pn-ltp = "Mihai Lindner " -RECIPE_MAINTAINER_pn-lttng-control = "Bogdan Marinescu " RECIPE_MAINTAINER_pn-lttng-modules = "Bogdan Marinescu " RECIPE_MAINTAINER_pn-lttng-tools = "Bogdan Marinescu " RECIPE_MAINTAINER_pn-lttng-ust = "Bogdan Marinescu " -RECIPE_MAINTAINER_pn-lttng-viewer = "Constantin Musca " RECIPE_MAINTAINER_pn-lzop-native = "Saul Wold " RECIPE_MAINTAINER_pn-lzop = "Saul Wold " RECIPE_MAINTAINER_pn-lzo = "Radu Moisan " diff --git a/meta-yocto/conf/distro/include/recipe_color.inc b/meta-yocto/conf/distro/include/recipe_color.inc index 012f5e2..2c9a5c6 100644 --- a/meta-yocto/conf/distro/include/recipe_color.inc +++ b/meta-yocto/conf/distro/include/recipe_color.inc @@ -250,9 +250,7 @@ RECIPE_COLOR_pn-lighttpd = "yellow" RECIPE_COLOR_pn-linuxdoc-tools = "yellow" RECIPE_COLOR_pn-loudmouth = "red" RECIPE_COLOR_pn-lrzsz="yellow" -RECIPE_COLOR_pn-lttng-control = "yellow" RECIPE_COLOR_pn-lttng-ust = "yellow" -RECIPE_COLOR_pn-lttng-viewer = "yellow" RECIPE_COLOR_pn-makedevs = "yellow" RECIPE_COLOR_pn-man = "red" RECIPE_COLOR_pn-man-pages = "red" -- 1.7.11.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/5] Remove legacy lttng
From: Tom Zanussi
This patchset removes legacy lttng, which hasn't been operational in
Yocto for awhile now. lttng-2.0 is the current version, which was
recently updated and now does work.
With legacy lttng gone, lttng-2.0 can be renamed back to lttng, which
this patchset also does.
Tested on crownbay (kernel and userspace).
v2 changes:
- added upgrade path for lttng2->lttng rename
- since the original posting, lttng-2.0 was upgraded, so the original
patchset had to be rebased on top of that
The following changes since commit 53cc748b93e8af584557d6db5309c3e955182c5c:
linux-libc-headers: fix headers install in long path name environments
(2013-01-10 23:53:51 +)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib.git tzanussi/rm-legacy-lttng-v2
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/rm-legacy-lttng-v2
Tom Zanussi (5):
lttng: remove 'legacy' lttng
lttng2-ust: rename to lttng-ust
recipes-kernel/lttng-2.0: rename to recipes-kernel/lttng
lttng: remove references to legacy lttng recipes
recipe_color.inc: add lttng recipes
meta-yocto/conf/distro/include/distro_alias.inc| 3 --
meta-yocto/conf/distro/include/maintainers.inc | 3 --
meta-yocto/conf/distro/include/recipe_color.inc| 5 +--
.../packagegroup-core-tools-profile.bb | 2 +-
.../{lttng-2.0 => lttng}/babeltrace_1.0.0.bb | 0
meta/recipes-kernel/lttng/lttng-control_0.89.bb| 23
...modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 0
.../{lttng-2.0 => lttng}/lttng-modules_2.1.0.bb| 0
.../{lttng-2.0 => lttng}/lttng-tools_2.1.0.bb | 2 +-
meta/recipes-kernel/lttng/lttng-ust_0.16.bb| 32 -
.../lttng-ust_2.1.0.bb}| 5 +++
.../lttng-viewer/add_linkage_to_lttvwindow.patch | 42 --
meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb | 40 -
13 files changed, 10 insertions(+), 147 deletions(-)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/babeltrace_1.0.0.bb (100%)
delete mode 100644 meta/recipes-kernel/lttng/lttng-control_0.89.bb
rename meta/recipes-kernel/{lttng-2.0 =>
lttng}/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
(100%)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-modules_2.1.0.bb (100%)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-tools_2.1.0.bb (97%)
delete mode 100644 meta/recipes-kernel/lttng/lttng-ust_0.16.bb
rename meta/recipes-kernel/{lttng-2.0/lttng2-ust_2.1.0.bb =>
lttng/lttng-ust_2.1.0.bb} (87%)
delete mode 100644
meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
--
1.7.11.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] recipes-kernel/lttng-2.0: rename to recipes-kernel/lttng
From: Tom Zanussi
recipes-kernel/lttng was removed by a previous patch, which also
removed the naming conflict that caused the lttng-2.0 version of lttng
to be named recipes-kernel/lttng-2.0. Since the naming conflict has
disappeared, we can go back to the simpler naming.
Signed-off-by: Tom Zanussi
---
meta/recipes-kernel/{lttng-2.0 => lttng}/babeltrace_1.0.0.bb | 0
.../lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 0
meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-modules_2.1.0.bb | 0
meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-tools_2.1.0.bb | 0
meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-ust_2.1.0.bb | 0
5 files changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/babeltrace_1.0.0.bb (100%)
rename meta/recipes-kernel/{lttng-2.0 =>
lttng}/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
(100%)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-modules_2.1.0.bb (100%)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-tools_2.1.0.bb (100%)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-ust_2.1.0.bb (100%)
diff --git a/meta/recipes-kernel/lttng-2.0/babeltrace_1.0.0.bb
b/meta/recipes-kernel/lttng/babeltrace_1.0.0.bb
similarity index 100%
rename from meta/recipes-kernel/lttng-2.0/babeltrace_1.0.0.bb
rename to meta/recipes-kernel/lttng/babeltrace_1.0.0.bb
diff --git
a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
b/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
similarity index 100%
rename from
meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
rename to
meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.1.0.bb
b/meta/recipes-kernel/lttng/lttng-modules_2.1.0.bb
similarity index 100%
rename from meta/recipes-kernel/lttng-2.0/lttng-modules_2.1.0.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.1.0.bb
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
b/meta/recipes-kernel/lttng/lttng-tools_2.1.0.bb
similarity index 100%
rename from meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
rename to meta/recipes-kernel/lttng/lttng-tools_2.1.0.bb
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
b/meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb
similarity index 100%
rename from meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
rename to meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb
--
1.7.11.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] lttng: remove 'legacy' lttng
From: Tom Zanussi
This removes 'legacy' lttng - it hasn't actually worked for awhile
now, and has been replaced by equivalent functionality in
recipes-kernel/lttng-2.0 (which will be renamed to lttng in a
follow-up patch).
Fixes [YOCTO #3303].
Signed-off-by: Tom Zanussi
---
meta/recipes-kernel/lttng/lttng-control_0.89.bb| 23
meta/recipes-kernel/lttng/lttng-ust_0.16.bb| 32 -
.../lttng-viewer/add_linkage_to_lttvwindow.patch | 42 --
meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb | 40 -
4 files changed, 137 deletions(-)
delete mode 100644 meta/recipes-kernel/lttng/lttng-control_0.89.bb
delete mode 100644 meta/recipes-kernel/lttng/lttng-ust_0.16.bb
delete mode 100644
meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
diff --git a/meta/recipes-kernel/lttng/lttng-control_0.89.bb
b/meta/recipes-kernel/lttng/lttng-control_0.89.bb
deleted file mode 100644
index 77314c8..000
--- a/meta/recipes-kernel/lttng/lttng-control_0.89.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SECTION = "devel"
-SUMMARY = "Linux Trace Toolkit Control"
-DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
-extract program execution details from the Linux operating system and \
-interpret them."
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-PR = "r0"
-
-LTTDATE = "05122011"
-
-SRC_URI = "http://lttng.org/files/lttng/ltt-control-${PV}-${LTTDATE}.tar.gz";
-
-SRC_URI[md5sum] = "2e5a531bf5cab88eef5282b45271789f"
-SRC_URI[sha256sum] =
"feb120e0bedd9ef8917dd14ee96cc94941f517826a4c2035d1c4aa33e4e808ab"
-
-S = "${WORKDIR}/ltt-control-${PV}-${LTTDATE}"
-
-inherit autotools
-
-export KERNELDIR="${STAGING_KERNEL_DIR}"
-
-FILES_${PN} += "${datadir}/ltt-control/facilities/*"
diff --git a/meta/recipes-kernel/lttng/lttng-ust_0.16.bb
b/meta/recipes-kernel/lttng/lttng-ust_0.16.bb
deleted file mode 100644
index 3618a2d..000
--- a/meta/recipes-kernel/lttng/lttng-ust_0.16.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY = "Linux Trace Toolkit Userspace Tracer"
-DESCRIPTION = "The LTTng Userspace Tracer (UST) is a library accompanied by a
set of tools to trace userspace code"
-HOMEPAGE = "http://lttng.org/ust";
-BUGTRACKER = "http://lttng.org/project/issues";
-
-LICENSE = "LGPLv2.1+ & BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \
-
file://ustctl/ustctl.c;endline=16;md5=b50c6fa0307175bb1ce0db49d752c03b \
-
file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44"
-
-DEPENDS = "liburcu"
-
-PR = "r1"
-PE = "1"
-
-SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz";
-
-SRC_URI[md5sum] = "8e5d5de47bfff29f50439d192ad1e478"
-SRC_URI[sha256sum] =
"88167741b1fbf335e006f0208d8c41784705e28adac84df71d3d9f6c58191dab"
-
-
-S = "${WORKDIR}/ust-${PV}"
-
-inherit autotools
-
-#EXTRA_OECONF = "ac_cv_lib_urcu_bp_synchronize_rcu_bp=no"
-
-# Due to liburcu not building on MIPS currently this recipe needs to
-# be limited also.
-# So here let us first suppport x86/arm/powerpc platforms now.
-COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux.*'
-
diff --git
a/meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
b/meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
deleted file mode 100644
index 4a135df..000
--- a/meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Explicitly add linkage to lttvwindow.
-
-Without the fix, lttv-gui inside target can't run, complaining
-"undefined symbol: LTTV_VIEWER_CONSTRUCTORS".
-
-Tue May 3 21:39:37 CST 2011
-
-Signed-off-by: Dexuan Cui
-
-diff --git a/lttv/modules/gui/common.am b/lttv/modules/gui/common.am
-index ce50113..89083aa 100644
a/lttv/modules/gui/common.am
-+++ b/lttv/modules/gui/common.am
-@@ -21,3 +21,4 @@ AM_LDFLAGS = $(MODULE_LDFLAGS)
-
- libdir = ${lttvplugindir}
-
-+LIBS += $(GTK_LIBS) -L${top_builddir}/lttv/modules/gui/lttvwindow/lttvwindow
-llttvwindow
-diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
b/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
-index c953fc9..489d640 100644
a/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
-+++ b/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
-@@ -1,13 +1,14 @@
- ## Process this file with automake to produce Makefile.in
-
--include ../../common.am
--
- INCLUDES = \
- -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- $(DEFAULT_INCLUDES)
-
--#libdir = ${lttvplugindir}
-+AM_CFLAGS = $(MODULE_CFLAGS)
-+AM_LDFLAGS = $(MODULE_LDFLAGS)
-+
-+libdir = ${lttvplugindir}
-
- lib_LTLIBRARIES = liblttvwindow.la
-
diff --git a/meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
b/meta
[OE-core] [PATCH 5/5] recipe_color.inc: add lttng recipes
From: Tom Zanussi Add entries for the new lttng-2.0 recipes lttng-modules, lttng-tools, and babeltrace, to maintain consistency. Signed-off-by: Tom Zanussi --- meta-yocto/conf/distro/include/recipe_color.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-yocto/conf/distro/include/recipe_color.inc b/meta-yocto/conf/distro/include/recipe_color.inc index 2c9a5c6..9402a93 100644 --- a/meta-yocto/conf/distro/include/recipe_color.inc +++ b/meta-yocto/conf/distro/include/recipe_color.inc @@ -250,7 +250,10 @@ RECIPE_COLOR_pn-lighttpd = "yellow" RECIPE_COLOR_pn-linuxdoc-tools = "yellow" RECIPE_COLOR_pn-loudmouth = "red" RECIPE_COLOR_pn-lrzsz="yellow" +RECIPE_COLOR_pn-lttng-modules = "yellow" +RECIPE_COLOR_pn-lttng-tools = "yellow" RECIPE_COLOR_pn-lttng-ust = "yellow" +RECIPE_COLOR_pn-babeltrace = "yellow" RECIPE_COLOR_pn-makedevs = "yellow" RECIPE_COLOR_pn-man = "red" RECIPE_COLOR_pn-man-pages = "red" -- 1.7.11.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] alsa-utils: add bash as a dependency of the alsa-utils-alsaconf rpm.
ack
*Andrei Gherzan*
mobile +40.744.478.414 fax +40.31.816.28.12
Email: and...@gherzan.ro
Email: andrei.gher...@windriver.com
Romania
On Thu, Jan 10, 2013 at 9:01 AM, Florin Sarbu wrote:
> alsa-utils-alsaconf rpm contains the bash script alsaconf. In order
> to have the do_rootfs not error when bash is not brought along in
> the rootfs as an explicit dependency, we add it as a dependency
> of alsa-utils.
>
> Signed-off-by: Florin Sarbu
> ---
> meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb |1 +
> 1 file changed, 1 insertion(+)
>
> diff --git
> a/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bbb/meta/recipes-multimedia/alsa/
> alsa-utils_1.0.25.bb
> index 4990eb0..a76985c 100644
> --- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb
> +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb
> @@ -47,6 +47,7 @@ ALSA_UTILS_PKGS = "\
>
> PACKAGES += "${ALSA_UTILS_PKGS}"
> RDEPENDS_${PN} += "${ALSA_UTILS_PKGS}"
> +RDEPENDS_alsa-utils-alsaconf += "bash"
>
> # We omit alsaconf, because
> # a) this is a bash script
> --
> 1.7.10.4
>
>
> ___
> 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 2/5] lttng2-ust: rename to lttng-ust
On 01/11/2013 11:20 AM, tom.zanu...@intel.com wrote:
From: Tom Zanussi
recipes-kernel/lttng/lttng-ust was removed by a previous patch, which
also removed the naming conflict that caused the lttng-2.0 version of
lttng-ust to be named lttng2-ust. lttng2-ust was the only lttng-2.0
recipe to be named in this way and since that was entirely due to the
conflict, we can go back to the consistent naming for it.
Signed-off-by: Tom Zanussi
---
meta-yocto/conf/distro/include/distro_alias.inc | 1 -
meta-yocto/conf/distro/include/maintainers.inc | 1 -
These need to be in a sperate patch to poky@yoctoproject, they are not
part of OE-Core.
Thanks
Sau!
meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | 2 +-
meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb | 2 +-
.../lttng-2.0/{lttng2-ust_2.1.0.bb => lttng-ust_2.1.0.bb}| 5 +
5 files changed, 7 insertions(+), 4 deletions(-)
rename meta/recipes-kernel/lttng-2.0/{lttng2-ust_2.1.0.bb =>
lttng-ust_2.1.0.bb} (87%)
diff --git a/meta-yocto/conf/distro/include/distro_alias.inc
b/meta-yocto/conf/distro/include/distro_alias.inc
index 0699c5f..1994e27 100644
--- a/meta-yocto/conf/distro/include/distro_alias.inc
+++ b/meta-yocto/conf/distro/include/distro_alias.inc
@@ -226,7 +226,6 @@ DISTRO_PN_ALIAS_pn-lttng-modules = "OSPDT
upstream=http://lttng.org/";
DISTRO_PN_ALIAS_pn-lttng-tools = "OSPDT upstream=http://lttng.org/";
DISTRO_PN_ALIAS_pn-lttng-ust = "OSPDT upstream=http://lttng.org/";
DISTRO_PN_ALIAS_pn-lttng-viewer = "OSPDT upstream=http://lttng.org/";
-DISTRO_PN_ALIAS_pn-lttng2-ust = "OSPDT upstream=http://lttng.org/";
DISTRO_PN_ALIAS_pn-makedepend = "Mandriva=makedepend Ubuntu=xutils-dev"
DISTRO_PN_ALIAS_pn-makedevs = "OE-Core"
DISTRO_PN_ALIAS_pn-matchbox-config-gtk = "OpenedHand"
diff --git a/meta-yocto/conf/distro/include/maintainers.inc
b/meta-yocto/conf/distro/include/maintainers.inc
index 5efb7d0..6de57dc 100644
--- a/meta-yocto/conf/distro/include/maintainers.inc
+++ b/meta-yocto/conf/distro/include/maintainers.inc
@@ -490,7 +490,6 @@ RECIPE_MAINTAINER_pn-lsbtest = "Yi Zhao
"
RECIPE_MAINTAINER_pn-lsb = "Yi Zhao "
RECIPE_MAINTAINER_pn-lsof = "Bogdan Marinescu "
RECIPE_MAINTAINER_pn-ltp = "Mihai Lindner "
-RECIPE_MAINTAINER_pn-lttng2-ust = "Bogdan Marinescu
"
RECIPE_MAINTAINER_pn-lttng-control = "Bogdan Marinescu
"
RECIPE_MAINTAINER_pn-lttng-modules = "Bogdan Marinescu
"
RECIPE_MAINTAINER_pn-lttng-tools = "Bogdan Marinescu
"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 591f33f..8f40c4e 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -46,7 +46,7 @@ SYSTEMTAP_aarch64 = ""
# which means we can not use syscall() to call it. So we ignore
# it for x86_64/uclibc
-LTTNGUST = "lttng2-ust"
+LTTNGUST = "lttng-ust"
LTTNGUST_libc-uclibc = ""
LTTNGUST_mips = ""
LTTNGUST_aarch64 = ""
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
index 482b9a6..16e1ccc 100644
--- a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
+++ b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"
-DEPENDS = "liburcu popt lttng2-ust"
+DEPENDS = "liburcu popt lttng-ust"
SRCREV = "917f768512b5d336d553b801f6c5308d90252a89"
PV = "v2.1.0"
diff --git a/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb
b/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
similarity index 87%
rename from meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb
rename to meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
index 439e006..1076bde 100644
--- a/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb
+++ b/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
@@ -12,6 +12,11 @@ inherit autotools
DEPENDS = "liburcu util-linux"
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "lttng2-ust"
+RREPLACES_${PN} = "lttng2-ust"
+RCONFLICTS_${PN} = "lttng2-ust"
+
SRCREV = "0c9ad44b7604040dfcd1e67b18afc3dc5d025b19"
PV = "2.1.0"
PR = "r0"
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] Remove legacy lttng
On 01/11/2013 11:20 AM, tom.zanu...@intel.com wrote:
From: Tom Zanussi
This patchset removes legacy lttng, which hasn't been operational in
Yocto for awhile now. lttng-2.0 is the current version, which was
recently updated and now does work.
With legacy lttng gone, lttng-2.0 can be renamed back to lttng, which
this patchset also does.
Tested on crownbay (kernel and userspace).
v2 changes:
- added upgrade path for lttng2->lttng rename
- since the original posting, lttng-2.0 was upgraded, so the original
patchset had to be rebased on top of that
The following changes since commit 53cc748b93e8af584557d6db5309c3e955182c5c:
linux-libc-headers: fix headers install in long path name environments
(2013-01-10 23:53:51 +)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib.git tzanussi/rm-legacy-lttng-v2
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/rm-legacy-lttng-v2
Tom Zanussi (5):
lttng: remove 'legacy' lttng
lttng2-ust: rename to lttng-ust
recipes-kernel/lttng-2.0: rename to recipes-kernel/lttng
lttng: remove references to legacy lttng recipes
recipe_color.inc: add lttng recipes
These last 2 should go to p...@yoctoproject.org
Thanks
Sau!
meta-yocto/conf/distro/include/distro_alias.inc| 3 --
meta-yocto/conf/distro/include/maintainers.inc | 3 --
meta-yocto/conf/distro/include/recipe_color.inc| 5 +--
.../packagegroup-core-tools-profile.bb | 2 +-
.../{lttng-2.0 => lttng}/babeltrace_1.0.0.bb | 0
meta/recipes-kernel/lttng/lttng-control_0.89.bb| 23
...modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 0
.../{lttng-2.0 => lttng}/lttng-modules_2.1.0.bb| 0
.../{lttng-2.0 => lttng}/lttng-tools_2.1.0.bb | 2 +-
meta/recipes-kernel/lttng/lttng-ust_0.16.bb| 32 -
.../lttng-ust_2.1.0.bb}| 5 +++
.../lttng-viewer/add_linkage_to_lttvwindow.patch | 42 --
meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb | 40 -
13 files changed, 10 insertions(+), 147 deletions(-)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/babeltrace_1.0.0.bb (100%)
delete mode 100644 meta/recipes-kernel/lttng/lttng-control_0.89.bb
rename meta/recipes-kernel/{lttng-2.0 =>
lttng}/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch (100%)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-modules_2.1.0.bb (100%)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-tools_2.1.0.bb (97%)
delete mode 100644 meta/recipes-kernel/lttng/lttng-ust_0.16.bb
rename meta/recipes-kernel/{lttng-2.0/lttng2-ust_2.1.0.bb =>
lttng/lttng-ust_2.1.0.bb} (87%)
delete mode 100644
meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] xz: LICENSE field is wrong
xz contains a GPLv3 m4 macro which is used at build time, this does not make the installed or runtime items GPLv3, which is what the LICESNE field pertains to, therefor remove it from the LICENSE field. Signed-off-by: Saul Wold --- meta/recipes-extended/xz/xz_5.1.2alpha.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/xz/xz_5.1.2alpha.bb b/meta/recipes-extended/xz/xz_5.1.2alpha.bb index 9d68720..93099b0 100644 --- a/meta/recipes-extended/xz/xz_5.1.2alpha.bb +++ b/meta/recipes-extended/xz/xz_5.1.2alpha.bb @@ -2,7 +2,7 @@ DESCRIPTION = "utils for managing LZMA compressed files" HOMEPAGE = "http://tukaani.org/xz/"; SECTION = "base" -LICENSE = "GPLv2+ & GPLv3+ & LGPLv2.1+" +LICENSE = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \ file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ -- 1.8.0.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 00/21][RFC v3] systemd Integration
On 01/08/2013 04:24 AM, Radu Moisan wrote:
As Ross suggested I've done the following changes to the previous set:
* added two patches (the first two) that address multiple init systems support,\
as in shifting from default hardcoded sysvinit to something more generic while
the default values still remains on sysvinit
* moved automatic setting of PREFERRED_PROVIDER_udev into default_providers.inc
* removed ahavi-systemd since all it provided was service files; now service
files
are pulled in by avahi-daemon
* also rebased on master
The following changes since commit 7e1f8faad0c4b6f490c26f87acc698dd6e002b15:
perl: Remove bashism from perl-tests.inc (2013-01-07 22:37:37 +)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib rmoisan/systemd
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=rmoisan/systemd
Enrico Scholz (1):
systemd: move disable operation into prerm() script
Holger Hans Peter Freyther (2):
systemd: Make the main systemd files proper CONFFILES
systemd: Introduce a create-volatile to create tmp directories
White space 4 spaces vs tab
Khem Raj (1):
systemd: Fix build when base_libdir is not /lib
Martin Donnelly (2):
cgroups: Add INSANE_SKIP to avoid warning about .so file
systemd: Remove sysvinit mount related services if systemd is enabled
Martin Jansa (2):
systemd: fix FILESPATH to find systemctl
systemd: add PACKAGES_DYNAMIC
Radu Moisan (13):
default-distrovars: Add DISTRO_FEATURES_INITMAN to DISTRO_FEATURES
default-providers: Automatically set PREFERRED_PROVIDER_udev
systemd: initial integration
I believe this was mentioned before, but can you avoid making white
space changes, you seem to have changed tabs (which we use tabs for
shell based functions and 4 spaces for python based functions)
Specifically, I saw some changes in wpa-supplicant-1.0.inc, busybox,
dropbear, initscripts
For the systemd-serialgetty, can we not carry around a LICENSE file, and
instead point to the meta/files/common-licenses for a checksum?
Also a load of the patches do not contains Signed-off-by or
Upstream-Status tags.
systemd: Add systemd_base.bbclass
systemd: Add systemd option to PREFERRED_PROVIDER_udev
systemd: set default.target to multi-user.target
systemd: update FILESPATH with *-native directory
systemd: disable sysfs.service
White space changes, makes it much harder to review, please fix
systemd: Add systemd-compat-units
systemd: Add avahi to packagegroup-core-boot
xserver-nodm-init: Enable systemd support
util-linux: Enable systemd support
What's the actual change here? Whitespace?
systemd: Disable xz when building with GPLv3 incompatibility flag
This should go away, I have verified that the license field in xz is
wrong and should not contain GPLv3 since it's a build macro, not a
runtime, and the LICENSE field pertains to packaged and installed items
and their licenses.
Sau!
meta/classes/systemd.bbclass |1 +
meta/classes/systemd_base.bbclass | 218 +
meta/conf/distro/include/default-distrovars.inc|3 +-
meta/conf/distro/include/default-providers.inc |1 +
meta/recipes-bsp/keymaps/files/keymaps.service |9 +
meta/recipes-bsp/keymaps/keymaps_1.0.bb|9 +-
meta/recipes-connectivity/avahi/avahi.inc | 23 +-
meta/recipes-connectivity/connman/connman.inc |6 +
meta/recipes-connectivity/connman/connman_1.4.bb |3 +-
meta/recipes-connectivity/dhcp/dhcp.inc| 15 +-
meta/recipes-connectivity/dhcp/files/dhcpd.service | 12 +
.../dhcp/files/dhcrelay.service| 10 +
.../openssh/openssh-6.0p1/sshd.socket | 11 +
.../openssh/openssh-6.0p1/sshd@.service|9 +
.../openssh/openssh-6.0p1/sshdgenkeys.service | 10 +
meta/recipes-connectivity/openssh/openssh_6.0p1.bb | 14 +-
.../wpa-supplicant/wpa-supplicant-1.0.inc | 74 +++--
.../wpa-supplicant/wpa-supplicant_1.0.bb |2 +-
meta/recipes-core/busybox/busybox.inc | 18 ++
meta/recipes-core/busybox/busybox_1.20.2.bb|4 +-
.../busybox/files/busybox-klogd.service.in |8 +
.../busybox/files/busybox-syslog.service.in| 13 +
meta/recipes-core/dropbear/dropbear.inc| 81 ++---
.../recipes-core/dropbear/dropbear/dropbear.socket | 10 +
.../dropbear/dropbear/dropbear@.service|9 +
.../dropbear/dropbear/dropbearkey.service | 10 +
.../initscripts-1.0/{urandom => urandom.sh}|0
meta/recipes-core/initscripts/initscripts_1.0.bb | 164 +-
meta/recipes-core/libcgroup/libcgroup_0.37.1.bb|1 +
.../packagegroups/packagegroup-base.bb |3 +-
.../packagegroups/packagegroup-core-boot.bb|9 +-
meta/recipes-core/systemd/systemd-compat-units.bb |
[OE-core] [PATCH 0/3] Remove legacy lttng, v3
From: Tom Zanussi
This patchset removes legacy lttng, which hasn't been operational in
Yocto for awhile now. lttng-2.0 is the current version, which was
recently updated and now does work.
With legacy lttng gone, lttng-2.0 can be renamed back to lttng, which
this patchset also does.
Tested on crownbay (kernel and userspace).
v3 changes:
-still had some poky changes mixed in, removed now
v2 changes:
- remove the poky-specific patches from the patchset
- update the patch numbers
- added upgrade path for lttng2->lttng rename
- since the original posting, lttng-2.0 was upgraded, so the original
patchset had to be rebased on top of that
The following changes since commit 53cc748b93e8af584557d6db5309c3e955182c5c:
linux-libc-headers: fix headers install in long path name environments
(2013-01-10 23:53:51 +)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib.git tzanussi/rm-legacy-lttng-v3
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/rm-legacy-lttng-v3
Tom Zanussi (3):
lttng: remove 'legacy' lttng
lttng2-ust: rename to lttng-ust
recipes-kernel/lttng-2.0: rename to recipes-kernel/lttng
.../packagegroup-core-tools-profile.bb | 2 +-
.../{lttng-2.0 => lttng}/babeltrace_1.0.0.bb | 0
meta/recipes-kernel/lttng/lttng-control_0.89.bb| 23
...modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 0
.../{lttng-2.0 => lttng}/lttng-modules_2.1.0.bb| 0
.../{lttng-2.0 => lttng}/lttng-tools_2.1.0.bb | 2 +-
meta/recipes-kernel/lttng/lttng-ust_0.16.bb| 32 -
.../lttng-ust_2.1.0.bb}| 5 +++
.../lttng-viewer/add_linkage_to_lttvwindow.patch | 42 --
meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb | 40 -
10 files changed, 7 insertions(+), 139 deletions(-)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/babeltrace_1.0.0.bb (100%)
delete mode 100644 meta/recipes-kernel/lttng/lttng-control_0.89.bb
rename meta/recipes-kernel/{lttng-2.0 =>
lttng}/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
(100%)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-modules_2.1.0.bb (100%)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-tools_2.1.0.bb (97%)
delete mode 100644 meta/recipes-kernel/lttng/lttng-ust_0.16.bb
rename meta/recipes-kernel/{lttng-2.0/lttng2-ust_2.1.0.bb =>
lttng/lttng-ust_2.1.0.bb} (87%)
delete mode 100644
meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
--
1.7.11.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] recipes-kernel/lttng-2.0: rename to recipes-kernel/lttng
From: Tom Zanussi
recipes-kernel/lttng was removed by a previous patch, which also
removed the naming conflict that caused the lttng-2.0 version of lttng
to be named recipes-kernel/lttng-2.0. Since the naming conflict has
disappeared, we can go back to the simpler naming.
Signed-off-by: Tom Zanussi
---
meta/recipes-kernel/{lttng-2.0 => lttng}/babeltrace_1.0.0.bb | 0
.../lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 0
meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-modules_2.1.0.bb | 0
meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-tools_2.1.0.bb | 0
meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-ust_2.1.0.bb | 0
5 files changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/babeltrace_1.0.0.bb (100%)
rename meta/recipes-kernel/{lttng-2.0 =>
lttng}/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
(100%)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-modules_2.1.0.bb (100%)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-tools_2.1.0.bb (100%)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-ust_2.1.0.bb (100%)
diff --git a/meta/recipes-kernel/lttng-2.0/babeltrace_1.0.0.bb
b/meta/recipes-kernel/lttng/babeltrace_1.0.0.bb
similarity index 100%
rename from meta/recipes-kernel/lttng-2.0/babeltrace_1.0.0.bb
rename to meta/recipes-kernel/lttng/babeltrace_1.0.0.bb
diff --git
a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
b/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
similarity index 100%
rename from
meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
rename to
meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.1.0.bb
b/meta/recipes-kernel/lttng/lttng-modules_2.1.0.bb
similarity index 100%
rename from meta/recipes-kernel/lttng-2.0/lttng-modules_2.1.0.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.1.0.bb
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
b/meta/recipes-kernel/lttng/lttng-tools_2.1.0.bb
similarity index 100%
rename from meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
rename to meta/recipes-kernel/lttng/lttng-tools_2.1.0.bb
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
b/meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb
similarity index 100%
rename from meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
rename to meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb
--
1.7.11.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] lttng: remove 'legacy' lttng
From: Tom Zanussi
This removes 'legacy' lttng - it hasn't actually worked for awhile
now, and has been replaced by equivalent functionality in
recipes-kernel/lttng-2.0 (which will be renamed to lttng in a
follow-up patch).
Fixes [YOCTO #3303].
Signed-off-by: Tom Zanussi
---
meta/recipes-kernel/lttng/lttng-control_0.89.bb| 23
meta/recipes-kernel/lttng/lttng-ust_0.16.bb| 32 -
.../lttng-viewer/add_linkage_to_lttvwindow.patch | 42 --
meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb | 40 -
4 files changed, 137 deletions(-)
delete mode 100644 meta/recipes-kernel/lttng/lttng-control_0.89.bb
delete mode 100644 meta/recipes-kernel/lttng/lttng-ust_0.16.bb
delete mode 100644
meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
diff --git a/meta/recipes-kernel/lttng/lttng-control_0.89.bb
b/meta/recipes-kernel/lttng/lttng-control_0.89.bb
deleted file mode 100644
index 77314c8..000
--- a/meta/recipes-kernel/lttng/lttng-control_0.89.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SECTION = "devel"
-SUMMARY = "Linux Trace Toolkit Control"
-DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
-extract program execution details from the Linux operating system and \
-interpret them."
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-PR = "r0"
-
-LTTDATE = "05122011"
-
-SRC_URI = "http://lttng.org/files/lttng/ltt-control-${PV}-${LTTDATE}.tar.gz";
-
-SRC_URI[md5sum] = "2e5a531bf5cab88eef5282b45271789f"
-SRC_URI[sha256sum] =
"feb120e0bedd9ef8917dd14ee96cc94941f517826a4c2035d1c4aa33e4e808ab"
-
-S = "${WORKDIR}/ltt-control-${PV}-${LTTDATE}"
-
-inherit autotools
-
-export KERNELDIR="${STAGING_KERNEL_DIR}"
-
-FILES_${PN} += "${datadir}/ltt-control/facilities/*"
diff --git a/meta/recipes-kernel/lttng/lttng-ust_0.16.bb
b/meta/recipes-kernel/lttng/lttng-ust_0.16.bb
deleted file mode 100644
index 3618a2d..000
--- a/meta/recipes-kernel/lttng/lttng-ust_0.16.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY = "Linux Trace Toolkit Userspace Tracer"
-DESCRIPTION = "The LTTng Userspace Tracer (UST) is a library accompanied by a
set of tools to trace userspace code"
-HOMEPAGE = "http://lttng.org/ust";
-BUGTRACKER = "http://lttng.org/project/issues";
-
-LICENSE = "LGPLv2.1+ & BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \
-
file://ustctl/ustctl.c;endline=16;md5=b50c6fa0307175bb1ce0db49d752c03b \
-
file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44"
-
-DEPENDS = "liburcu"
-
-PR = "r1"
-PE = "1"
-
-SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz";
-
-SRC_URI[md5sum] = "8e5d5de47bfff29f50439d192ad1e478"
-SRC_URI[sha256sum] =
"88167741b1fbf335e006f0208d8c41784705e28adac84df71d3d9f6c58191dab"
-
-
-S = "${WORKDIR}/ust-${PV}"
-
-inherit autotools
-
-#EXTRA_OECONF = "ac_cv_lib_urcu_bp_synchronize_rcu_bp=no"
-
-# Due to liburcu not building on MIPS currently this recipe needs to
-# be limited also.
-# So here let us first suppport x86/arm/powerpc platforms now.
-COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux.*'
-
diff --git
a/meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
b/meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
deleted file mode 100644
index 4a135df..000
--- a/meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Explicitly add linkage to lttvwindow.
-
-Without the fix, lttv-gui inside target can't run, complaining
-"undefined symbol: LTTV_VIEWER_CONSTRUCTORS".
-
-Tue May 3 21:39:37 CST 2011
-
-Signed-off-by: Dexuan Cui
-
-diff --git a/lttv/modules/gui/common.am b/lttv/modules/gui/common.am
-index ce50113..89083aa 100644
a/lttv/modules/gui/common.am
-+++ b/lttv/modules/gui/common.am
-@@ -21,3 +21,4 @@ AM_LDFLAGS = $(MODULE_LDFLAGS)
-
- libdir = ${lttvplugindir}
-
-+LIBS += $(GTK_LIBS) -L${top_builddir}/lttv/modules/gui/lttvwindow/lttvwindow
-llttvwindow
-diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
b/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
-index c953fc9..489d640 100644
a/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
-+++ b/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
-@@ -1,13 +1,14 @@
- ## Process this file with automake to produce Makefile.in
-
--include ../../common.am
--
- INCLUDES = \
- -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- $(DEFAULT_INCLUDES)
-
--#libdir = ${lttvplugindir}
-+AM_CFLAGS = $(MODULE_CFLAGS)
-+AM_LDFLAGS = $(MODULE_LDFLAGS)
-+
-+libdir = ${lttvplugindir}
-
- lib_LTLIBRARIES = liblttvwindow.la
-
diff --git a/meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
b/meta
[OE-core] [PATCH 2/3] lttng2-ust: rename to lttng-ust
From: Tom Zanussi
recipes-kernel/lttng/lttng-ust was removed by a previous patch, which
also removed the naming conflict that caused the lttng-2.0 version of
lttng-ust to be named lttng2-ust. lttng2-ust was the only lttng-2.0
recipe to be named in this way and since that was entirely due to the
conflict, we can go back to the consistent naming for it.
Signed-off-by: Tom Zanussi
---
meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | 2 +-
meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb | 2 +-
.../lttng-2.0/{lttng2-ust_2.1.0.bb => lttng-ust_2.1.0.bb}| 5 +
3 files changed, 7 insertions(+), 2 deletions(-)
rename meta/recipes-kernel/lttng-2.0/{lttng2-ust_2.1.0.bb =>
lttng-ust_2.1.0.bb} (87%)
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 591f33f..8f40c4e 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -46,7 +46,7 @@ SYSTEMTAP_aarch64 = ""
# which means we can not use syscall() to call it. So we ignore
# it for x86_64/uclibc
-LTTNGUST = "lttng2-ust"
+LTTNGUST = "lttng-ust"
LTTNGUST_libc-uclibc = ""
LTTNGUST_mips = ""
LTTNGUST_aarch64 = ""
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
index 482b9a6..16e1ccc 100644
--- a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
+++ b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"
-DEPENDS = "liburcu popt lttng2-ust"
+DEPENDS = "liburcu popt lttng-ust"
SRCREV = "917f768512b5d336d553b801f6c5308d90252a89"
PV = "v2.1.0"
diff --git a/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb
b/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
similarity index 87%
rename from meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb
rename to meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
index 439e006..1076bde 100644
--- a/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb
+++ b/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
@@ -12,6 +12,11 @@ inherit autotools
DEPENDS = "liburcu util-linux"
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "lttng2-ust"
+RREPLACES_${PN} = "lttng2-ust"
+RCONFLICTS_${PN} = "lttng2-ust"
+
SRCREV = "0c9ad44b7604040dfcd1e67b18afc3dc5d025b19"
PV = "2.1.0"
PR = "r0"
--
1.7.11.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V6 6/6] core-image-sato: support read-only rootfs
On 01/07/2013 06:22 PM, ChenQi wrote: On 01/07/2013 06:30 PM, Otavio Salvador wrote: On Mon, Jan 7, 2013 at 1:06 AM, ChenQi wrote: On 01/07/2013 03:05 AM, Otavio Salvador wrote: On Sun, Jan 6, 2013 at 7:44 AM, wrote: From: Chen Qi Support read-only rootfs by providing a specific conf file for volatile storage. [YOCTO #3406] Signed-off-by: Chen Qi I prefer this solution than the previous one however why you don't use a sato-volatile-conf package to provide this? Because the there exists a one-to-one (or almost one-to-one) correspondence between the volatile conf file and the specific image. If there is a 'sato-volatile-conf' package, then there should be a 'minimal-volatile-conf', and maybe a 'custom-volatile-conf' if users are using a customized image. So I think it's simpler to let the image recipe provide the conf file. The only thing we have to do, when adding read-only rootfs support to some image, is to add the conf file to SRC_URI and install it in choose_volatile_conf. The problem of not using a package for it is regarding upgrades; it is not possible to upgrade the configuration file using the package manager. I know most systems using the read-only-fs will be small and do not use a package manager at all but some use cases will do (mine, in case). Sounds reasonable. I'll think about it :) +1 for creating a *-volatile-conf package instead of having it buried in the image recipe. Sau! Thanks, Chen Qi So I do believe we ought to have a one-to-one correspondence here. -- 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 V6 2/6] image.bbclass: add two funtions to support readonly rootfs
On 01/06/2013 01:44 AM, qi.c...@windriver.com wrote:
From: Chen Qi
read_only_rootfs_hook: this funtion is invoked only if 'read-only-rootfs'
is in IMAGE_FEATURES. It tweaks some basic files and makes populate-
volatile.sh script run at rootfs time.
choose_volatile_conf: this function is exported and should be overriden
by the specific image recipe. Config files specific to read-only rootfs
are closely related to the image types. So these config file should be
provided by the corresponding image recipes.
In addition, this function adds support to customized config files for
customized images.
[YOCTO #3406]
Signed-off-by: Chen Qi
---
meta/classes/image.bbclass | 29 -
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index d3a416d..0cd49f0 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -167,6 +167,7 @@ inherit ${IMAGE_CLASSES}
IMAGE_POSTPROCESS_COMMAND ?= ""
MACHINE_POSTPROCESS_COMMAND ?= ""
ROOTFS_POSTPROCESS_COMMAND_prepend = "run_intercept_scriptlets; "
+ROOTFS_POSTPROCESS_COMMAND_prepend = "choose_volatile_conf; "
# some default locales
IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
@@ -185,6 +186,11 @@ do_build[nostamp] = "1"
# task, so that we have a single fakeroot context for the whole process.
do_rootfs[umask] = "022"
+choose_volatile_conf () {
+# This task should be overriden by the specific image recipe.
+# It is used to install the correct conf file for volatile storage
+# handling to support read-only rootfs.
+}
run_intercept_scriptlets () {
if [ -d ${WORKDIR}/intercept_scripts ]; then
@@ -396,6 +402,21 @@ zap_root_password () {
mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd
}
+# A hook function to support read-only-rootfs IMAGE_FEATURES
+read_only_rootfs_hook () {
+ # Tweak the mount option in fstab
+ sed -i '/rootfs/ s/defaults/ro/' ${IMAGE_ROOTFS}/etc/fstab
+ # Change the value of ROOTFS_READ_ONLY in /etc/default/rcS to yes
+ if [ -e ${IMAGE_ROOTFS}/etc/default/rcS ]; then
+ sed -i 's/ROOTFS_READ_ONLY=no/ROOTFS_READ_ONLY=yes/'
${IMAGE_ROOTFS}/etc/default/rcS
+ fi
+ # Run populate-volatile.sh at rootfs time to set up basic files
+ # and directories to support read-only rootfs.
+ if [ -e ${IMAGE_ROOTFS}/etc/init.d/populate-volatile.sh ]; then
+ ${IMAGE_ROOTFS}/etc/init.d/populate-volatile.sh
+ fi
+}
+
# allow openssh accept login with empty password string
openssh_allow_empty_password () {
if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config ]; then
@@ -458,11 +479,9 @@ rootfs_trim_schemas () {
done
}
-EXPORT_FUNCTIONS zap_root_password remove_init_link do_rootfs
make_zimage_symlink_relative set_image_autologin rootfs_update_timestamp
rootfs_no_x_startup
+EXPORT_FUNCTIONS zap_root_password remove_init_link do_rootfs
make_zimage_symlink_relative set_image_autologin rootfs_update_timestamp
rootfs_no_x_startup choose_volatile_conf
-do_fetch[noexec] = "1"
-do_unpack[noexec] = "1"
-do_patch[noexec] = "1"
+# do_fetch, do_unpack and do_patch are needed to copy conf files to workdir
do_configure[noexec] = "1"
do_compile[noexec] = "1"
do_install[noexec] = "1"
@@ -472,4 +491,4 @@ do_package_write_ipk[noexec] = "1"
do_package_write_deb[noexec] = "1"
do_package_write_rpm[noexec] = "1"
-addtask rootfs before do_build
+addtask rootfs before do_build after do_patch
Why is this needed, and will it continue to be needed if we move to the
*-volatile-conf packages?
Sau!
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] glib2.0 and dbus dependency
On Friday, January 11, 2013 05:30:55 PM ChenQi wrote: > On 01/11/2013 02:31 AM, Yi Qingliang wrote: > > when compiling using 4 threads, I got following error. > > the glib2.0-native want find dbus header file. > > If I compiled dbus/dbus-natigve, and then compile glib2.0 OK. > > > > when grep glib2.0 bb files, I can't find dbus in dependency, why? > > Hi, > > What's the error message? I can't remember it, somes like can't find dub/dbus.h. > > Cheers, > Chen Qi > > > ERROR: Function failed: do_compile (see /mnt/src/arm9plf- > > build/tmp/work/x86_64-linux/glib-2.0-native/1_2.34.3- > > r0/temp/log.do_compile.28193 for further information) > > ERROR: Task 1851 (virtual:native:/mnt/src/optimus/poky/meta/recipes- > > core/glib-2.0/glib-2.0_2.34.3.bb, do_compile) failed with exit code '1' > > NOTE: Tasks Summary: Attempted 929 tasks of which 925 didn't need to be > > rerun and 1 failed. > > Waiting for 0 running tasks to finish: > > > > Summary: 1 task failed: > >virtual:native:/mnt/src/optimus/poky/meta/recipes- > > > > core/glib-2.0/glib-2.0_2.34.3.bb, do_compile > > Summary: There was 1 ERROR message shown, returning a non-zero exit code. > > > > > > ___ > > 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 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
