On Tue, Jun 02, 2020 at 03:48:58PM +0300, Antony Pavlov wrote: > On Tue, 2 Jun 2020 09:51:28 +0200 > Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> wrote: > > > Hi Antony, > > > > On Tue, Jun 02, 2020 at 01:20:35AM +0300, Antony Pavlov wrote: > > > > > > diff --git a/lib/logo/Makefile b/lib/logo/Makefile > > > index eb7aee080e..8c81447df7 100644 > > > --- a/lib/logo/Makefile > > > +++ b/lib/logo/Makefile > > > @@ -1,17 +1,17 @@ > > > > > > -OPTS_barebox-logo-w64.bblogo="-w 64" > > > +OPTS_barebox-logo-w64.bblogo = --export-width=64 > > > bblogo-$(CONFIG_BAREBOX_LOGO_64) += barebox-logo-w64 > > > > according to the man page --export-width=64 is supported by 0.92.4 as > > well, so we could change this part unconditionally. > > > > > @@ -41,7 +41,8 @@ cmd_logo_S = \ > > > quiet_cmd_logo = LOGO.S $@ > > > cmd_logo = \ > > > ( \ > > > - inkscape -z $(OPTS_$(@F)) -e $@ $< > /dev/null; \ > > > + DISPLAY="" inkscape $(OPTS_$(@F)) --export-type=png $< > /dev/null; \ > > > + mv $(patsubst %.svg,%.png,$<) $@; \ > > > > Inkscape-1.0 supports "-o -" and pre Inkscape-1.0 supports "-e -", we > > could use this to do without the mv in both cases. > > > > DISPLAY="" shouldn't hurt on pre Inkscape-1.0. as well. > > > > This leaves '-z' and -e vs. --export-type=png. Something like this should work: > > > > INKSCAPEOPTS += $(call try-run, inkscape -z,-z,) > > INKSCAPEOPTS += $(call try-run, inkscape -e,-e,--export_type=png) > > > > Can we move all inkscape-related stuff into separate svg2bblogo.sh script > and just call script from makefile? We probably could, but what would be the advantage? Embedding too much shell in Makefile makes things harder to understand, but I don't think this case already falls into that category. Regards, Sascha -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
