From 44b1bdc8081f4968e70313463059e1ce77806ce2 Mon Sep 17 00:00:00 2001 From: José Bollo Date: Thu, 16 May 2019 09:13:59 +0200 Subject: afm-unit.conf: cleanup of generation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The generation files are reworked to improve their evolution and maintainability: - the Makefile now refers to any .inc file - the macros are isolated from the skeleton - main iterators are managed in the skeleton - improve management of UNIT_NAME_BASE Bug-AGL: SPEC-2436 Change-Id: I0877eb0149c9362be3290ed2c146cc69fc6bf718 Signed-off-by: José Bollo --- conf/unit/generate-unit-conf/service.inc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'conf/unit/generate-unit-conf/service.inc') diff --git a/conf/unit/generate-unit-conf/service.inc b/conf/unit/generate-unit-conf/service.inc index dd585d5..88c1454 100644 --- a/conf/unit/generate-unit-conf/service.inc +++ b/conf/unit/generate-unit-conf/service.inc @@ -1,14 +1,14 @@ dnl vim: set filetype=sysctl.conf.m4 syntax=sysctl.conf.m4: -;--------------------------------------------------------------------------------- -;---- M A I N P A R T O F T H E S E R V I C E ---- -;--------------------------------------------------------------------------------- +;------------------------------------------------------------------------------- +;---- M A I N P A R T O F T H E S E R V I C E ---- +;------------------------------------------------------------------------------- %begin systemd-unit # auto generated by wgtpkg-unit for {{:id}} version {{:version}} target {{:#target}} of {{:idaver}} %nl %systemd-unit system -%systemd-unit service UNIT_NAME_BASE +%systemd-unit service UNIT_NAME_BASE@ [Unit] Description={{description}} @@ -105,24 +105,24 @@ StandardInput=null StandardOutput=journal StandardError=journal -;--------------------------------------------------------------------------------- -;---- text/html application/vnd.agl.native application/vnd.agl.service ---- -;--------------------------------------------------------------------------------- +;------------------------------------------------------------------------------- +;---- text/html application/vnd.agl.native application/vnd.agl.service ---- +;------------------------------------------------------------------------------- {{#content.type=text/html|application/vnd.agl.native|application/vnd.agl.service}} include(binder.inc) {{/content.type=text/html|application/vnd.agl.native|application/vnd.agl.service}} -;--------------------------------------------------------------------------------- -;---- application/x-executable ---- -;--------------------------------------------------------------------------------- +;------------------------------------------------------------------------------- +;---- application/x-executable ---- +;------------------------------------------------------------------------------- {{#content.type=application/x-executable}} ExecStart={{:#metadata.install-dir}}/{{content.src}} {{/content.type=application/x-executable}} IF_PERM(:system:run-by-default) -;--------------------------------------------------------------------------------- +;------------------------------------------------------------------------------- ; auto start -;--------------------------------------------------------------------------------- +;------------------------------------------------------------------------------- [Install] WantedBy=afm-user-session@.target %systemd-unit wanted-by afm-user-session@.target -- cgit 1.2.3-korg