Merge branch 'kbuild/misc' into kbuild/for-next

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 88dbf23b697082aa899c6b414b65cf0e4ecbf67d..fccabe5fb72bdc477803e95d37d21d0c0ebb6ffd 100755 (executable)
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -25,8 +25,13 @@ create_package() {
        chown -R root:root "$pdir"
        chmod -R go-w "$pdir"
 
+       # Create the package
+       dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch}" -p$pname -P"$pdir"
+       dpkg --build "$pdir" ..
+}
+
+set_debarch() {
        # Attempt to find the correct Debian architecture
-       local forcearch="" debarch=""
        case "$UTS_MACHINE" in
        i386|ia64|alpha)
                debarch="$UTS_MACHINE" ;;
@@ -47,6 +52,7 @@ create_package() {
        arm*)
                debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el || true) ;;
        *)
+               debarch=$(dpkg --print-architecture)
                echo "" >&2
                echo "** ** **  WARNING  ** ** **" >&2
                echo "" >&2
@@ -59,13 +65,8 @@ create_package() {
        if [ -n "$KBUILD_DEBARCH" ] ; then
                debarch="$KBUILD_DEBARCH"
        fi
-       if [ -n "$debarch" ] ; then
-               forcearch="-DArchitecture=$debarch"
-       fi
+       forcearch="-DArchitecture=$debarch"
 
-       # Create the package
-       dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch:-$(dpkg --print-architecture)}" -p$pname -P"$pdir"
-       dpkg --build "$pdir" ..
 }
 
 # Some variables and settings used throughout the script
@@ -86,6 +87,9 @@ fwpackagename=linux-firmware-image-$version
 kernel_headers_packagename=linux-headers-$version
 libc_headers_packagename=linux-libc-dev
 dbg_packagename=$packagename-dbg
+debarch=
+forcearch=
+set_debarch
 
 if [ "$ARCH" = "um" ] ; then
        packagename=user-mode-linux-$version

diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index d9ab94b17de0bc119a6fbf3958886d1735085fdf..89f9669d4f0070fcaa694814341a7adb48fdc814 100755 (executable)
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -111,10 +111,8 @@ echo 'cp System.map $RPM_BUILD_ROOT'"/boot/System.map-$KERNELRELEASE"
 echo 'cp .config $RPM_BUILD_ROOT'"/boot/config-$KERNELRELEASE"
 
 echo "%ifnarch ppc64"
-echo 'cp vmlinux vmlinux.orig'
-echo 'bzip2 -9 vmlinux'
+echo 'bzip2 -9 --keep vmlinux'
 echo 'mv vmlinux.bz2 $RPM_BUILD_ROOT'"/boot/vmlinux-$KERNELRELEASE.bz2"
-echo 'mv vmlinux.orig vmlinux'
 echo "%endif"
 
 if ! $PREBUILT; then