Commit a3c4d4ab authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: hard-code KBUILD_ALLDIRS in scripts/Makefile.package 



My future plan is to list subdirectories in ./Kbuild. When 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: default avatarMasahiro Yamada <masahiroy@kernel.org>
Tested-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Reviewed-by: default avatarNicolas Schier <nicolas@fjasle.eu>
parent ed7ceac1

Makefile

+2 −6
Original line number Diff line number Diff line
@@ -1109,13 +1109,11 @@ vmlinux-dirs := $(patsubst %/,%,$(filter %/, \ 
		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \

		     $(libs-y) $(libs-m)))



vmlinux-alldirs	:= $(sort $(vmlinux-dirs) Documentation \

build-dirs	:= $(vmlinux-dirs)

clean-dirs	:= $(sort $(vmlinux-dirs) Documentation \

		     $(patsubst %/,%,$(filter %/, $(core-) \

			$(drivers-) $(libs-))))



build-dirs	:= $(vmlinux-dirs)

clean-dirs	:= $(vmlinux-alldirs)



subdir-modorder := $(addsuffix /modules.order, $(build-dirs))



# Externally visible symbols (used by link-vmlinux.sh)
@@ -1131,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)

scripts/Makefile.package

+4 −1
Original line number Diff line number Diff line
@@ -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