kbuild, deb-pkg: fix 'file not found' error when building .deb package for arm

[safe/jmp/linux-2.6] / scripts / package / builddeb

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 1264b8e..4876ff3 100644 (file)
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -4,22 +4,34 @@
 # Copyright 2003 Wichert Akkerman <wichert@wiggy.net>
 #
 # Simple script to generate a deb package for a Linux kernel. All the
-# complexity of what to do with a kernel after it is installer or removed
+# complexity of what to do with a kernel after it is installed or removed
 # is left to other scripts and packages: they can install scripts in the
 # /etc/kernel/{pre,post}{inst,rm}.d/ directories that will be called on
 # package install and removal.
 
 set -e
 
+create_package() {
+       local pname="$1" pdir="$2"
+
+       # Fix ownership and permissions
+       chown -R root:root "$pdir"
+       chmod -R go-w "$pdir"
+
+       # Create the package
+       dpkg-gencontrol -isp -p$pname -P"$pdir"
+       dpkg --build "$pdir" ..
+}
+
 # Some variables and settings used throughout the script
 version=$KERNELRELEASE
-revision=`cat .version`
+revision=$(cat .version)
 tmpdir="$objtree/debian/tmp"
 fwdir="$objtree/debian/fwtmp"
 packagename=linux-$version
 fwpackagename=linux-firmware-image
 
-if [ "$ARCH" == "um" ] ; then
+if [ "$ARCH" = "um" ] ; then
        packagename=user-mode-linux-$version
 fi
 
@@ -27,12 +39,12 @@ fi
 rm -rf "$tmpdir" "$fwdir"
 mkdir -p "$tmpdir/DEBIAN" "$tmpdir/lib" "$tmpdir/boot"
 mkdir -p "$fwdir/DEBIAN" "$fwdir/lib"
-if [ "$ARCH" == "um" ] ; then
+if [ "$ARCH" = "um" ] ; then
        mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/share/doc/$packagename" "$tmpdir/usr/bin"
 fi
 
 # Build and install the kernel
-if [ "$ARCH" == "um" ] ; then
+if [ "$ARCH" = "um" ] ; then
        $MAKE linux
        cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map"
        cp .config "$tmpdir/usr/share/doc/$packagename/config"
@@ -41,12 +53,15 @@ if [ "$ARCH" == "um" ] ; then
 else 
        cp System.map "$tmpdir/boot/System.map-$version"
        cp .config "$tmpdir/boot/config-$version"
-       cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
+       # Not all arches include the boot path in KBUILD_IMAGE
+       if ! cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"; then
+               cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
+       fi
 fi
 
 if grep -q '^CONFIG_MODULES=y' .config ; then
        INSTALL_MOD_PATH="$tmpdir" make KBUILD_SRC= modules_install
-       if [ "$ARCH" == "um" ] ; then
+       if [ "$ARCH" = "um" ] ; then
                mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"
                rmdir "$tmpdir/lib/modules/$version"
        fi
@@ -77,14 +92,16 @@ linux ($version-$revision) unstable; urgency=low
 EOF
 
 # Generate a control file
-if [ "$ARCH" == "um" ]; then
-
 cat <<EOF > debian/control
 Source: linux
 Section: base
 Priority: optional
 Maintainer: $name
 Standards-Version: 3.6.1
+EOF
+
+if [ "$ARCH" = "um" ]; then
+       cat <<EOF >> debian/control
 
 Package: $packagename
 Provides: kernel-image-$version, linux-image-$version
@@ -101,12 +118,7 @@ Description: User Mode Linux kernel, version $version
 EOF
 
 else
-cat <<EOF > debian/control
-Source: linux
-Section: base
-Priority: optional
-Maintainer: $name
-Standards-Version: 3.6.1
+       cat <<EOF >> debian/control
 
 Package: $packagename
 Provides: kernel-image-$version, linux-image-$version
@@ -116,11 +128,8 @@ Description: Linux kernel, version $version
  This package contains the Linux kernel, modules and corresponding other
  files version $version
 EOF
-fi
 
-# Fix some ownership and permissions
-chown -R root:root "$tmpdir"
-chmod -R go-w "$tmpdir"
+fi
 
 # Do we have firmware? Move it out of the way and build it into a package.
 if [ -e "$tmpdir/lib/firmware" ]; then
@@ -134,13 +143,9 @@ Description: Linux kernel firmware, version $version
  This package contains firmware from the Linux kernel, version $version
 EOF
 
-       dpkg-gencontrol -isp -p$fwpackagename -P"$fwdir"
-       dpkg --build "$fwdir" ..
+       create_package "$fwpackagename" "$fwdir"
 fi
 
-# Perform the final magic
-dpkg-gencontrol -isp -p$packagename
-dpkg --build "$tmpdir" ..
+create_package "$packagename" "$tmpdir"
 
 exit 0
-