[meta-oe][PATCH v3 0/3] Move xserver-nodm-init systemd support to xserver-nodm-init-systemd

[meta-oe][PATCH v3 0/3] Move xserver-nodm-init systemd support to xserver-nodm-init-systemd

[Otavio Salvador]

With this patchset version addresses the complains done on mailing
list. For people using sysvinit at list a task-x11 needs a virtual
runtime override to avoid bringing systemd as dependency.

The following changes since commit 2642db3615ea2d4196b9c73537d9ebff6c57de2d:

  dialog: add 1.1-20111020 recipe (dynamic and static) (2011-12-24 19:07:53 +0100)

are available in the git repository at:
  git://github.com/OSSystems/meta-oe master
  https://github.com/OSSystems/meta-oe/tree/master

Otavio Salvador (3):
  xserver-nodm-init: move systemd service to xserver-nodm-init-systemd
  meta-efl: elsa: rconflicts/rreplaces xserver-nodm-init-systemd
  task-x11: use xserver-nodm-init-systemd

 meta-efl/recipes-efl/efl/elsa_svn.bb               |    6 ++--
 meta-oe/recipes-core/tasks/task-x11_1.0.bb         |    6 ++--
 .../xserver-nodm-init/xserver-nodm-init_2.0.bb     |   30 +++++++++----------
 3 files changed, 20 insertions(+), 22 deletions(-)

-- 
1.7.2.5

[meta-oe][PATCH v3 1/3] xserver-nodm-init: move systemd service to xserver-nodm-init-systemd

[Otavio Salvador]

Move systemd service to xserver-nodm-init-systemd to be consistent
with other packages.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../xserver-nodm-init/xserver-nodm-init_2.0.bb     |   30 +++++++++----------
 1 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
index 496b342..2132eab 100644
--- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
+++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SECTION = "x11"
 
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "file://xserver-nodm \
            file://xserver-nodm.service \
@@ -13,6 +13,15 @@ S = ${WORKDIR}
 
 inherit allarch
 
+inherit update-rc.d systemd
+
+INITSCRIPT_NAME = "xserver-nodm"
+INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 0 1 6 ."
+INITSCRIPT_PARAMS_shr = "start 90 5 2 . stop 90 0 1 6 ."
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE_${PN}-systemd = "xserver-nodm.service"
+
 do_install() {
 	install -d ${D}${sysconfdir}/init.d
 	install xserver-nodm ${D}${sysconfdir}/init.d
@@ -21,20 +30,9 @@ do_install() {
 	install -m 0644 xserver-nodm.service ${D}${base_libdir}/systemd/system/
 }
 
-RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit"
-FILES_${PN} += "${base_libdir}/systemd/system/"
-
-inherit update-rc.d
+PACKAGES += "${PN}-systemd"
 
-INITSCRIPT_NAME = "xserver-nodm"
-INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 0 1 6 ."
-INITSCRIPT_PARAMS_shr = "start 90 5 2 . stop 90 0 1 6 ."
-
-pkg_postinst_${PN}_append () {
-    if [ -e ${base_bindir}/systemctl ] ; then
-        # can't do this offline
-        [ "x$D" != "x" ] && exit 1
+RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit"
 
-        systemctl enable xserver-nodm.service
-    fi
-}
+FILES_${PN}-systemd += "${base_libdir}/systemd/system/"
+RDEPENDS_${PN}-systemd += "xserver-common (>= 1.30) xinit"
-- 
1.7.2.5

[meta-oe][PATCH v3 2/3] meta-efl: elsa: rconflicts/rreplaces xserver-nodm-init-systemd

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-efl/recipes-efl/efl/elsa_svn.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-efl/recipes-efl/efl/elsa_svn.bb b/meta-efl/recipes-efl/efl/elsa_svn.bb
index 949c7e1..a079ec0 100644
--- a/meta-efl/recipes-efl/efl/elsa_svn.bb
+++ b/meta-efl/recipes-efl/efl/elsa_svn.bb
@@ -13,7 +13,7 @@ S = "${WORKDIR}/${SRCNAME}"
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}"
 
-PR = "r3"
+PR = "r4"
 PV = "0.0.4+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
 
@@ -34,5 +34,5 @@ RDEPENDS_${PN} += "${PN}-themes sessreg xauth"
 CONFFILES_${PN} += "${sysconfdir}/elsa.conf"
 RCONFLICTS_${PN} += "xserver-nodm-init"
 RREPLACES_${PN} += "xserver-nodm-init"
-RCONFLICTS_${PN}-systemd += "xserver-nodm-init"
-RREPLACES_${PN}-systemd += "xserver-nodm-init"
+RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd"
+RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd"
-- 
1.7.2.5

[meta-oe][PATCH v3 3/3] task-x11: use xserver-nodm-init-systemd

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-oe/recipes-core/tasks/task-x11_1.0.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 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..681e4f3 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
 
