diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-25 13:06:30 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-25 13:06:30 -0500 |
| commit | 5e2fda4776bb94ee47314e71cefaa8a104f8f4ab (patch) | |
| tree | 56b316ddbd27ccf63c470f84dd9f0fad39b5100f /scripts/package | |
| parent | f61ec2c97cf8a517cd5714efc919138a9d8991cf (diff) | |
| parent | 10aaa3b7e95b9649fd658ac7e9075093316425d8 (diff) | |
Merge tag 'kbuild-v4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild updates from Masahiro Yamada:
- use 'pwd' instead of '/bin/pwd' for portability
- clean up Makefiles
- fix ld-option for clang
- fix malloc'ed data size in Kconfig
- fix parallel building along with coccicheck
- fix a minor issue of package building
- prompt to use "rpm-pkg" instead of "rpm"
- clean up *.i and *.lst patterns by "make clean"
* tag 'kbuild-v4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kbuild: drop $(extra-y) from real-objs-y
kbuild: clean up *.i and *.lst patterns by make clean
kbuild: rpm: prompt to use "rpm-pkg" if "rpm" target is used
kbuild: pkg: use --transform option to prefix paths in tar
coccinelle: fix parallel build with CHECK=scripts/coccicheck
kconfig/symbol.c: use correct pointer type argument for sizeof
kbuild: Set KBUILD_CFLAGS before incl. arch Makefile
kbuild: remove all dummy assignments to obj-
kbuild: create built-in.o automatically if parent directory wants it
kbuild: /bin/pwd -> pwd
Diffstat (limited to 'scripts/package')
| -rw-r--r-- | scripts/package/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/package/Makefile b/scripts/package/Makefile index 9ed96aefc72d..c23534925b38 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile | |||
| @@ -39,14 +39,13 @@ if test "$(objtree)" != "$(srctree)"; then \ | |||
| 39 | false; \ | 39 | false; \ |
| 40 | fi ; \ | 40 | fi ; \ |
| 41 | $(srctree)/scripts/setlocalversion --save-scmversion; \ | 41 | $(srctree)/scripts/setlocalversion --save-scmversion; \ |
| 42 | ln -sf $(srctree) $(2); \ | ||
| 43 | tar -cz $(RCS_TAR_IGNORE) -f $(2).tar.gz \ | 42 | tar -cz $(RCS_TAR_IGNORE) -f $(2).tar.gz \ |
| 44 | $(addprefix $(2)/,$(TAR_CONTENT) $(3)); \ | 43 | --transform 's:^:$(2)/:S' $(TAR_CONTENT) $(3); \ |
| 45 | rm -f $(2) $(objtree)/.scmversion | 44 | rm -f $(objtree)/.scmversion |
| 46 | 45 | ||
| 47 | # rpm-pkg | 46 | # rpm-pkg |
| 48 | # --------------------------------------------------------------------------- | 47 | # --------------------------------------------------------------------------- |
| 49 | rpm-pkg rpm: FORCE | 48 | rpm-pkg: FORCE |
| 50 | $(MAKE) clean | 49 | $(MAKE) clean |
| 51 | $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec | 50 | $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec |
| 52 | $(call cmd,src_tar,$(KERNELPATH),kernel.spec) | 51 | $(call cmd,src_tar,$(KERNELPATH),kernel.spec) |
