Re: [PATCH v3 1/7] kbuild: hard-code KBUILD_ALLDIRS in scripts/Makefile.package

[Nicolas Schier]

On Sun, 25 Sep 2022 03:19:09 +0900 Masahiro Yamada wrote:
> My plan is to list subdirectories in ./Kbuild. Once it occurs,
> $(vmlinux-alldirs) will not contain all subdirectories.
> 
> Let's hard-code the directory list until I get around to implementing
> a more sophisticated way for generating a source tarball.
> 
> Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
> ---

Reviewed-by: Nicolas Schier <nicolas@xxxxxxxxx>

> Changes in v3:
>   - New patch
> 
>  Makefile                 | 2 --
>  scripts/Makefile.package | 5 ++++-
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 57cf4a5bea6d..eb4bbbc898d0 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1129,8 +1129,6 @@ KBUILD_VMLINUX_OBJS += $(patsubst %/,%/built-in.a, $(drivers-y))
>  
>  export KBUILD_VMLINUX_OBJS KBUILD_VMLINUX_LIBS
>  export KBUILD_LDS          := arch/$(SRCARCH)/kernel/vmlinux.lds
> -# used by scripts/Makefile.package
> -export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) LICENSES arch include scripts tools)
>  
>  vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS)
>  
> diff --git a/scripts/Makefile.package b/scripts/Makefile.package
> index 5017f6b2da80..8bbcced67c22 100644
> --- a/scripts/Makefile.package
> +++ b/scripts/Makefile.package
> @@ -29,7 +29,10 @@ KDEB_SOURCENAME ?= linux-upstream
>  KBUILD_PKG_ROOTCMD ?="fakeroot -u"
>  export KDEB_SOURCENAME
>  # Include only those top-level files that are needed by make, plus the GPL copy
> -TAR_CONTENT := $(KBUILD_ALLDIRS) .config .scmversion Makefile \
> +TAR_CONTENT := Documentation LICENSES arch block certs crypto drivers fs \
> +               include init io_uring ipc kernel lib mm net samples scripts \
> +               security sound tools usr virt \
> +               .config .scmversion Makefile \
>                 Kbuild Kconfig COPYING $(wildcard localversion*)
>  MKSPEC     := $(srctree)/scripts/package/mkspec
>  
> -- 
> 2.34.1

-- 
epost|xmpp: nicolas@xxxxxxxxx          irc://oftc.net/nsc
↳ gpg: 18ed 52db e34f 860e e9fb  c82b 7d97 0932 55a0 ce7f
     -- frykten for herren er opphav til kunnskap --

Attachment: signature.asc
Description: PGP signature