| Submitter | Otavio Salvador |
|---|---|
| Date | Dec. 28, 2011, 5:05 p.m. |
| Message ID | <2eaa23a3419bfd9b5aea6c1f059242a38eb03608.1325091927.git.otavio@ossystems.com.br> |
| Download | mbox | patch |
| Permalink | /patch/17697/ |
| State | New, archived |
| Headers | show |
Comments
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Op 28-12-11 18:05, Otavio Salvador schreef: > Move systemd service to xserver-nodm-init-systemd to be consistent with > other packages. > > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> I'm not going to merge such patches unless a reasonable effort has been made to tasks/images using the packages in question. The breakage caused by patches like this is too subtle to notice immediately since doing $packagemanager upgrade will now silently remove the startup units. Similar breakage when using tasks, building images, etc. And I have the holidays off, so most patches need to wait till the second week of january. regards, Koen -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (Darwin) Comment: GPGTools - http://gpgtools.org iEYEARECAAYFAk79qhEACgkQMkyGM64RGpFG7QCgl9RP++hD+eLwBlCGXZJrwTX0 xCoAoKST/4Og6nMRBFkXBd+LIKVbyhZ2 =jiKc -----END PGP SIGNATURE-----
On Fri, Dec 30, 2011 at 10:09, Koen Kooi <koen@dominion.thruhere.net> wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Op 28-12-11 18:05, Otavio Salvador schreef: > > Move systemd service to xserver-nodm-init-systemd to be consistent with > > other packages. > > > > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> > > I'm not going to merge such patches unless a reasonable effort has been > made > to tasks/images using the packages in question. > The breakage caused by patches like this is too subtle to notice > immediately > since doing $packagemanager upgrade will now silently remove the startup > units. Similar breakage when using tasks, building images, etc. > This is fixing a broken and completely wrong package change done by you at 4ad7ec43564fd7ab9c5d50dfcccd4a59308dbcb1; this sholdn't have been done this way and systemd is still not well set in Meta-OE. Images and tasks using it (I use it) ought to keep an eye on change that might affect them. I agree this is subtle but this needs to be done so we can get systemd integration process further. You not merging this won't fix the problem. The only missing change I noticed is in meta-efl and I will send another patch for it in next pull request but do a second though about merging it, please. And I have the holidays off, so most patches need to wait till the second > week of january. > No problem.
Patch
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..4d4ae4c 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"
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(-)