> On 2 Sep 2021, at 20:42, Mike Pagano <[email protected]> wrote: > > Support the possibility that the Makefile could be > one of the following and should be checked in > the order described here: > > https://www.gnu.org/software/make/manual/make.html > > Order of checking and valid Makefiles names: > GNUMakefile, makefile, Makefile > > Bug: https://bugs.gentoo.org/663368 > > Signed-off-by: Mike Pagano <[email protected]> > --- > eclass/linux-info.eclass | 33 +++++++++++++++++++++++++++++---- > 1 file changed, 29 insertions(+), 4 deletions(-) > > diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass > index 0b6df1bf5..2dfc8979f 100644 > --- a/eclass/linux-info.eclass > +++ b/eclass/linux-info.eclass > @@ -80,6 +80,15 @@ KERNEL_DIR="${KERNEL_DIR:-${ROOT%/}/usr/src/linux}" > # There are also a couple of variables which are set by this, and shouldn't be > # set by hand. These are as follows: > +# @ECLASS-VARIABLE: KERNEL_MAKEFILE > +# @INTERNAL > +# @DESCRIPTION: > +# According to upstream documentation, by default, when make looks for the > makefile, it tries > +# the following names, in order: GNUmakefile, makefile and Makefile. Set > this variable to the > +# proper Makefile name or the eclass will search in this order for it. > +# See https://www.gnu.org/software/make/manual/make.html > +: ${KERNEL_MAKEFILE:=""}
Thanks for adding the reference! I'm often an advocate for adding _more_ links
and explanation
because while it's sometimes a bit dull to add, it makes life a lot easier
later on when researching.
> +
> # @ECLASS-VARIABLE: KV_FULL
> # @OUTPUT_VARIABLE
> # @DESCRIPTION:
> @@ -510,7 +519,9 @@ get_version() {
> qeinfo " ${KV_DIR}"
> fi
> - if [ ! -s "${KV_DIR}/Makefile" ]
> + get_makefile
> +
> + if [ ! -s "${KERNEL_MAKEFILE}" ]
> then
Can you use Bash tests instead?
(https://devmanual.gentoo.org/tools-reference/bash/#single-versus-double-brackets-in-bash)
Best,
sam
signature.asc
Description: Message signed with OpenPGP
