Richard W.M. Jones
2010-May-20 13:13 UTC
[Libguestfs] [PATCH ubuntu repost] Ubuntu: Revert install-kernel to debirf default script.
Posted earlier: http://www.redhat.com/archives/libguestfs/2009-December/msg00040.html This seems to have been implicitly ACKed by Guido last time, so I intend to push it. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora -------------- next part -------------->From 88fa32d2cfff312ab976a5677467b87f0bd85aa9 Mon Sep 17 00:00:00 2001From: Richard Jones <rjones at ubuntu910x64.home.annexia.org> Date: Mon, 21 Dec 2009 15:50:59 +0000 Subject: [PATCH 1/5] Ubuntu: Revert install-kernel to debirf default script. --- appliance/Makefile.am | 1 + appliance/debian/modules/install-kernel | 1 + appliance/debian/modules/install_kernel | 68 ------------------------------- 3 files changed, 2 insertions(+), 68 deletions(-) create mode 120000 appliance/debian/modules/install-kernel delete mode 100755 appliance/debian/modules/install_kernel diff --git a/appliance/Makefile.am b/appliance/Makefile.am index 72dfc71..77f40d2 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -104,6 +104,7 @@ endif # Extra symlinks needed by the Debian appliance. debirf_symlinks = \ a0_prep-root \ + install-kernel \ z0_remove-aptitude \ z0_remove-locales \ z1_clean-root diff --git a/appliance/debian/modules/install-kernel b/appliance/debian/modules/install-kernel new file mode 120000 index 0000000..a1be2bc --- /dev/null +++ b/appliance/debian/modules/install-kernel @@ -0,0 +1 @@ +/usr/share/debirf/modules/install-kernel \ No newline at end of file diff --git a/appliance/debian/modules/install_kernel b/appliance/debian/modules/install_kernel deleted file mode 100755 index c1076ce..0000000 --- a/appliance/debian/modules/install_kernel +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash -e - -# debirf module: install-kernel -# install a kernel package, indicated by the expected environment -# variables: -# DEBIRF_PATH -# DEBIRF_ROOT -# DEBIRF_KERNEL_PACKAGE -# -# *** REQUIRED MODULE *** -# WARNING: this module is necessary for proper functioning of debirf. -# -# The debirf scripts were written by -# Jameson Rollins <jrollins at fifthhorseman.net> -# and -# Daniel Kahn Gillmor <dkg-debian.org at fifthhorseman.net>. -# -# They are Copyright 2007, and are all released under the GPL, -# version 3 or later. - -# clear out old modules if they exist, to avoid confusion -rm -rf "$DEBIRF_ROOT/lib/modules" - -# download/copy in kernel package -if [ -z "$DEBIRF_KERNEL_PACKAGE" ] ; then - # determine kernel to install. assume arch of build host. - - # determine kernel arch. need everything after the kernel version - # and debian version - if [ -z "$DEBIRF_KERNEL_ARCH" ]; then - KARCH=$(uname -r | cut -d- -f3-) - else - 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: //') - - # 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\"" -fi - -KPKG=$(basename "$DEBIRF_ROOT"/var/cache/apt/archives/linux-image-2.6.*) - -echo "extracting kernel package $KPKG..." -debirf_exec dpkg --extract /var/cache/apt/archives/"$KPKG" / - -# install the module init tools, since they are needed for depmod -debirf_exec apt-get --assume-yes install module-init-tools - -# depmod to create module list -KVERS=$(ls -1 -t "$DEBIRF_ROOT/lib/modules" | head -n1) -echo "generating modules.dep..." -debirf_exec depmod -a "$KVERS" - -# extract kernel and debian stock initrd from the build root: -mv "$DEBIRF_ROOT"/boot/vmlinu* "$DEBIRF_BUILDD" - -# remove kernel symlinks -if [ -L "$DEBIRF_ROOT"/vmlinuz ] ; then - rm "$DEBIRF_BUILDD"/vmlinuz -fi -- 1.6.3.3
Guido Günther
2010-Jun-03 08:02 UTC
[Libguestfs] [PATCH ubuntu repost] Ubuntu: Revert install-kernel to debirf default script.
On Thu, May 20, 2010 at 02:13:37PM +0100, Richard W.M. Jones wrote:> > Posted earlier: > http://www.redhat.com/archives/libguestfs/2009-December/msg00040.html > > This seems to have been implicitly ACKed by Guido last time, so > I intend to push it.We have a patch in upstream debirf to select the kernel we want (although it's not in a released version yet) so this ACK. Cheers, -- Guido