From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by arago-project.org (Postfix) with ESMTPS id 571D352A1C for ; Tue, 20 Nov 2018 22:43:20 +0000 (UTC) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id wAKMh9LT108136 for ; Tue, 20 Nov 2018 16:43:09 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1542753789; bh=LlrTuypa8e+RuwO4iZu/irKQbQQVP0tQB6ABSCoohlE=; h=From:To:CC:Subject:Date:References:In-Reply-To; b=UkxR62Huf0pdFrZXHTwUv0X6nqhr/l6BjOcphi/upilkhdT2u7Wk575pV8I+wdeY5 ubHS/ZLRbpqr8BXxv/V5MRmfExCkd5mPgwnjg8OQNKlUvJs/N8vx39fXBMSg9eBy32 WvwkJ2HrNOhTyD7nH6mEk/4lAebNboxkGCWeXrjg= Received: from DFLE111.ent.ti.com (dfle111.ent.ti.com [10.64.6.32]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id wAKMh9Vl016697 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 20 Nov 2018 16:43:09 -0600 Received: from DFLE113.ent.ti.com (10.64.6.34) by DFLE111.ent.ti.com (10.64.6.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Tue, 20 Nov 2018 16:43:09 -0600 Received: from DFLE113.ent.ti.com ([fe80::5de1:db32:7f81:772f]) by DFLE113.ent.ti.com ([fe80::5de1:db32:7f81:772f%18]) with mapi id 15.01.1591.008; Tue, 20 Nov 2018 16:43:09 -0600 From: "Gou, Hongmei" To: "Dmytriyenko, Denys" Thread-Topic: [meta-arago] [rocko/master] [PATCH] matrix-gui: replace SysVinit with systemd service Thread-Index: AQHUgRn4lpWJ/WRzakSxbhcJFnTfUqVZMyUAgABmWQD//5zRAIAAb0yA//+b06A= Date: Tue, 20 Nov 2018 22:43:09 +0000 Message-ID: <4a62881a41d442bea334eccb95078a2d@ti.com> References: <1542749635-31317-1-git-send-email-a0271529@ti.com> <20181120214244.GD2540@beryl> <20181120215406.GE2540@beryl> <20181120223727.GF2540@beryl> In-Reply-To: <20181120223727.GF2540@beryl> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [158.218.113.79] x-exclaimer-md-config: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 MIME-Version: 1.0 Cc: "meta-arago@arago-project.org" Subject: Re: [rocko/master] [PATCH] matrix-gui: replace SysVinit with systemd service X-BeenThere: meta-arago@arago-project.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Arago metadata layer for TI SDKs - OE-Core/Yocto compatible List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Nov 2018 22:43:20 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable > -----Original Message----- > From: Dmytriyenko, Denys > Sent: Tuesday, November 20, 2018 5:37 PM > To: Gou, Hongmei > Cc: meta-arago@arago-project.org > Subject: Re: [meta-arago] [rocko/master] [PATCH] matrix-gui: replace > SysVinit with systemd service >=20 > On Tue, Nov 20, 2018 at 05:12:52PM -0500, Gou, Hongmei wrote: > > > -----Original Message----- > > > From: Dmytriyenko, Denys > > > Sent: Tuesday, November 20, 2018 4:54 PM > > > To: Gou, Hongmei > > > Cc: meta-arago@arago-project.org > > > Subject: Re: [meta-arago] [rocko/master] [PATCH] matrix-gui: replace > > > SysVinit with systemd service > > > > > > On Tue, Nov 20, 2018 at 04:51:51PM -0500, Gou, Hongmei wrote: > > > > > -----Original Message----- > > > > > From: Dmytriyenko, Denys > > > > > Sent: Tuesday, November 20, 2018 4:43 PM > > > > > To: Gou, Hongmei > > > > > Cc: meta-arago@arago-project.org > > > > > Subject: Re: [meta-arago] [rocko/master] [PATCH] matrix-gui: repl= ace > > > > > SysVinit with systemd service > > > > > > > > > > On Tue, Nov 20, 2018 at 04:33:55PM -0500, Hongmei Gou wrote: > > > > > > Signed-off-by: Hongmei Gou > > > > > > --- > > > > > > .../recipes-core/matrix/matrix-gui/matrix-gui-2.0.service | 10 > > > ++++++++++ > > > > > > meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb | 15 > > > > > +++++++++------ > > > > > > 2 files changed, 19 insertions(+), 6 deletions(-) > > > > > > create mode 100644 meta-arago-extras/recipes- > core/matrix/matrix- > > > > > gui/matrix-gui-2.0.service > > > > > > > > > > > > diff --git a/meta-arago-extras/recipes-core/matrix/matrix- > gui/matrix- > > > gui- > > > > > 2.0.service b/meta-arago-extras/recipes-core/matrix/matrix- > gui/matrix- > > > gui- > > > > > 2.0.service > > > > > > new file mode 100644 > > > > > > index 0000000..3ce1024 > > > > > > --- /dev/null > > > > > > +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui/matrix- > gui- > > > > > 2.0.service > > > > > > @@ -0,0 +1,10 @@ > > > > > > +[Unit] > > > > > > +Description=3DMatrix GUI > > > > > > +After=3Dweston.service > > > > > > + > > > > > > +[Service] > > > > > > +Type=3Dforking > > > > > > +ExecStart=3D/etc/init.d/matrix-gui-2.0 start > > > > > > > > > > Looks like it's still calling a legacy initscript - any particula= r reason? > > > > > > > > Yes, we would like to keep the original scripts, as they are also u= sed for > > > stopping/starting matrix GUI when running GUI based demos > > > (/usr/share/matrix-gui-2.0/execute_command.sh): > > > > > > > > if [ $program_type =3D=3D gui ] > > > > then > > > > /etc/init.d/matrix-gui-2.0 stop > > > > .. > > > > > > > > if [ $program_type =3D=3D gui ] > > > > then > > > > ... > > > > /etc/init.d/matrix-gui-2.0 start > > > > fi > > > > > > Any plans to completely moving to systemd and calling systemctl > start/stop? > > > > With the current patch, "systemctl start/stop matrix-gui-2.0 " can > > start/stop matrix successfully. > > execute_command.sh can be updated to use systemctl start/stop. > > > > As for /etc/init.d/matrix-gui-2.0 (attached), I am not seeing anything > > specific to init. > > We can install it to /usr/bin instead of /etc/init.d, and then modify t= he > > path in matrix-gui-2.0.service, if this is preferable. >=20 > If you keep it in /etc/initd.d, wouldn't systemd try to automatically con= vert > it and potentially conflict with your own native unit file? systemd is not doing the conversion automatically. Output of "systemctl cat matrix-gui-2.0.service" with the current patch: [[0;1;34m# /lib/systemd/system/matrix-gui-2.0.service[[0m [Unit] Description=3DMatrix GUI After=3Dweston.service [Service] Type=3Dforking ExecStart=3D/etc/init.d/matrix-gui-2.0 start [Install] WantedBy=3Dmulti-user.target Output of "systemctl cat matrix-gui-2.0.service" before the patch: [[0;1;34m# /run/systemd/generator.late/matrix-gui-2.0.service[[0m # Automatically generated by systemd-sysv-generator [Unit] Documentation=3Dman:systemd-sysv-generator(8) SourcePath=3D/etc/init.d/matrix-gui-2.0 Before=3Dmulti-user.target Before=3Dmulti-user.target Before=3Dmulti-user.target Before=3Dthermal-zone-init.service After=3Dthttpd.service After=3Dumountnfs.service After=3Drng-tools.service After=3Dredis-server.service After=3Ddropbear.service After=3Dtelnetd.service After=3Dgdbserverproxy.service After=3Dweston.service After=3Drc.pvr.service After=3Duim-sysfs.service [Service] Type=3Dforking Restart=3Dno TimeoutSec=3D5min IgnoreSIGPIPE=3Dno KillMode=3Dprocess GuessMainPID=3Dno RemainAfterExit=3Dyes ExecStart=3D/etc/init.d/matrix-gui-2.0 start ExecStop=3D/etc/init.d/matrix-gui-2.0 stop >=20 >=20 > > > > > > + > > > > > > +[Install] > > > > > > +WantedBy=3Dmulti-user.target > > > > > > diff --git a/meta-arago-extras/recipes-core/matrix/matrix- > gui_2.0.bb > > > > > b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb > > > > > > index d8aa00b..c79f13e 100644 > > > > > > --- a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb > > > > > > +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb > > > > > > @@ -6,14 +6,13 @@ LIC_FILES_CHKSUM =3D > > > > > "file://LICENSE;md5=3Da886c9ef769b2d8271115d2502512e5d" > > > > > > > > > > > > SECTION =3D "multimedia" > > > > > > > > > > > > -PR =3D "r35" > > > > > > +PR =3D "r36" > > > > > > > > > > > > -INITSCRIPT_NAME =3D "matrix-gui-2.0" > > > > > > -INITSCRIPT_PARAMS =3D "defaults 97" > > > > > > +SYSTEMD_SERVICE_${PN} =3D "matrix-gui-2.0.service" > > > > > > > > > > > > PACKAGE_ARCH =3D "${MACHINE_ARCH}" > > > > > > > > > > > > -inherit update-rc.d > > > > > > +inherit systemd > > > > > > > > > > > > BRANCH ?=3D "master" > > > > > > SRCREV =3D "9a2d12590102fefc5c29fc9e8d346ce6b0198468" > > > > > > @@ -23,6 +22,7 @@ MATRIX_INITSCRIPT =3D > > > > > "${@base_conditional('QT_PROVIDER', 'qt5', bb.utils.contains > > > > > > SRC_URI =3D "git://git.ti.com/matrix-gui-v2/matrix-gui- > > > > > v2.git;protocol=3Dgit;branch=3D${BRANCH} \ > > > > > > file://${MATRIX_INITSCRIPT} \ > > > > > > file://php.ini \ > > > > > > + file://matrix-gui-2.0.service \ > > > > > > ${@base_conditional('QT_PROVIDER', 'qt5', > > > > > bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'file://0001- > > > > > execute_command-Stop-matrix-when-running-a-GUI-demo.patch', > d), '', > > > d)} > > > > > \ > > > > > > ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', > 'file://0001- > > > > > execute_command-workaround-for-GUI-apps-with-weston.patch', '', > d)} > > > \ > > > > > > " > > > > > > @@ -46,10 +46,13 @@ do_install(){ > > > > > > sed -i -e "s/__MATRIX_FLAGS__/\"${MATRIX_FLAGS}\"/" > > > > > ${WORKDIR}/${MATRIX_INITSCRIPT} > > > > > > sed -i -e > > > > > "s/__SWITCH_FOREGROUND_VT__/${SWITCH_FOREGROUND_VT}/" > > > > > ${WORKDIR}/${MATRIX_INITSCRIPT} > > > > > > > > > > > > - # Install the init script > > > > > > - # TODO: replace init script with systemd files > > > > > > + # Install the script > > > > > > install -d ${D}${sysconfdir}/init.d > > > > > > install -m 0755 ${WORKDIR}/${MATRIX_INITSCRIPT} > > > > > ${D}${sysconfdir}/init.d/matrix-gui-2.0 > > > > > > + > > > > > > + # Install the systemd unit file > > > > > > + install -d ${D}${systemd_system_unitdir} > > > > > > + install -m 0644 ${WORKDIR}/matrix-gui-2.0.service > > > > > ${D}${systemd_system_unitdir} > > > > > > } > > > > > > > > > > > > GUIDEPS =3D "matrix-gui-browser refresh-screen" > > > > > > -- > > > > > > 1.9.1 > > > > > > > > > > > > _______________________________________________ > > > > > > meta-arago mailing list > > > > > > meta-arago@arago-project.org > > > > > > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago >=20