[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1.0.84-2

[Guido Günther]

The following commit has been merged in the master branch:
commit c5d5f9eb590b983998a3f8063e487e2164bf2549
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Feb 21 13:17:35 2010 +0100

    Adjust install-kernel to new debirf version

diff --git a/appliance/debian/modules/install_kernel b/appliance/debian/modules/install-kernel
similarity index 84%
rename from appliance/debian/modules/install_kernel
rename to appliance/debian/modules/install-kernel
index c1076ce..13e62a2 100755
--- a/appliance/debian/modules/install_kernel
+++ b/appliance/debian/modules/install-kernel
@@ -13,7 +13,7 @@
 # The debirf scripts were written by
 # Jameson Rollins <jrollins at fifthhorseman.net>
 # and
-# Daniel Kahn Gillmor <dkg-debian.org at fifthhorseman.net>.
+# Daniel Kahn Gillmor <dkg at fifthhorseman.net>.
 #
 # They are Copyright 2007, and are all released under the GPL,
 # version 3 or later.
@@ -28,22 +28,23 @@ if [ -z "$DEBIRF_KERNEL_PACKAGE" ] ; then
     # determine kernel arch.  need everything after the kernel version
     # and debian version
     if [ -z "$DEBIRF_KERNEL_ARCH" ]; then
-	KARCH=$(uname -r | cut -d- -f3-)
+       KARCH=$(uname -r | cut -d- -f3-)
     else
-	KARCH="$DEBIRF_KERNEL_ARCH"
+       KARCH="$DEBIRF_KERNEL_ARCH"
     fi
 
     # determine the full kernel version from the dependency of the
     # generic 2.6-ARCH package in the debirf root (since it may be
     # different than what is installed on the build host)
-    KNAME=$(debirf_exec apt-cache show linux-image-2.6-"$KARCH" | grep '^Depends: ' | sed 's/^Depends: //')
+    KNAME=$(debirf_exec apt-cache show linux-image-"$KARCH" | grep '^Depends: ' | sed 's/^Depends: //' | tr ',' '\n' | tr -d ' ' | grep ^linux-image | sort -r | head -n1)
 
     # download only the desired kernel package directly into the apt
     # cache for dpkg extraction
     debirf_exec sh -c "cd /var/cache/apt/archives/ && aptitude download \"$KNAME\""
+
 else
     # install kernel deb if given at command line
-    debirf_exec sh -c "cd /var/cache/apt/archives/ && aptitude download \"$DEBIRF_KERNEL_PACKAGE\""
+    cp "$DEBIRF_KERNEL_PACKAGE" "$DEBIRF_ROOT"/var/cache/apt/archives/
 fi
 
 KPKG=$(basename "$DEBIRF_ROOT"/var/cache/apt/archives/linux-image-2.6.*)

-- 
Libguestfs Debian packaging