Skip to contentSkip to conversation

Move xserver-nodm-init to xserver-nodm-init-systemd

PATCH Superseded Otavio Salvador 2 participants 10 messages Dec 30, 2011

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover Move xserver-nodm-init to xserver-nodm-init-systemd

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         |    4 +-
 .../xserver-nodm-init/xserver-nodm-init_2.0.bb     |   30 +++++++++----------
 3 files changed, 19 insertions(+), 21 deletions(-)
Signature · 1 line
1.7.2.5
#1 lore raw

PATCH 1/3 xserver-nodm-init: move systemd service to xserver-nodm-init-systemd

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

---
 .../xserver-nodm-init/xserver-nodm-init_2.0.bb     |   30 +++++++++----------
 1 files changed, 14 insertions(+), 16 deletions(-)
meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb +14 -16
index 496b342..4d4ae4c 100644
@@ -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"
Signature · 1 line
1.7.2.5
#2 lore raw

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

Quoted 52 lines · Otavio Salvador

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

---
 .../xserver-nodm-init/xserver-nodm-init_2.0.bb     |   30 +++++++++----------
 1 files changed, 14 insertions(+), 16 deletions(-)
meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb +11 -10
index 496b342..4d4ae4c 100644
@@ -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 () {

meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb do_install() { · line 38

Quoted 10 lines
meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb +3 -6
-    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"

I haven't tried but isn't this ^ overwritting systemd runtime dependency set by systemd.bbclass? += would be probably bette if it's the case.

Regards,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#3 lore raw

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

Quoted 3 lines · Martin Jansa

I haven't tried but isn't this ^ overwritting systemd runtime dependency set by systemd.bbclass? += would be probably bette if it's the case.

Got catch, indeed.

Thanks. Fixed locally.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
#4 lore raw

PATCH 2/3 meta-efl: elsa: rconflicts/rreplaces xserver-nodm-init-systemd

In reply to Otavio Salvador
---
 meta-efl/recipes-efl/efl/elsa_svn.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
meta-efl/recipes-efl/efl/elsa_svn.bb +3 -3
index 949c7e1..a079ec0 100644
@@ -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"
Signature · 1 line
1.7.2.5
#5 lore raw

PATCH 3/3 task-x11: use xserver-nodm-init-systemd

In reply to Otavio Salvador
---
 meta-oe/recipes-core/tasks/task-x11_1.0.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-core/tasks/task-x11_1.0.bb +2 -2
index 67ff93b..af92e49 100644
@@ -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} \
Signature · 1 line
1.7.2.5
#6 lore raw

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

Quoted 19 lines · Otavio Salvador
---
 meta-oe/recipes-core/tasks/task-x11_1.0.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-core/tasks/task-x11_1.0.bb +1 -1
index 67ff93b..af92e49 100644
@@ -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
 

meta-oe/recipes-core/tasks/task-x11_1.0.bb RRECOMMENDS_${PN} = "\ · line 20

Quoted 5 lines
meta-oe/recipes-core/tasks/task-x11_1.0.bb +1 -1
@@ -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,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#7 lore raw

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

Quoted 9 lines · Martin Jansa

meta-oe/recipes-core/tasks/task-x11_1.0.bb RRECOMMENDS_${PN} = "\ · line 20

Quoted 3 lines

# elsa, xserver-nodm-init

meta-oe/recipes-core/tasks/task-x11_1.0.bb +1 -1
-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.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
#8 lore raw

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

Quoted 12 lines · Otavio Salvador
Quoted 9 lines · Martin Jansa

meta-oe/recipes-core/tasks/task-x11_1.0.bb RRECOMMENDS_${PN} = "\ · line 20

Quoted 3 lines

# elsa, xserver-nodm-init

meta-oe/recipes-core/tasks/task-x11_1.0.bb +1 -1
-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).

Quoted 3 lines

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.

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#9 lore raw

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

Quoted 3 lines · Martin Jansa

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 :-(

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br