Avoid unrequired runtime enforcement for postinst
cover Avoid unrequired runtime enforcement for postinst
The following changes since commit 8fcf92fed89557683a08f67667acc77a8f73dc0a:
guile: fix licensing and gettext inherit (2011-10-11 16:40:25 +0200)
are available in the git repository at:
git://github.com/OSSystems/meta-oe master
https://github.com/OSSystems/meta-oe/tree/master
Otavio Salvador (1):
xserver-nodm-init: exit 1 only if systemd is installed
.../xserver-nodm-init/xserver-nodm-init_2.0.bb | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)
Signature · 1 line
1.7.2.5
PATCH 1/1 xserver-nodm-init: exit 1 only if systemd is installed
--- .../xserver-nodm-init/xserver-nodm-init_2.0.bb | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)
meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb +4 -6
@@ -3,7 +3,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SECTION = "x11" -PR = "r9" +PR = "r10" SRC_URI = "file://xserver-nodm \ file://xserver-nodm.service \
@@ -31,12 +31,10 @@ 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 () { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - if [ -e /bin/systemctl ] ; then + # can't do this offline + [ "x$D" != "x" ] && exit 1 + systemctl enable xserver-nodm.service fi }
Signature · 1 line
1.7.2.5
Re: [meta-oe][PATCH 1/1] xserver-nodm-init: exit 1 only if systemd is installed
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 11-10-11 21:46, Otavio Salvador schreef:
Quoted 15 lines
Signed-off-by Otavio Salvador <[email protected]> ---.../xserver-nodm-init/xserver-nodm-init_2.0.bb | 10 ++++------ 1
files changed, 4 insertions(+), 6 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 d4a6b97..87079a6 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 = "r9" +PR = "r10"
Quoted 8 lines
SRC_URI= "file://xserver-nodm \ file://xserver-nodm.service \ @@ -31,12 +31,10 @@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 () { - # can't do this offline - if [
"x$D" != "x" ]; then - exit 1 - fi - if [ -e/bin/systemctl] ;
then + # can't do this offline + [ "x$D" != "x" ] && exit
1 + systemctl enable xserver-nodm.service fi }
While you're at it, please change it to ${base_bindir}
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFOlJ8EMkyGM64RGpERAjlwAKCryf1VfXEmdAFFj7tcyIc553EragCcDxx5 XG3FrZa5JCfCy8IHpJ6UZ1k=
=dU6H
-----END PGP SIGNATURE-----
Re: [meta-oe][PATCH 1/1] xserver-nodm-init: exit 1 only if systemd is installed
Quoted 1 line · Koen Kooi
While you're at it, please change it to ${base_bindir}
I can do it but don't you want to do that and amend it? If you prefer I can send a new patch but dunno if it is worth it.
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
Re: [meta-oe][PATCH 1/1] xserver-nodm-init: exit 1 only if systemd is installed
Quoted 5 lines · Otavio Salvador
Quoted 1 line · Koen Kooi
While you're at it, please change it to ${base_bindir}
I can do it but don't you want to do that and amend it? If you prefer I can send a new patch but dunno if it is worth it.
I fixed it on my github branch, you can pull it from there fixed.
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