| From fcad46d1a1dbbd314ba7b4ffe91c36373acd6a75 Mon Sep 17 00:00:00 2001 |
| From: Masahiro Yamada <yamada.masahiro@socionext.com> |
| Date: Thu, 14 Feb 2019 12:05:14 +0900 |
| Subject: kbuild: pkg: use -f $(srctree)/Makefile to recurse to top Makefile |
| |
| [ Upstream commit 175209cce23d6b0669ed5366add2517e26cd75cd ] |
| |
| '$(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. |
| |
| Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| scripts/package/Makefile | 4 ++-- |
| scripts/package/builddeb | 10 +++++----- |
| scripts/package/buildtar | 2 +- |
| scripts/package/mkdebian | 6 ++++-- |
| 4 files changed, 12 insertions(+), 10 deletions(-) |
| |
| diff --git a/scripts/package/Makefile b/scripts/package/Makefile |
| index 453fecee62f0..aa39c2b5e46a 100644 |
| --- a/scripts/package/Makefile |
| +++ b/scripts/package/Makefile |
| @@ -59,7 +59,7 @@ rpm-pkg: FORCE |
| # binrpm-pkg |
| # --------------------------------------------------------------------------- |
| binrpm-pkg: FORCE |
| - $(MAKE) KBUILD_SRC= |
| + $(MAKE) -f $(srctree)/Makefile |
| $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec |
| +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \ |
| $(UTS_MACHINE) -bb $(objtree)/binkernel.spec |
| @@ -102,7 +102,7 @@ clean-dirs += $(objtree)/snap/ |
| # tarball targets |
| # --------------------------------------------------------------------------- |
| tar%pkg: FORCE |
| - $(MAKE) KBUILD_SRC= |
| + $(MAKE) -f $(srctree)/Makefile |
| $(CONFIG_SHELL) $(srctree)/scripts/package/buildtar $@ |
| |
| clean-dirs += $(objtree)/tar-install/ |
| diff --git a/scripts/package/builddeb b/scripts/package/builddeb |
| index f43a274f4f1d..8ac25d10a6ad 100755 |
| --- a/scripts/package/builddeb |
| +++ b/scripts/package/builddeb |
| @@ -86,12 +86,12 @@ cp "$($MAKE -s -f $srctree/Makefile image_name)" "$tmpdir/$installed_image_path" |
| if grep -q "^CONFIG_OF_EARLY_FLATTREE=y" $KCONFIG_CONFIG ; then |
| # Only some architectures with OF support have this target |
| if [ -d "${srctree}/arch/$SRCARCH/boot/dts" ]; then |
| - $MAKE KBUILD_SRC= INSTALL_DTBS_PATH="$tmpdir/usr/lib/$packagename" dtbs_install |
| + $MAKE -f $srctree/Makefile INSTALL_DTBS_PATH="$tmpdir/usr/lib/$packagename" dtbs_install |
| fi |
| fi |
| |
| if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then |
| - INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install |
| + INSTALL_MOD_PATH="$tmpdir" $MAKE -f $srctree/Makefile modules_install |
| rm -f "$tmpdir/lib/modules/$version/build" |
| rm -f "$tmpdir/lib/modules/$version/source" |
| if [ "$ARCH" = "um" ] ; then |
| @@ -113,14 +113,14 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then |
| # resign stripped modules |
| MODULE_SIG_ALL="$(grep -s '^CONFIG_MODULE_SIG_ALL=y' $KCONFIG_CONFIG || true)" |
| if [ -n "$MODULE_SIG_ALL" ]; then |
| - INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_sign |
| + INSTALL_MOD_PATH="$tmpdir" $MAKE -f $srctree/Makefile modules_sign |
| fi |
| fi |
| fi |
| |
| if [ "$ARCH" != "um" ]; then |
| - $MAKE headers_check KBUILD_SRC= |
| - $MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr" |
| + $MAKE -f $srctree/Makefile headers_check |
| + $MAKE -f $srctree/Makefile headers_install INSTALL_HDR_PATH="$libc_headers_dir/usr" |
| fi |
| |
| # Install the maintainer scripts |
| diff --git a/scripts/package/buildtar b/scripts/package/buildtar |
| index d624a07a4e77..cfd2a4a3fe42 100755 |
| --- a/scripts/package/buildtar |
| +++ b/scripts/package/buildtar |
| @@ -57,7 +57,7 @@ dirs=boot |
| # Try to install modules |
| # |
| if grep -q '^CONFIG_MODULES=y' "${KCONFIG_CONFIG}"; then |
| - make ARCH="${ARCH}" O="${objtree}" KBUILD_SRC= INSTALL_MOD_PATH="${tmpdir}" modules_install |
| + make ARCH="${ARCH}" -f ${srctree}/Makefile INSTALL_MOD_PATH="${tmpdir}" modules_install |
| dirs="$dirs lib" |
| fi |
| |
| diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian |
| index edcad61fe3cd..f030961c5165 100755 |
| --- a/scripts/package/mkdebian |
| +++ b/scripts/package/mkdebian |
| @@ -205,13 +205,15 @@ EOF |
| cat <<EOF > debian/rules |
| #!$(command -v $MAKE) -f |
| |
| +srctree ?= . |
| + |
| build: |
| \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \ |
| - KBUILD_BUILD_VERSION=${revision} KBUILD_SRC= |
| + KBUILD_BUILD_VERSION=${revision} -f \$(srctree)/Makefile |
| |
| binary-arch: |
| \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \ |
| - KBUILD_BUILD_VERSION=${revision} KBUILD_SRC= intdeb-pkg |
| + KBUILD_BUILD_VERSION=${revision} -f \$(srctree)/Makefile intdeb-pkg |
| |
| clean: |
| rm -rf debian/*tmp debian/files |
| -- |
| 2.19.1 |
| |