On Fri, Apr 12, 2019 at 09:10:14AM +0200, Michael Olbrich wrote:
> On Mon, Apr 08, 2019 at 11:39:50AM +0200, Roland Hieber wrote:
> > This point came up multiple times in the past and the special handling
> > of targetinstall stages lead to confusion when trying to depend on image
> > packages. Document it to prevent further confusion in that matter, and
> > warn the user if such a make target exists.
> >
> > Signed-off-by: Roland Hieber <r...@pengutronix.de>
> > ---
[...]
> > diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk
> > index f7143c02885f..4d97cbd2fa28 100644
> > --- a/scripts/lib/ptxd_lib_dgen.awk
> > +++ b/scripts/lib/ptxd_lib_dgen.awk
> > @@ -94,6 +94,16 @@ function dump_file(src, dst, tmp) {
> > }
> >
> >
> > +#
> > +# warn user if an image-* or host-* package contains a targetinstall rule
> > +# which will not be executed
> > +#
> > +match($0, /\$\(STATEDIR\)\/((image-.*|host-.*)\.targetinstall(.post)?):/,
> > m) {
>
> Please use the same syntax as everywhere else in the file. It's complicated
> enough.
I don't fully understand what you meant by this. If it's about using
match(), I was using that explicitely here so I'm able to use m[1] in
the lines below without having to go through another gensub() which
would effectively use the same regex again.
- Roland
>
> > + print "Warning: " m[1] " stage will be ignored. " \
> > + "See section 'Rule File Layout' in the PTXdist reference for
> > more info."
>
> No, this should be fatal. Add a '$(error ...)' and maybe some $(warning
> ...) for multiple lines. Also, reference the filename and line number to
> make this easier to find.
>
> Michael
>
> > +}
> > +
> > +
> > #
> > # parse "PACKAGES-$(PTXCONF_PKG) += pkg" lines, i.e. rules-files from
> > # rules/*.make. Setup mapping between upper and lower case pkg names
> > --
> > 2.20.1
--
Roland Hieber | r.hie...@pengutronix.de |
Pengutronix e.K. | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
