tree a5c25447b4bea67871ef46cb43b25939e230a557
parent d80e22460968ec7986c82fd7d207ebe3de59e03d
author Sam Ravnborg <[EMAIL PROTECTED](none)> Thu, 14 Jul 2005 20:24:00 +0000
committer Sam Ravnborg <[EMAIL PROTECTED](none)> Thu, 14 Jul 2005 20:24:00 +0000

uml: Make deb-pkg build target build a Debian-style user-mode-linux package

From: Ryan Anderson <[EMAIL PROTECTED]>

Make the deb-pkg build target understand the "um" arch and set up the
package and directory structure to match a mainline-Debian style
user-mode-linux package.

This is primarily so that it stops matching, exactly, the naming
convention used by normal, non-UML kernels generated by this command.

Installing "linux-2.6.11" and "linux-2.6.11", where one is a UML kernel
doesn't do the right thing.  This fixes that.

Signed-off-by: Ryan Anderson <[EMAIL PROTECTED]>
Signed-off-by: Sam Ravnborg <[EMAIL PROTECTED]>

 scripts/package/builddeb |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -14,18 +14,38 @@ set -e
 # Some variables and settings used throughout the script
+if [ "$ARCH" == "um" ] ; then
+       packagename=user-mode-linux-$version
 # Setup the directory structure
 rm -rf "$tmpdir"
 mkdir -p "$tmpdir/DEBIAN" "$tmpdir/lib" "$tmpdir/boot"
+if [ "$ARCH" == "um" ] ; then
+       mkdir -p "$tmpdir/usr/lib/uml/modules/$version" 
"$tmpdir/usr/share/doc/$packagename" "$tmpdir/usr/bin"
 # Build and install the kernel
-cp "$tmpdir/boot/$version"
-cp .config "$tmpdir/boot/config-$version"
-cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
+if [ "$ARCH" == "um" ] ; then
+       $MAKE linux
+       cp "$tmpdir/usr/lib/uml/modules/$version/"
+       cp .config "$tmpdir/usr/share/doc/$packagename/config"
+       gzip "$tmpdir/usr/share/doc/$packagename/config"
+       cp $KBUILD_IMAGE "$tmpdir/usr/bin/linux-$version"
+       cp "$tmpdir/boot/$version"
+       cp .config "$tmpdir/boot/config-$version"
+       cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
 if grep -q '^CONFIG_MODULES=y' .config ; then
        INSTALL_MOD_PATH="$tmpdir" make modules_install
+       if [ "$ARCH" == "um" ] ; then
+               mv "$tmpdir/lib/modules/$version"/* 
+               rmdir "$tmpdir/lib/modules/$version"
+       fi
 # Install the maintainer scripts
@@ -60,11 +80,11 @@ Priority: optional
 Maintainer: $name
 Standards-Version: 3.6.1
-Package: linux-$version
+Package: $packagename
 Architecture: any
-Description: Linux kernel, version $version
+Description: Linux kernel, version $packagename
  This package contains the Linux kernel, modules and corresponding other
- files version $version.
+ files version $packagename
 # Fix some ownership and permissions
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to