]>
Commit | Line | Data |
---|---|---|
f143d13b SL |
1 | From fcad46d1a1dbbd314ba7b4ffe91c36373acd6a75 Mon Sep 17 00:00:00 2001 |
2 | From: Masahiro Yamada <yamada.masahiro@socionext.com> | |
3 | Date: Thu, 14 Feb 2019 12:05:14 +0900 | |
4 | Subject: kbuild: pkg: use -f $(srctree)/Makefile to recurse to top Makefile | |
5 | ||
6 | [ Upstream commit 175209cce23d6b0669ed5366add2517e26cd75cd ] | |
7 | ||
8 | '$(MAKE) KBUILD_SRC=' changes the working directory back and forth | |
9 | between objtree and srctree. | |
10 | ||
11 | It is better to recurse to the top-level Makefile directly. | |
12 | ||
13 | Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> | |
14 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
15 | --- | |
16 | scripts/package/Makefile | 4 ++-- | |
17 | scripts/package/builddeb | 10 +++++----- | |
18 | scripts/package/buildtar | 2 +- | |
19 | scripts/package/mkdebian | 6 ++++-- | |
20 | 4 files changed, 12 insertions(+), 10 deletions(-) | |
21 | ||
22 | diff --git a/scripts/package/Makefile b/scripts/package/Makefile | |
23 | index 453fecee62f0..aa39c2b5e46a 100644 | |
24 | --- a/scripts/package/Makefile | |
25 | +++ b/scripts/package/Makefile | |
26 | @@ -59,7 +59,7 @@ rpm-pkg: FORCE | |
27 | # binrpm-pkg | |
28 | # --------------------------------------------------------------------------- | |
29 | binrpm-pkg: FORCE | |
30 | - $(MAKE) KBUILD_SRC= | |
31 | + $(MAKE) -f $(srctree)/Makefile | |
32 | $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec | |
33 | +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \ | |
34 | $(UTS_MACHINE) -bb $(objtree)/binkernel.spec | |
35 | @@ -102,7 +102,7 @@ clean-dirs += $(objtree)/snap/ | |
36 | # tarball targets | |
37 | # --------------------------------------------------------------------------- | |
38 | tar%pkg: FORCE | |
39 | - $(MAKE) KBUILD_SRC= | |
40 | + $(MAKE) -f $(srctree)/Makefile | |
41 | $(CONFIG_SHELL) $(srctree)/scripts/package/buildtar $@ | |
42 | ||
43 | clean-dirs += $(objtree)/tar-install/ | |
44 | diff --git a/scripts/package/builddeb b/scripts/package/builddeb | |
45 | index f43a274f4f1d..8ac25d10a6ad 100755 | |
46 | --- a/scripts/package/builddeb | |
47 | +++ b/scripts/package/builddeb | |
48 | @@ -86,12 +86,12 @@ cp "$($MAKE -s -f $srctree/Makefile image_name)" "$tmpdir/$installed_image_path" | |
49 | if grep -q "^CONFIG_OF_EARLY_FLATTREE=y" $KCONFIG_CONFIG ; then | |
50 | # Only some architectures with OF support have this target | |
51 | if [ -d "${srctree}/arch/$SRCARCH/boot/dts" ]; then | |
52 | - $MAKE KBUILD_SRC= INSTALL_DTBS_PATH="$tmpdir/usr/lib/$packagename" dtbs_install | |
53 | + $MAKE -f $srctree/Makefile INSTALL_DTBS_PATH="$tmpdir/usr/lib/$packagename" dtbs_install | |
54 | fi | |
55 | fi | |
56 | ||
57 | if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then | |
58 | - INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install | |
59 | + INSTALL_MOD_PATH="$tmpdir" $MAKE -f $srctree/Makefile modules_install | |
60 | rm -f "$tmpdir/lib/modules/$version/build" | |
61 | rm -f "$tmpdir/lib/modules/$version/source" | |
62 | if [ "$ARCH" = "um" ] ; then | |
63 | @@ -113,14 +113,14 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then | |
64 | # resign stripped modules | |
65 | MODULE_SIG_ALL="$(grep -s '^CONFIG_MODULE_SIG_ALL=y' $KCONFIG_CONFIG || true)" | |
66 | if [ -n "$MODULE_SIG_ALL" ]; then | |
67 | - INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_sign | |
68 | + INSTALL_MOD_PATH="$tmpdir" $MAKE -f $srctree/Makefile modules_sign | |
69 | fi | |
70 | fi | |
71 | fi | |
72 | ||
73 | if [ "$ARCH" != "um" ]; then | |
74 | - $MAKE headers_check KBUILD_SRC= | |
75 | - $MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr" | |
76 | + $MAKE -f $srctree/Makefile headers_check | |
77 | + $MAKE -f $srctree/Makefile headers_install INSTALL_HDR_PATH="$libc_headers_dir/usr" | |
78 | fi | |
79 | ||
80 | # Install the maintainer scripts | |
81 | diff --git a/scripts/package/buildtar b/scripts/package/buildtar | |
82 | index d624a07a4e77..cfd2a4a3fe42 100755 | |
83 | --- a/scripts/package/buildtar | |
84 | +++ b/scripts/package/buildtar | |
85 | @@ -57,7 +57,7 @@ dirs=boot | |
86 | # Try to install modules | |
87 | # | |
88 | if grep -q '^CONFIG_MODULES=y' "${KCONFIG_CONFIG}"; then | |
89 | - make ARCH="${ARCH}" O="${objtree}" KBUILD_SRC= INSTALL_MOD_PATH="${tmpdir}" modules_install | |
90 | + make ARCH="${ARCH}" -f ${srctree}/Makefile INSTALL_MOD_PATH="${tmpdir}" modules_install | |
91 | dirs="$dirs lib" | |
92 | fi | |
93 | ||
94 | diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian | |
95 | index edcad61fe3cd..f030961c5165 100755 | |
96 | --- a/scripts/package/mkdebian | |
97 | +++ b/scripts/package/mkdebian | |
98 | @@ -205,13 +205,15 @@ EOF | |
99 | cat <<EOF > debian/rules | |
100 | #!$(command -v $MAKE) -f | |
101 | ||
102 | +srctree ?= . | |
103 | + | |
104 | build: | |
105 | \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \ | |
106 | - KBUILD_BUILD_VERSION=${revision} KBUILD_SRC= | |
107 | + KBUILD_BUILD_VERSION=${revision} -f \$(srctree)/Makefile | |
108 | ||
109 | binary-arch: | |
110 | \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \ | |
111 | - KBUILD_BUILD_VERSION=${revision} KBUILD_SRC= intdeb-pkg | |
112 | + KBUILD_BUILD_VERSION=${revision} -f \$(srctree)/Makefile intdeb-pkg | |
113 | ||
114 | clean: | |
115 | rm -rf debian/*tmp debian/files | |
116 | -- | |
117 | 2.19.1 | |
118 |