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

[sfrench/cifs-2.6.git] / scripts / package / mkdebian

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