Merge tag 'kbuild-fixes-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - fix build errors in binrpm-pkg and bindeb-pkg targets

 - fix false positive matches in merge_config.sh

 - fix build version mismatch in deb-pkg target

 - fix dtbs_install handling in (bin)deb-pkg target

 - revert a commit that allows setlocalversion to write to source tree

* tag 'kbuild-fixes-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  builddeb: Fix inclusion of dtbs in debian package
  Revert "scripts/setlocalversion: git: Make -dirty check more robust"
  kbuild: deb-pkg: fix too low build version number
  kconfig: merge_config: avoid false positive matches from comment lines
  kbuild: deb-pkg: fix bindeb-pkg breakage when O= is used
  kbuild: rpm-pkg: fix binrpm-pkg breakage when O= is used

5 files changed, 19 insertions, 14 deletions

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index da66e7742282..0ef906499646 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -102,7 +102,8 @@ if [ ! -r "$INITFILE" ]; then
 fi
 
 MERGE_LIST=$*
-SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)[= ].*/\2/p"
+SED_CONFIG_EXP1="s/^\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)=.*/\1/p"
+SED_CONFIG_EXP2="s/^# \(${CONFIG_PREFIX}[a-zA-Z0-9_]*\) is not set$/\1/p"
 
 TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
 
@@ -116,7 +117,7 @@ for MERGE_FILE in $MERGE_LIST ; do
                 echo "The merge file '$MERGE_FILE' does not exist.  Exit." >&2
                 exit 1
         fi
-        CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)
+        CFG_LIST=$(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $MERGE_FILE)
 
         for CFG in $CFG_LIST ; do
                 grep -q -w $CFG $TMP_FILE || continue
@@ -159,7 +160,7 @@ make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
 
 
 # Check all specified config values took (might have missed-dependency issues)
-for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do
+for CFG in $(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $TMP_FILE); do
 
         REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE)
         ACTUAL_VAL=$(grep -w -e "$CFG" "$KCONFIG_CONFIG")
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 90c9a8ac7adb..f43a274f4f1d 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -81,11 +81,11 @@ else
         cp System.map "$tmpdir/boot/System.map-$version"
         cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version"
 fi
-cp "$($MAKE -s image_name)" "$tmpdir/$installed_image_path"
+cp "$($MAKE -s -f $srctree/Makefile image_name)" "$tmpdir/$installed_image_path"
 
-if grep -q "^CONFIG_OF=y" $KCONFIG_CONFIG ; then
+if grep -q "^CONFIG_OF_EARLY_FLATTREE=y" $KCONFIG_CONFIG ; then
         # Only some architectures with OF support have this target
-        if grep -q dtbs_install "${srctree}/arch/$SRCARCH/Makefile"; then
+        if [ -d "${srctree}/arch/$SRCARCH/boot/dts" ]; then
                 $MAKE KBUILD_SRC= INSTALL_DTBS_PATH="$tmpdir/usr/lib/$packagename" dtbs_install
         fi
 fi
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index 663a7f343b42..edcad61fe3cd 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -88,6 +88,7 @@ set_debarch() {
 version=$KERNELRELEASE
 if [ -n "$KDEB_PKGVERSION" ]; then
         packageversion=$KDEB_PKGVERSION
+        revision=${packageversion##*-}
 else
         revision=$(cat .version 2>/dev/null||echo 1)
         packageversion=$version-$revision
@@ -205,10 +206,12 @@ cat <<EOF > debian/rules
 #!$(command -v $MAKE) -f
 
 build:
-        \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} KBUILD_SRC=
+        \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \
+        KBUILD_BUILD_VERSION=${revision} KBUILD_SRC=
 
 binary-arch:
-        \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} KBUILD_SRC= intdeb-pkg
+        \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \
+        KBUILD_BUILD_VERSION=${revision} KBUILD_SRC= intdeb-pkg
 
 clean:
         rm -rf debian/*tmp debian/files
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index e05646dc24dc..009147d4718e 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -12,6 +12,7 @@
 # how we were called determines which rpms we build and how we build them
 if [ "$1" = prebuilt ]; then
         S=DEL
+        MAKE="$MAKE -f $srctree/Makefile"
 else
         S=
 fi
@@ -78,19 +79,19 @@ $S	%prep
 $S      %setup -q
 $S
 $S      %build
-$S      make %{?_smp_mflags} KBUILD_BUILD_VERSION=%{release}
+$S      $MAKE %{?_smp_mflags} KBUILD_BUILD_VERSION=%{release}
 $S
         %install
         mkdir -p %{buildroot}/boot
         %ifarch ia64
         mkdir -p %{buildroot}/boot/efi
-        cp \$(make image_name) %{buildroot}/boot/efi/vmlinuz-$KERNELRELEASE
+        cp \$($MAKE image_name) %{buildroot}/boot/efi/vmlinuz-$KERNELRELEASE
         ln -s efi/vmlinuz-$KERNELRELEASE %{buildroot}/boot/
         %else
-        cp \$(make image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE
+        cp \$($MAKE image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE
         %endif
-$M      make %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} KBUILD_SRC= modules_install
-        make %{?_smp_mflags} INSTALL_HDR_PATH=%{buildroot}/usr KBUILD_SRC= headers_install
+$M      $MAKE %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} modules_install
+        $MAKE %{?_smp_mflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install
         cp System.map %{buildroot}/boot/System.map-$KERNELRELEASE
         cp .config %{buildroot}/boot/config-$KERNELRELEASE
         bzip2 -9 --keep vmlinux
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 79f7dd57d571..71f39410691b 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -74,7 +74,7 @@ scm_version()
                 fi
 
                 # Check for uncommitted changes
-                if git status -uno --porcelain | grep -qv '^.. scripts/package'; then
+                if git diff-index --name-only HEAD | grep -qv "^scripts/package"; then
                         printf '%s' -dirty
                 fi