Re: [ptxdist] [PATCH 2/3] weston: install weston.ini into /etc

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Fri, Aug 31, 2018 at 09:16:34AM +0200, Michael Olbrich wrote:
> On Fri, Aug 31, 2018 at 08:09:48AM +0200, Ladislav Michl wrote:
> > Hello Michael,
> > 
> > just a nitpick...
> > 
> > On Thu, Aug 30, 2018 at 06:23:29PM +0200, Michael Tretter wrote:
> > > Weston brings an example weston.ini file, which is not installed by
> > > default. Use the shipped template to generate a weston.ini for the
> > > target system and install it to the default system global path.
> > > 
> > > Allow to disable weston.ini to use the build-in default configuration or
> > > to override it in the projectroot.
> > > 
> > > Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> > > ---
> > >  rules/weston.in   |  6 ++++++
> > >  rules/weston.make | 19 +++++++++++++++++++
> > >  2 files changed, 25 insertions(+)
> > > 
> > > diff --git a/rules/weston.in b/rules/weston.in
> > > index 1c0ebff98..2e760740c 100644
> > > --- a/rules/weston.in
> > > +++ b/rules/weston.in
> > > @@ -81,4 +81,10 @@ config WESTON_WCAP_TOOLS
> > >  	help
> > >  	  Weston CAPture Tools
> > >  
> > > +config WESTON_INSTALL_CONFIG
> > > +	bool
> > > +	prompt "install configuration file"
> > > +	help
> > > +	  Install the Weston configuration file into /etc/xdg/weston
> > > +
> > >  endif
> > > diff --git a/rules/weston.make b/rules/weston.make
> > > index 1817a94f3..1e08b8c80 100644
> > > --- a/rules/weston.make
> > > +++ b/rules/weston.make
> > > @@ -74,6 +74,22 @@ WESTON_CONF_OPT		:= \
> > >  	--with-jpeg \
> > >  	--without-webp
> > >  
> > > +# ----------------------------------------------------------------------------
> > > +# Install
> > > +# ----------------------------------------------------------------------------
> > > +
> > > +$(STATEDIR)/weston.install:
> > > +	@$(call targetinfo)
> > > +	@$(call world/install, WESTON)
> > > +
> > > +	@mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston && \

And there is no need to combine the mkdir the next command.
'make' will abort if it fails and there is no shared context.

Michael

> > > +	 bindir="/usr/bin" \
> > > +	 abs_top_builddir="/usr/bin" \
> > > +	 libexecdir="/usr/libexec" \
> > 
> > Seems there are spaces after tab.
> 
> Indeed. I prefer an extra tab, like the lines below.
> 
> Michael
> 
> > > +	ptxd_replace_magic "$(WESTON_DIR)/weston.ini.in" > \
> > > +		"$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
> > > +
> > > +	@$(call touch)
> > >  
> > >  # ----------------------------------------------------------------------------
> > >  # Target-Install
> > > @@ -141,6 +157,9 @@ endif
> > >  		wayland.svg, \
> > >  		$(call install_copy, weston, 0, 0, 0644, -, /usr/share/weston/$(image))$(ptx/nl))
> > >  
> > > +ifdef PTXCONF_WESTON_INSTALL_CONFIG
> > > +	@$(call install_alternative, weston, 0, 0, 0644, /etc/xdg/weston/weston.ini)
> > > +endif
> > >  
> > >  	@$(call install_finish, weston)
> > >  
> > > -- 
> > > 2.18.0
> > > 
> > > 
> > > _______________________________________________
> > > ptxdist mailing list
> > > ptxdist@pengutronix.de
> > 
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> 
> -- 
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de