| Submitter | Otavio Salvador |
|---|---|
| Date | Dec. 30, 2011, 12:40 p.m. |
| Message ID | <06b8fd4ed68ad3e735b54d661f66737048ce9597.1325248824.git.otavio@ossystems.com.br> |
| Download | mbox | patch |
| Permalink | /patch/17859/ |
| State | New, archived |
| Headers | show |
Comments
On Fri, Dec 30, 2011 at 12:40:56PM +0000, Otavio Salvador wrote: > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> > --- > meta-oe/recipes-core/tasks/task-x11_1.0.bb | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta-oe/recipes-core/tasks/task-x11_1.0.bb b/meta-oe/recipes-core/tasks/task-x11_1.0.bb > index 67ff93b..af92e49 100644 > --- a/meta-oe/recipes-core/tasks/task-x11_1.0.bb > +++ b/meta-oe/recipes-core/tasks/task-x11_1.0.bb > @@ -2,7 +2,7 @@ DESCRIPTION = "The X Window System -- install this task to get a client/server b > SECTION = "x11/server" > LICENSE = "MIT" > LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" > -PR = "r9" > +PR = "r10" > > inherit task > > @@ -17,7 +17,7 @@ RRECOMMENDS_${PN} = "\ > VIRTUAL-RUNTIME_xserver_common ?= "xserver-common" > > # elsa, xserver-nodm-init > -VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init" > +VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init-systemd" There are still people not using systemd _only_ and I belive that this change drops sysvinit script completely (xserver-nodm-init-systemd correctly doesn't rdepend on xserver-nodm-init, because is using only xinit and xserver-common provider). You can add both like VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init xserver-nodm-init-systemd" but that would make xserver-nodm-init-systemd separation not so usefull. So I think that xserver-nodm-init-systemd should be added to VIRTUAL-RUNTIME_graphical_init_manager only by distribution config or only to some task-* used to build systemd images (I'm using task-shr-systemd_1.0.bb for that). Regards,
On Fri, Dec 30, 2011 at 11:00, Martin Jansa <martin.jansa@gmail.com> wrote: > > # elsa, xserver-nodm-init > > -VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init" > > +VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init-systemd" > > There are still people not using systemd _only_ and I belive that this > change drops sysvinit script completely (xserver-nodm-init-systemd > correctly doesn't rdepend on xserver-nodm-init, because is using only > xinit and xserver-common provider). > I added it because the task-basic depends on systemd-compat-units so it is clearly forcing systemd use. So anyone using sysv will need to avoid task-basic et all.
On Fri, Dec 30, 2011 at 01:47:18PM -0200, Otavio Salvador wrote: > On Fri, Dec 30, 2011 at 11:00, Martin Jansa <martin.jansa@gmail.com> wrote: > > > > # elsa, xserver-nodm-init > > > -VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init" > > > +VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init-systemd" > > > > There are still people not using systemd _only_ and I belive that this > > change drops sysvinit script completely (xserver-nodm-init-systemd > > correctly doesn't rdepend on xserver-nodm-init, because is using only > > xinit and xserver-common provider). > > > > I added it because the task-basic depends on systemd-compat-units so it is > clearly forcing systemd use. So anyone using sysv will need to avoid > task-basic et all. Yes, but this is task-x11 not task-basic.. I wouldn't complain if you add it to task-basic.
On Fri, Dec 30, 2011 at 13:52, Martin Jansa <martin.jansa@gmail.com> wrote: > Yes, but this is task-x11 not task-basic.. I wouldn't complain if you > add it to task-basic. > In this case adding both is the way to go but I *hate* this solutin :-(
Patch
diff --git a/meta-oe/recipes-core/tasks/task-x11_1.0.bb b/meta-oe/recipes-core/tasks/task-x11_1.0.bb index 67ff93b..af92e49 100644 --- a/meta-oe/recipes-core/tasks/task-x11_1.0.bb +++ b/meta-oe/recipes-core/tasks/task-x11_1.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The X Window System -- install this task to get a client/server b SECTION = "x11/server" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r9" +PR = "r10" inherit task @@ -17,7 +17,7 @@ RRECOMMENDS_${PN} = "\ VIRTUAL-RUNTIME_xserver_common ?= "xserver-common" # elsa, xserver-nodm-init -VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init" +VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init-systemd" RDEPENDS_${PN}-utils = "\ ${VIRTUAL-RUNTIME_xserver_common} \
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- meta-oe/recipes-core/tasks/task-x11_1.0.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)