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