@@ -16,8 +16,8 @@ RRECOMMENDS_${PN} = "\
 # xserver-common, x11-common
 VIRTUAL-RUNTIME_xserver_common ?= "xserver-common"
 
-# elsa, xserver-nodm-init
-VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
+# elsa, xserver-nodm-init or xserver-nodm-init-systemd
+VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init-systemd"
 
 RDEPENDS_${PN}-utils = "\
   ${VIRTUAL-RUNTIME_xserver_common} \
-- 
1.7.2.5

Re: [meta-oe][PATCH v3 0/3] Move xserver-nodm-init systemd support to xserver-nodm-init-systemd

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 30-12-11 17:40, Otavio Salvador schreef:
> With this patchset version addresses the complains done on mailing list.
> For people using sysvinit at list a task-x11 needs a virtual runtime
> override to avoid bringing systemd as dependency.
> 
> The following changes since commit
> 2642db3615ea2d4196b9c73537d9ebff6c57de2d:
> 
> dialog: add 1.1-20111020 recipe (dynamic and static) (2011-12-24 19:07:53
> +0100)
> 
> are available in the git repository at: 
> git://github.com/OSSystems/meta-oe master 
> https://github.com/OSSystems/meta-oe/tree/master
> 
> Otavio Salvador (3): xserver-nodm-init: move systemd service to
> xserver-nodm-init-systemd meta-efl: elsa: rconflicts/rreplaces
> xserver-nodm-init-systemd task-x11: use xserver-nodm-init-systemd

Still missing a few:

