3 files changed, 5 insertions, 3 deletions

diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 62fcc3a7f4d3..d2c29b63adda 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -44,7 +44,7 @@ rpm-pkg rpm: $(objtree)/kernel.spec FORCE
         fi
         $(MAKE) clean
         $(PREV) ln -sf $(srctree) $(KERNELPATH)
-        $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion > $(objtree)/.scmversion
+        $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --save-scmversion
         $(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/.
         $(PREV) rm $(KERNELPATH)
         rm -f $(objtree)/.scmversion
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 8b357b0bd250..07f2fbde2abf 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -18,6 +18,8 @@ create_package() {
         cp debian/copyright "$pdir/usr/share/doc/$pname/"
         cp debian/changelog "$pdir/usr/share/doc/$pname/changelog.Debian"
         gzip -9 "$pdir/usr/share/doc/$pname/changelog.Debian"
+        sh -c "cd '$pdir'; find . -type f ! -path './DEBIAN/*' -printf '%P\0' \
+                | xargs -r0 md5sum > DEBIAN/md5sums"
 
         # Fix ownership and permissions
         chown -R root:root "$pdir"
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index 47bdd2f99b78..15440f55aef6 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#       Output a simple RPM spec file that uses no fancy features requring
+#       Output a simple RPM spec file that uses no fancy features requiring
 #       RPM v4. This is intended to work with any RPM distro.
 #
 #       The only gothic bit here is redefining install_post to avoid
@@ -39,7 +39,7 @@ if ! $PREBUILT; then
 echo "Source: kernel-$__KERNELRELEASE.tar.gz"
 fi
 
-echo "BuildRoot: /var/tmp/%{name}-%{PACKAGE_VERSION}-root"
+echo "BuildRoot: %{_tmppath}/%{name}-%{PACKAGE_VERSION}-root"
 echo "Provides: $PROVIDES"
 echo "%define __spec_install_post /usr/lib/rpm/brp-compress || :"
 echo "%define debug_package %{nil}"