History

kbuild: pkg: use -f $(srctree)/Makefile to recurse to top Makefile

'$(MAKE) KBUILD_SRC=' changes the working directory back and forth between objtree and srctree. It is better to recurse to the top-level Makefile directly.

Masahiro Yamada committed 7 years ago

Commit 175209c1 parent ad150064 files · +12 −10Browse files

Unified · Split

4 files
  1. scripts/package/Makefile +2 −2
  2. scripts/package/builddeb +5 −5
  3. scripts/package/buildtar +1 −1
  4. scripts/package/mkdebian +4 −2
scripts/package/Makefile+2−2
@@ -59,7 +59,7 @@ rpm-pkg: FORCE · 58 unmodified lines
59# binrpm-pkg59# binrpm-pkg
60# ---------------------------------------------------------------------------60# ---------------------------------------------------------------------------
61binrpm-pkg: FORCE61binrpm-pkg: FORCE
62 $(MAKE) KBUILD_SRC=62 $(MAKE) -f $(srctree)/Makefile
63 $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec63 $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec
64 +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \64 +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \
65 $(UTS_MACHINE) -bb $(objtree)/binkernel.spec65 $(UTS_MACHINE) -bb $(objtree)/binkernel.spec
@@ -102,7 +102,7 @@ clean-dirs += $(objtree)/snap/ · 36 unmodified lines
102# tarball targets102# tarball targets
103# ---------------------------------------------------------------------------103# ---------------------------------------------------------------------------
104tar%pkg: FORCE104tar%pkg: FORCE
105 $(MAKE) KBUILD_SRC=105 $(MAKE) -f $(srctree)/Makefile
106 $(CONFIG_SHELL) $(srctree)/scripts/package/buildtar $@106 $(CONFIG_SHELL) $(srctree)/scripts/package/buildtar $@
107 107
108clean-dirs += $(objtree)/tar-install/108clean-dirs += $(objtree)/tar-install/
scripts/package/builddeb+5−5
@@ -86,12 +86,12 @@ cp "$($MAKE -s -f $srctree/Makefile image_name)" "$tmpdir/$installed_image_path" · 85 unmodified lines
86if grep -q "^CONFIG_OF_EARLY_FLATTREE=y" $KCONFIG_CONFIG ; then86if grep -q "^CONFIG_OF_EARLY_FLATTREE=y" $KCONFIG_CONFIG ; then
87 # Only some architectures with OF support have this target87 # Only some architectures with OF support have this target
88 if [ -d "${srctree}/arch/$SRCARCH/boot/dts" ]; then88 if [ -d "${srctree}/arch/$SRCARCH/boot/dts" ]; then
89 $MAKE KBUILD_SRC= INSTALL_DTBS_PATH="$tmpdir/usr/lib/$packagename" dtbs_install89 $MAKE -f $srctree/Makefile INSTALL_DTBS_PATH="$tmpdir/usr/lib/$packagename" dtbs_install
90 fi90 fi
91fi91fi
92 92
93if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then93if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
94 INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install94 INSTALL_MOD_PATH="$tmpdir" $MAKE -f $srctree/Makefile modules_install
95 rm -f "$tmpdir/lib/modules/$version/build"95 rm -f "$tmpdir/lib/modules/$version/build"
96 rm -f "$tmpdir/lib/modules/$version/source"96 rm -f "$tmpdir/lib/modules/$version/source"
97 if [ "$ARCH" = "um" ] ; then97 if [ "$ARCH" = "um" ] ; then
@@ -113,14 +113,14 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then · 15 unmodified lines
113 # resign stripped modules113 # resign stripped modules
114 MODULE_SIG_ALL="$(grep -s '^CONFIG_MODULE_SIG_ALL=y' $KCONFIG_CONFIG || true)"114 MODULE_SIG_ALL="$(grep -s '^CONFIG_MODULE_SIG_ALL=y' $KCONFIG_CONFIG || true)"
115 if [ -n "$MODULE_SIG_ALL" ]; then115 if [ -n "$MODULE_SIG_ALL" ]; then
116 INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_sign116 INSTALL_MOD_PATH="$tmpdir" $MAKE -f $srctree/Makefile modules_sign
117 fi117 fi
118 fi118 fi
119fi119fi
120 120
121if [ "$ARCH" != "um" ]; then121if [ "$ARCH" != "um" ]; then
122 $MAKE headers_check KBUILD_SRC=122 $MAKE -f $srctree/Makefile headers_check
123 $MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"123 $MAKE -f $srctree/Makefile headers_install INSTALL_HDR_PATH="$libc_headers_dir/usr"
124fi124fi
125 125
126# Install the maintainer scripts126# Install the maintainer scripts
scripts/package/buildtar+1−1
@@ -57,7 +57,7 @@ dirs=boot · 56 unmodified lines
57# Try to install modules57# Try to install modules
58#58#
59if grep -q '^CONFIG_MODULES=y' "${KCONFIG_CONFIG}"; then59if grep -q '^CONFIG_MODULES=y' "${KCONFIG_CONFIG}"; then
60 make ARCH="${ARCH}" O="${objtree}" KBUILD_SRC= INSTALL_MOD_PATH="${tmpdir}" modules_install60 make ARCH="${ARCH}" -f ${srctree}/Makefile INSTALL_MOD_PATH="${tmpdir}" modules_install
61 dirs="$dirs lib"61 dirs="$dirs lib"
62fi62fi
63 63
scripts/package/mkdebian+4−2
@@ -205,13 +205,15 @@ EOF · 204 unmodified lines
205cat <<EOF > debian/rules205cat <<EOF > debian/rules
206#!$(command -v $MAKE) -f206#!$(command -v $MAKE) -f
207 207
208srctree ?= .
209
208build:210build:
209 \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \211 \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \
210 KBUILD_BUILD_VERSION=${revision} KBUILD_SRC=212 KBUILD_BUILD_VERSION=${revision} -f \$(srctree)/Makefile
211 213
212binary-arch:214binary-arch:
213 \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \215 \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \
214 KBUILD_BUILD_VERSION=${revision} KBUILD_SRC= intdeb-pkg216 KBUILD_BUILD_VERSION=${revision} -f \$(srctree)/Makefile intdeb-pkg
215 217
216clean:218clean:
217 rm -rf debian/*tmp debian/files219 rm -rf debian/*tmp debian/files