On Thu, May 27, 2021 at 03:56:41AM +0900, Masahiro Yamada wrote:
> On Thu, May 27, 2021 at 2:39 AM Michal Suchanek <msuchanek@xxxxxxx> wrote:
> >
> > This reverts commit 243b50c141d71fcf7b88e94474b3b9269f0b1f9d.
> >
> > When packaging the kernel it is built in different place from the one in
> > which it will be installed. After build the makefile needs to be
> > regenerated with the target location but with mkmakefile merged into
> > Makefile tehre is no way to do that.
> >
> > Signed-off-by: Michal Suchanek <msuchanek@xxxxxxx>
>
> My patch was not working as expected
> regardless of packaging.
>
> Does the following fix-up work for you?
For the packaging I need some way to regenerate the Makefile and fake
the directory where the Makefile will be on the user system (ie DESTDIR)
Without the mkmakefile I do not see any way to do it.
If the kernel makefile is no longer location dependent there is no need
any more, of course.
Thanks
Michal
>
>
> diff --git a/Makefile b/Makefile
> index 54bb019a7da3..504327207d66 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -552,16 +552,13 @@ ifdef building_out_of_srctree
> # At the same time when output Makefile generated, generate .gitignore to
> # ignore whole output directory
>
> -quiet_cmd_makefile = GEN $@
> +quiet_cmd_makefile = GEN Makefile
> cmd_makefile = { \
> echo "\# Automatically generated by $(srctree)/Makefile: don't edit"; \
> echo "include $(srctree)/Makefile"; \
> - } > $@
> + } > Makefile
>
> -Makefile: FORCE
> - $(call cmd,makefile)
> -
> -outputmakefile: Makefile
> +outputmakefile:
> $(Q)if [ -f $(srctree)/.config -o \
> -d $(srctree)/include/config -o \
> -d $(srctree)/arch/$(SRCARCH)/include/generated ]; then \
> @@ -572,6 +569,7 @@ outputmakefile: Makefile
> false; \
> fi
> $(Q)ln -fsn $(srctree) source
> + $(call cmd,makefile)
> $(Q)test -e .gitignore || \
> { echo "# this is build directory, ignore it"; echo "*"; } > .gitignore
> endif
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
> > ---
> > Makefile | 15 +++------------
> > scripts/mkmakefile | 17 +++++++++++++++++
> > 2 files changed, 20 insertions(+), 12 deletions(-)
> > create mode 100755 scripts/mkmakefile
> >
> > diff --git a/Makefile b/Makefile
> > index 58b086b30144..462899c1b5d7 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -573,24 +573,14 @@ scripts_basic:
> > $(Q)rm -f .tmp_quiet_recordmcount
> >
> > PHONY += outputmakefile
> > -ifdef building_out_of_srctree
> > # Before starting out-of-tree build, make sure the source tree is clean.
> > # outputmakefile generates a Makefile in the output directory, if using a
> > # separate output directory. This allows convenient use of make in the
> > # output directory.
> > # At the same time when output Makefile generated, generate .gitignore to
> > # ignore whole output directory
> > -
> > -quiet_cmd_makefile = GEN $@
> > - cmd_makefile = { \
> > - echo "\# Automatically generated by $(srctree)/Makefile: don't edit"; \
> > - echo "include $(srctree)/Makefile"; \
> > - } > $@
> > -
> > -Makefile: FORCE
> > - $(call cmd,makefile)
> > -
> > -outputmakefile: Makefile
> > +outputmakefile:
> > +ifdef building_out_of_srctree
> > $(Q)if [ -f $(srctree)/.config -o \
> > -d $(srctree)/include/config -o \
> > -d $(srctree)/arch/$(SRCARCH)/include/generated ]; then \
> > @@ -601,6 +591,7 @@ outputmakefile: Makefile
> > false; \
> > fi
> > $(Q)ln -fsn $(srctree) source
> > + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile $(srctree)
> > $(Q)test -e .gitignore || \
> > { echo "# this is build directory, ignore it"; echo "*"; } > .gitignore
> > endif
> > diff --git a/scripts/mkmakefile b/scripts/mkmakefile
> > new file mode 100755
> > index 000000000000..1cb174751429
> > --- /dev/null
> > +++ b/scripts/mkmakefile
> > @@ -0,0 +1,17 @@
> > +#!/bin/sh
> > +# SPDX-License-Identifier: GPL-2.0
> > +# Generates a small Makefile used in the root of the output
> > +# directory, to allow make to be started from there.
> > +# The Makefile also allow for more convinient build of external modules
> > +
> > +# Usage
> > +# $1 - Kernel src directory
> > +
> > +if [ "${quiet}" != "silent_" ]; then
> > + echo " GEN Makefile"
> > +fi
> > +
> > +cat << EOF > Makefile
> > +# Automatically generated by $0: don't edit
> > +include $1/Makefile
> > +EOF
> > --
> > 2.26.2
> >
>
>
> --
> Best Regards
> Masahiro Yamada