koen@dominion:/OE/tentacle/sources/openembedded-core$ for i in ../* ; do
echo $(basename $PWD); git grep xserver-nodm-init | grep -v
distro_tracking_fields ; cd $i ; done
openembedded-core
meta/conf/multilib.conf:BBCLASSEXTEND_append_pn-xserver-nodm-init = "
${MULTILIBS}"
meta/recipes-sato/tasks/task-core-x11.bb:# elsa, xserver-nodm-init
meta/recipes-sato/tasks/task-core-x11.bb:VIRTUAL-RUNTIME_graphical_init_manager
?= "xserver-nodm-init"
angstrom-layers
bitbake
downloads
fatal: Not a git repository (or any parent up to mount parent )
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
bash: cd: ../layers.dot: No such file or directory
downloads
fatal: Not a git repository (or any parent up to mount parent )
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
bash: cd: ../layers.txt: No such file or directory
downloads
fatal: Not a git repository (or any parent up to mount parent )
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
meta-angstrom
recipes-images/angstrom/efl-nodm-image.bb:    xserver-nodm-init \
meta-archos
meta-efikamx
meta-ettus
meta-handheld
meta-igep
meta-intel
meta-java
meta-nslu2
meta-openembedded
meta-efl/recipes-efl/efl/elsa_svn.bb:RCONFLICTS_${PN} += "xserver-nodm-init"
meta-efl/recipes-efl/efl/elsa_svn.bb:RREPLACES_${PN} += "xserver-nodm-init"
meta-efl/recipes-efl/efl/elsa_svn.bb:RCONFLICTS_${PN}-systemd +=
"xserver-nodm-init"
meta-efl/recipes-efl/efl/elsa_svn.bb:RREPLACES_${PN}-systemd +=
"xserver-nodm-init"
meta-oe/recipes-core/tasks/task-x11_1.0.bb:# elsa, xserver-nodm-init
meta-oe/recipes-core/tasks/task-x11_1.0.bb:VIRTUAL-RUNTIME_graphical_init_manager
?= "xserver-nodm-init"
meta-openpandora
meta-shr
meta-smartphone
meta-shr/conf/distro/shr.conf:VIRTUAL-RUNTIME_graphical_init_manager =
"xserver-nodm-init"
meta-ti
recipes-misc/images/cloud9-gfx-image.bb:                  xserver-nodm-init \
meta-xilinx
koen@dominion:/OE/tentacle/sources/openembedded-core$

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk799hwACgkQMkyGM64RGpG8DQCgpTLLLUbtp26ogHNk2/8n7Nfa
b1EAnRCmkeEZ1O4xDGc+qODwYCtrh0QU
=n0r9
-----END PGP SIGNATURE-----

Re: [meta-oe][PATCH v3 0/3] Move xserver-nodm-init systemd support to xserver-nodm-init-systemd

[Otavio Salvador]

On Fri, Dec 30, 2011 at 15:34, Koen Kooi <koen@dominion.thruhere.net> wrote:

> Still missing a few:
>
> koen@dominion:/OE/tentacle/sources/openembedded-core$ for i in ../* ; do
> echo $(basename $PWD); git grep xserver-nodm-init | grep -v
> distro_tracking_fields ; cd $i ; done
> openembedded-core
> meta/conf/multilib.conf:BBCLASSEXTEND_append_pn-xserver-nodm-init = "
> ${MULTILIBS}"
> meta/recipes-sato/tasks/task-core-x11.bb:# elsa, xserver-nodm-init
> meta/recipes-sato/tasks/task-core-x11.bb:
> VIRTUAL-RUNTIME_graphical_init_manager
> ?= "xserver-nodm-init"
>

This is OE-Core ...


> ...

recipes-images/angstrom/efl-nodm-image.bb:    xserver-nodm-init \
>

I don't use angstrom, sorry.
 ...
  meta-efl/recipes-efl/efl/elsa_svn.bb:RCONFLICTS_${PN} +=
"xserver-nodm-init"

> meta-efl/recipes-efl/efl/elsa_svn.bb:RREPLACES_${PN} +=
> "xserver-nodm-init"
> meta-efl/recipes-efl/efl/elsa_svn.bb:RCONFLICTS_${PN}-systemd +=
> "xserver-nodm-init"
> meta-efl/recipes-efl/efl/elsa_svn.bb:RREPLACES_${PN}-systemd +=
> "xserver-nodm-init"
> meta-oe/recipes-core/tasks/task-x11_1.0.bb:# elsa, xserver-nodm-init
> meta-oe/recipes-core/tasks/task-x11_1.0.bb:
> VIRTUAL-RUNTIME_graphical_init_manager
> ?= "xserver-nodm-init"
>

Fixed on this patchset.


> meta-openpandora
> meta-shr
> meta-smartphone
> meta-shr/conf/distro/shr.conf:VIRTUAL-RUNTIME_graphical_init_manager =
> "xserver-nodm-init"
> meta-ti
> recipes-misc/images/cloud9-gfx-image.bb:
>  xserver-nodm-init \
> meta-xilinx
> koen@dominion:/OE/tentacle/sources/openembedded-core$
>

Meta-TI and Meta-SHR isn't on my business too ... sorry.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [meta-oe][PATCH v3 0/3] Move xserver-nodm-init systemd support to xserver-nodm-init-systemd

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2138 bytes --]

On Fri, Dec 30, 2011 at 03:40:11PM -0200, Otavio Salvador wrote:
> On Fri, Dec 30, 2011 at 15:34, Koen Kooi <koen@dominion.thruhere.net> wrote:
> 
> > Still missing a few:
> >
> > koen@dominion:/OE/tentacle/sources/openembedded-core$ for i in ../* ; do
> > echo $(basename $PWD); git grep xserver-nodm-init | grep -v
> > distro_tracking_fields ; cd $i ; done
> > openembedded-core
> > meta/conf/multilib.conf:BBCLASSEXTEND_append_pn-xserver-nodm-init = "
> > ${MULTILIBS}"
> > meta/recipes-sato/tasks/task-core-x11.bb:# elsa, xserver-nodm-init
> > meta/recipes-sato/tasks/task-core-x11.bb:
> > VIRTUAL-RUNTIME_graphical_init_manager
> > ?= "xserver-nodm-init"
> >
> 
> This is OE-Core ...
> 
> 
> > ...
> 
> recipes-images/angstrom/efl-nodm-image.bb:    xserver-nodm-init \
> >
> 
> I don't use angstrom, sorry.
>  ...
>   meta-efl/recipes-efl/efl/elsa_svn.bb:RCONFLICTS_${PN} +=
> "xserver-nodm-init"
> 
> > meta-efl/recipes-efl/efl/elsa_svn.bb:RREPLACES_${PN} +=
> > "xserver-nodm-init"
> > meta-efl/recipes-efl/efl/elsa_svn.bb:RCONFLICTS_${PN}-systemd +=
> > "xserver-nodm-init"
> > meta-efl/recipes-efl/efl/elsa_svn.bb:RREPLACES_${PN}-systemd +=
> > "xserver-nodm-init"
> > meta-oe/recipes-core/tasks/task-x11_1.0.bb:# elsa, xserver-nodm-init
> > meta-oe/recipes-core/tasks/task-x11_1.0.bb:
> > VIRTUAL-RUNTIME_graphical_init_manager
> > ?= "xserver-nodm-init"
> >
> 
> Fixed on this patchset.
> 
> 
> > meta-openpandora
> > meta-shr
> > meta-smartphone
> > meta-shr/conf/distro/shr.conf:VIRTUAL-RUNTIME_graphical_init_manager =
> > "xserver-nodm-init"
> > meta-ti
> > recipes-misc/images/cloud9-gfx-image.bb:
> >  xserver-nodm-init \
> > meta-xilinx
> > koen@dominion:/OE/tentacle/sources/openembedded-core$
> >
> 
> Meta-TI and Meta-SHR isn't on my business too ... sorry.

Yes meta-shr/shr has xserver-nodm-init and expects sysvinit only, so
this is right. I'll add xserver-nodm-init-systemd to meta-shr/jansa/systemd 
when it's in meta-oe and meta-shr/jansa/systemd-elsa is using elsa anyway.

Regards,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]