Revert "kbuild: deb-pkg: improve the usability of source package"

This reverts commit 3ab18a6.

The commit breaks debian package creation when KDEB_PKGVERSION is
used.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>

scripts/package/mkdebian

@@ -90,8 +90,10 @@ rm -rf debian
 version=$KERNELRELEASE
 if [ -n "$KDEB_PKGVERSION" ]; then
 	packageversion=$KDEB_PKGVERSION
+	revision=${packageversion##*-}
 else
-	packageversion=$version-$($srctree/init/build-version)
+	revision=$($srctree/init/build-version)
+	packageversion=$version-$revision
 fi
 sourcename=${KDEB_SOURCENAME:-linux-upstream}
 
@@ -242,9 +244,8 @@ srctree ?= .
 
 build-indep:
 build-arch:
-	\$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} \
-	\$(shell \$(srctree)/scripts/package/deb-build-option) \
-	olddefconfig all
+	\$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \
+	KBUILD_BUILD_VERSION=${revision} -f \$(srctree)/Makefile
 
 build: build-arch