Re: Install from ISO for Xen guest

2009-08-09 Thread Ian Campbell
On Sun, 2009-08-09 at 16:42 +0200, Frans Pop wrote:
> On Friday 07 August 2009, Ian Campbell wrote:
> > I will follow up shortly with a short series of patches which
> > introduces image "variants" to debian-cd and adds the Xen variant as an
> > option for i386 and amd64 and a patch to the nightly cron jobs which
> > enables this variant for the i386+amd64+powerpc multiarch netinst
> > image.
> 
> I've committed the debian-cd changes with a few very minor (style) 
> corrections. The implementation is IMO quite nice and clean.

Awesome. Thank you very much for the original guidance and all your
input along the way.

> Ian: feel free to commit the changes for D-I (after the corrections) and 
> when that's done I'll enable the Xen variant for the CD builds.

Done.

Cheers,
Ian.

-- 
Ian Campbell

If it doesn't smell yet, it's pretty fresh.
-- Dave Johnson, on dead seagulls


signature.asc
Description: This is a digitally signed message part


Re: Fix error message from tools/sort_deps

2009-08-09 Thread Frans Pop
On Friday 07 August 2009, Ian Campbell wrote:
> It seems that "apt-cache depends" recently (as of 0.7.22) started
> including Enhances lines in its output. Leading to:
>
>  Generating dependency tree with apt-cache depends...
> UNEXPECTED: Line `  Enhances: kvm
> ' while parsing end of deptree from 'kvm-source'
> [etc]
>
> Ignore these lines.

Committed.

Cheers,
FJP


-- 
To UNSUBSCRIBE, email to debian-cd-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Re: Install from ISO for Xen guest

2009-08-09 Thread Frans Pop
On Friday 07 August 2009, Ian Campbell wrote:
> I will follow up shortly with a short series of patches which
> introduces image "variants" to debian-cd and adds the Xen variant as an
> option for i386 and amd64 and a patch to the nightly cron jobs which
> enables this variant for the i386+amd64+powerpc multiarch netinst
> image.

I've committed the debian-cd changes with a few very minor (style) 
corrections. The implementation is IMO quite nice and clean.

The size increase from enabling the Xen variant for the m-a netinst is 
55MB (main changes are ~20MB from the extra bigmem kernel image and ~30MB 
from added D-I kernels and initrds). This is a fairly big increase, but 
the multi-arch netinst can handle it.

Ian: feel free to commit the changes for D-I (after the corrections) and 
when that's done I'll enable the Xen variant for the CD builds.

Cheers,
FJP


-- 
To UNSUBSCRIBE, email to debian-cd-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Re: Install from ISO for Xen guest

2009-08-09 Thread Ian Campbell
On Sun, 2009-08-09 at 11:16 +0100, Ian Campbell wrote:
> The amd64 netboot-xen which is already committed has the same problem --
> I'll fix that right away.

My mistake, it really is cdrom_gtk and netboot-gtk...

Ian.

-- 
Ian Campbell

BOFH excuse #420:

Feature was not beta tested


signature.asc
Description: This is a digitally signed message part


Re: Install from ISO for Xen guest

2009-08-09 Thread Ian Campbell
On Sun, 2009-08-09 at 11:32 +0200, Frans Pop wrote:
> On Friday 07 August 2009, Ian Campbell wrote:
> > diff --git a/installer/build/boot/x86/xen/xm-debian.cfg
> > b/installer/build/boot/x86/xen/xm-debian.cfg index d1d78e7..7c3ff51
> > 100644
> > --- a/installer/build/boot/x86/xen/xm-debian.cfg
> > +++ b/installer/build/boot/x86/xen/xm-debian.cfg
> 
> The patch for this file introduces trailing whitespace in several places.
> 
> > diff --git a/installer/build/config/amd64/cdrom-xen.cfg
> > b/installer/build/config/amd64/cdrom-xen.cfg new file mode 100644
> > index 000..3f03e74
> > --- /dev/null
> > +++ b/installer/build/config/amd64/cdrom-xen.cfg
> > @@ -0,0 +1,13 @@
> > +TYPE=cdrom/gtk
> > +
> > +EXTRANAME=cdrom/xen/
> > +
> > +MANIFEST-KERNEL = "kernel image for installing under Xen"
> > +MANIFEST-INITRD = "initrd for installing under Xen"
> > +MANIFEST-XENCFG = "example Xen configuration"
> > +
> > +TARGET = $(KERNEL) $(INITRD) xen_config
> > +SYMLINK_KERNEL = ../vmlinuz
> > +SYMLINK_INITRD = ../gtk/initrd.gz
> > +
> > +EXTRATARGETS = build_cdrom-gtk
> 
> This should be 'EXTRATARGETS = build_cdrom_gtk' (underscore, not hyphen).

Oh yes, strange that I didn't see an error. I guess I got lucky by using
all_build so cdrom_gtk had always already been built or something.

The amd64 netboot-xen which is already committed has the same problem --
I'll fix that right away.

> I've been wondering if the cdrom-xen target should be built automatically 
> with the cdrom_isolinux target, but I guess that has both advantages and 
> disadvantages. In the end I'm OK with having it as a separate top-level 
> variant.

I have no particular preference myself.

Ian.

-- 
Ian Campbell

All's well that ends.


signature.asc
Description: This is a digitally signed message part


Re: Install from ISO for Xen guest

2009-08-09 Thread Frans Pop
On Friday 07 August 2009, Ian Campbell wrote:
> diff --git a/installer/build/boot/x86/xen/xm-debian.cfg
> b/installer/build/boot/x86/xen/xm-debian.cfg index d1d78e7..7c3ff51
> 100644
> --- a/installer/build/boot/x86/xen/xm-debian.cfg
> +++ b/installer/build/boot/x86/xen/xm-debian.cfg

The patch for this file introduces trailing whitespace in several places.

> diff --git a/installer/build/config/amd64/cdrom-xen.cfg
> b/installer/build/config/amd64/cdrom-xen.cfg new file mode 100644
> index 000..3f03e74
> --- /dev/null
> +++ b/installer/build/config/amd64/cdrom-xen.cfg
> @@ -0,0 +1,13 @@
> +TYPE=cdrom/gtk
> +
> +EXTRANAME=cdrom/xen/
> +
> +MANIFEST-KERNEL = "kernel image for installing under Xen"
> +MANIFEST-INITRD = "initrd for installing under Xen"
> +MANIFEST-XENCFG = "example Xen configuration"
> +
> +TARGET = $(KERNEL) $(INITRD) xen_config
> +SYMLINK_KERNEL = ../vmlinuz
> +SYMLINK_INITRD = ../gtk/initrd.gz
> +
> +EXTRATARGETS = build_cdrom-gtk

This should be 'EXTRATARGETS = build_cdrom_gtk' (underscore, not hyphen).


I've been wondering if the cdrom-xen target should be built automatically 
with the cdrom_isolinux target, but I guess that has both advantages and 
disadvantages. In the end I'm OK with having it as a separate top-level 
variant.


-- 
To UNSUBSCRIBE, email to debian-cd-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org