Merge commit 'v2.6.35-rc3' into perf/core

Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.

2 files changed, 3 insertions, 1 deletions

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 8b357b0bd25..07f2fbde2ab 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 fa27f3dac76..15440f55aef 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -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}"