Re: [ptxdist] [PATCH 5/7] ima-evm-utils: version bump 1.1 -> 1.2.1

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

On Thu, Jun 17, 2021 at 08:44:02AM +0200, Michael Olbrich wrote:
> On Wed, Jun 16, 2021 at 06:01:54PM +0200, Roland Hieber wrote:
> > On Fri, Jun 11, 2021 at 02:18:42PM +0200, Michael Olbrich wrote:
> > > On Mon, Jun 07, 2021 at 03:09:07PM +0200, Roland Hieber wrote:
> > > > The tarball does not include a configure script, generate it in the
> > > > extract.post stage.
> > > > 
> > > > Based on a patch by Marc Kleine-Budde.
> > > > 
> > > > Cc: Marc Kleine-Budde <mkl@pengutronix.de>
> > > > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > > > ---
> > > >  patches/ima-evm-utils-1.2.1/autogen.sh | 1 +
> > > >  rules/ima-evm-utils.make               | 7 ++++---
> > > >  2 files changed, 5 insertions(+), 3 deletions(-)
> > > >  create mode 120000 patches/ima-evm-utils-1.2.1/autogen.sh
> > > > 
> > > > diff --git a/patches/ima-evm-utils-1.2.1/autogen.sh b/patches/ima-evm-utils-1.2.1/autogen.sh
> > > > new file mode 120000
> > > > index 000000000000..9f8a4cb7ddcb
> > > > --- /dev/null
> > > > +++ b/patches/ima-evm-utils-1.2.1/autogen.sh
> > > > @@ -0,0 +1 @@
> > > > +../autogen.sh
> > > > \ No newline at end of file
> > > > diff --git a/rules/ima-evm-utils.make b/rules/ima-evm-utils.make
> > > > index eda5ad8a2883..82c5641e3776 100644
> > > > --- a/rules/ima-evm-utils.make
> > > > +++ b/rules/ima-evm-utils.make
> > > > @@ -1,7 +1,7 @@
> > > >  # -*-makefile-*-
> > > >  #
> > > >  # Copyright (C) 2013 by Michael Grzeschik <mgr@pengutronix.de>
> > > > -#               2015 by Marc Kleine-Budde <mkl@pengutronix.de>
> > > > +#               2015, 2020 by Marc Kleine-Budde <mkl@pengutronix.de>
> > > >  #               2021 Roland Hieber, Pengutronix <rhi@pengutronix.de>
> > > >  #
> > > >  # For further information about the PTXdist project and license conditions
> > > > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_IMA_EVM_UTILS) += ima-evm-utils
> > > >  #
> > > >  # Paths and names
> > > >  #
> > > > -IMA_EVM_UTILS_VERSION	:= 1.1
> > > > -IMA_EVM_UTILS_MD5	:= 77455aeee54fdc7a70c733bcb65d33cc
> > > > +IMA_EVM_UTILS_VERSION	:= 1.2.1
> > > 
> > > Why 1.2.1? It's two years old and the latest release is 1.3.1.
> > > 
> > > There are patches for the old version.
> > > 
> > > Building can fail with:
> > > 
> > > make[2]: Entering directory '.../build-host/ima-evm-utils-1.2.1'
> > > asciidoc -d manpage -b docbook -o evmctl.1.xsl README
> > > /bin/bash: asciidoc: command not found
> > > 
> > > Upstream has a Patch to make building the docs optional.
> > 
> > If you mean the MANPAGE_DOCBOOK_XSL configure variable, I didn't get
> > that to work, so I just expanded the "remove docs" patch in v2.
> 
> I meant upstream commit 4a67103e9d9280273b349aebeedbb37eb3870aeb ("man:
> Generate doc targets only when XSL found").

Ignore this. I'm not quite awake yet. I'll take a look.

Michael

-- 
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 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de