Re: Fix error message from tools/sort_deps

2009-08-07 Thread Ian Campbell
On Fri, 2009-08-07 at 19:41 +0200, Frans Pop wrote: > On Friday 07 August 2009, Ian Campbell wrote: > > So it's not quite as simple as I thought, this patch just leads to > > other error messages later on. > > Suggest you compare commit r1911 which did the same for Breaks. Thanks, that's basicall

Re: Fix error message from tools/sort_deps

2009-08-07 Thread Frans Pop
On Friday 07 August 2009, Ian Campbell wrote: > So it's not quite as simple as I thought, this patch just leads to > other error messages later on. Suggest you compare commit r1911 which did the same for Breaks. Cheers, FJP -- To UNSUBSCRIBE, email to debian-cd-requ...@lists.debian.org with a

Re: Fix error message from tools/sort_deps

2009-08-07 Thread Ian Campbell
I see now, I think it should be: --- 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 '

[PATCH v2 3/4] Add support for producing disks with (optional) extra variants.

2009-08-07 Thread Ian Campbell
This patch just adds the generic support code: * CONF.sh: Add $(VARIANTS) configuration variable. * eash-build.sh: Add command line parameter to enable variants. * Makefile: Define VARIANT_xxx when preprocessing package list. * boot/?/common.sh: Add a function fo

[PATCH v2 1/4] boot-x86: move creation of install.bat out of extra_image

2009-08-07 Thread Ian Campbell
There is currently only a single caller but soon I will be adding another which does not want install.bat created. The final output is unchanged after this change. --- tools/boot/squeeze/boot-x86 |5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/boot/squeeze/boot-

[PATCH v2 4/4] Add a Xen variant on i386 and amd64.

2009-08-07 Thread Ian Campbell
i386 Xen guests require a PAE (686-bigmem) kernel in order to run. Therefore this variant includes the relevant installer kernel and ramdisk in install.386/xen as well as suitable kernel udebs and proper debs for the installed system. amd64 Xen has no similar requirement but we include the kernels

Fix error message from tools/sort_deps

2009-08-07 Thread Ian Campbell
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] A

Re: Fix error message from tools/sort_deps

2009-08-07 Thread Ian Campbell
So it's not quite as simple as I thought, this patch just leads to other error messages later on. On Fri, 2009-08-07 at 18:09 +0100, 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 d

[PATCH v2 2/4] easy-build.sh: use getopts instead of rolling our own option parsing.

2009-08-07 Thread Ian Campbell
--- easy-build.sh | 32 +++- 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/easy-build.sh b/easy-build.sh index a0de9d0..b6ce3be 100755 --- a/easy-build.sh +++ b/easy-build.sh @@ -6,7 +6,10 @@ set -e ## See also CONF.sh for the meaning of variables u

Expired certificate on lophos

2009-08-07 Thread Frans Pop
Hi Bastian, Last Monday the debian-cd buildd logs show: Running tools/boot/sid/boot-s390 1 /org/cdbuilder.debian.org/src/deb-cd/tmp/sids390/squeeze/CD1 --18:22:01-- https://lophos.multibuild.org/d-i/images/daily/generic/parmfile.debian => `boot1/boot/parmfile' Resolving lophos.m

Re: [PATCH 2/4] easy-build.sh: use getopts instead of rolling our own option parsing.

2009-08-07 Thread Frans Pop
On Friday 07 August 2009, Ian Campbell wrote: >  # Set configuration file to be used for the build and source it > -export CF=CONF.sh > +export CF=./CONF.sh I've already committed that (for all scripts that set/source it). -- To UNSUBSCRIBE, email to debian-cd-requ...@lists.debian.org with a sub

Re: [PATCH 3/4] Add support for producing disks with (optional) extra variants.

2009-08-07 Thread Frans Pop
On Friday 07 August 2009, Ian Campbell wrote: > On Fri, 2009-08-07 at 16:13 +0200, Frans Pop wrote: > > On Friday 07 August 2009, Ian Campbell wrote: > > > This patch just adds the generic support code: > > >* CONF.sh: Add $(VARIANTS) configuration variable. > > >* eash-build.sh:

Re: [PATCH 3/4] Add support for producing disks with (optional) extra variants.

2009-08-07 Thread Ian Campbell
On Fri, 2009-08-07 at 16:13 +0200, Frans Pop wrote: > On Friday 07 August 2009, Ian Campbell wrote: > > This patch just adds the generic support code: > >* CONF.sh: Add $(VARIANTS) configuration variable. > >* eash-build.sh: Add command line parameter to enable variants. > >

Re: [PATCH 3/4] Add support for producing disks with (optional) extra variants.

2009-08-07 Thread Ian Campbell
On Fri, 2009-08-07 at 16:08 +0200, Frans Pop wrote: > (No need to CC me on replies.) Sorry about that. > On Friday 07 August 2009, Ian Campbell wrote: > > show_usage() { > > - echo "Usage: $(basename $0) [-d gnome|kde|lxde|xfce|light|all] > > BC|NETINST|CD|DVD [ ...]" > > + echo "Us

Re: [PATCH 3/4] Add support for producing disks with (optional) extra variants.

2009-08-07 Thread Frans Pop
On Friday 07 August 2009, Ian Campbell wrote: > This patch just adds the generic support code: >    * CONF.sh:   Add $(VARIANTS) configuration variable. >    * eash-build.sh: Add command line parameter to enable variants. >    * Makefile:  Define VARIANT_xxx when preprocessing p

Re: [PATCH 3/4] Add support for producing disks with (optional) extra variants.

2009-08-07 Thread Frans Pop
(No need to CC me on replies.) On Friday 07 August 2009, Ian Campbell wrote: >  show_usage() { > -   echo "Usage: $(basename $0) [-d gnome|kde|lxde|xfce|light|all] > BC|NETINST|CD|DVD [ ...]" > +   echo "Usage: $(basename $0) [-d gnome|kde|lxde|xfce|light|all] [-v > VARIANTS] BC|NETINST|

Re: [PATCH 2/4] easy-build.sh: use getopts instead of rolling our own option parsing.

2009-08-07 Thread Julien Cristau
Hi, one nitpick: On Fri, Aug 7, 2009 at 13:33:33 +0100, Ian Campbell wrote: > +shift $(expr $OPTIND - 1) > maybe 'shift $((OPTIND - 1))' so you don't fork expr? Cheers, Julien -- To UNSUBSCRIBE, email to debian-cd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact

Re: [PATCH 2/4] easy-build.sh: use getopts instead of rolling our own option parsing.

2009-08-07 Thread Giacomo A. Catenazzi
Ian Campbell wrote: On Fri, 2009-08-07 at 13:33 +0100, Ian Campbell wrote: I just tried it and it looks like the script is already not dash-ready: $ dash -x ./easy-build.sh -h + set -e + export CF=CONF.sh + . CONF.sh .: 1: CONF.sh: not found I'm no expert but it looks like dash obeys $PATH whe

Re: [PATCH 2/4] easy-build.sh: use getopts instead of rolling our own option parsing.

2009-08-07 Thread Ian Campbell
On Fri, 2009-08-07 at 13:45 +0100, Ian Campbell wrote: > On Fri, 2009-08-07 at 13:33 +0100, Ian Campbell wrote: > > > > I just tried it and it looks like the script is already not > > dash-ready: > > $ dash -x ./easy-build.sh -h > > + set -e > > + export CF=CONF.sh > > + . CONF.sh > > .: 1: CONF.s

Re: [PATCH 2/4] easy-build.sh: use getopts instead of rolling our own option parsing.

2009-08-07 Thread Ian Campbell
On Fri, 2009-08-07 at 13:33 +0100, Ian Campbell wrote: > > I just tried it and it looks like the script is already not > dash-ready: > $ dash -x ./easy-build.sh -h > + set -e > + export CF=CONF.sh > + . CONF.sh > .: 1: CONF.sh: not found I'm no expert but it looks like dash obeys $PATH when execu

Re: [PATCH 2/4] easy-build.sh: use getopts instead of rolling our own option parsing.

2009-08-07 Thread Ian Campbell
On Fri, 2009-08-07 at 14:05 +0200, Frans Pop wrote: > On Friday 07 August 2009, Ian Campbell wrote: > > +while getopts d:h OPT ; do > > Is getopts also supported in dash? I believe so. I just tried it and it looks like the script is already not dash-ready: $ dash -x ./easy-build.sh -h + set -e

Re: [PATCH 1/4] boot-x86: move creation of install.bat out of extra_image

2009-08-07 Thread Ian Campbell
On Fri, 2009-08-07 at 13:33 +0200, Frans Pop wrote: > On Friday 07 August 2009, Ian Campbell wrote: > > There is currently only a single caller but soon I will be adding > > another which does not want install.bat created. > > --- > > tools/boot/squeeze/boot-x86 |5 ++--- > > 1 files changed,

Re: [PATCH 2/4] easy-build.sh: use getopts instead of rolling our own option parsing.

2009-08-07 Thread Max Vozeler
On Fri, Aug 07, 2009 at 02:05:52PM +0200, Frans Pop wrote: > On Friday 07 August 2009, Ian Campbell wrote: > > +while getopts d:h OPT ; do > > Is getopts also supported in dash? Yes, and in POSIX. > Maybe it would be good to also support --help if -h is added. getopts can't do longoptions. I'd

Re: [PATCH 2/4] easy-build.sh: use getopts instead of rolling our own option parsing.

2009-08-07 Thread Frans Pop
On Friday 07 August 2009, Ian Campbell wrote: > +while getopts d:h OPT ; do Is getopts also supported in dash? > +   case $OPT in > +       d) > +   case $OPTARG in > +   # Note: "gnome" is the special gnome task, not the generic > task > +       gnome

Re: [PATCH 1/4] boot-x86: move creation of install.bat out of extra_image

2009-08-07 Thread Frans Pop
On Friday 07 August 2009, Ian Campbell wrote: > There is currently only a single caller but soon I will be adding > another which does not want install.bat created. > --- > tools/boot/squeeze/boot-x86 |5 ++--- > 1 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/tools/boot/sque

Re: boot powerpc and x86 fixes

2009-08-07 Thread Frans Pop
On Friday 07 August 2009, Ian Campbell wrote: > First the powerpc "prep" variant seems to have been disabled in d-i for > ages (since r50159 in Nov 2007) and isn't part of > http://d-i.debian.org/daily-images/powerpc/daily/ so don't try and > fetch it. > > Secondly a recent change by Frans to boot-

boot powerpc and x86 fixes

2009-08-07 Thread Ian Campbell
While building images recently I noticed a couple of things which were breaking for me in debian-cd. First the powerpc "prep" variant seems to have been disabled in d-i for ages (since r50159 in Nov 2007) and isn't part of http://d-i.debian.org/daily-images/powerpc/daily/ so don't try and fetch i

Re: Install from ISO for Xen guest

2009-08-07 Thread Ian Campbell
On Fri, 2009-08-07 at 07:39 +0100, Ian Campbell wrote: > I will follow up shortly with[...]a patch to the nightly cron jobs > which enables this variant for the i386+amd64+powerpc multiarch > netinst image. Here it is. Is this sufficient to ensure this variant is enabled in the actual official im

Install from ISO for Xen guest

2009-08-07 Thread Ian Campbell
This was discussed a little while back on both lists (the interesting/useful bit starts at http://lists.debian.org/debian-boot/2009/06/msg00094.html). It's taken me a while but I've finally got something which works for me. Below is a patch for debian-installer to build cdrom-xen variants for i386

[PATCH 4/4] Add a Xen variant on i386 and amd64.

2009-08-07 Thread Ian Campbell
i386 Xen guests require a PAE (686-bigmem) kernel in order to run. Therefore this variant includes the relevant installer kernel and ramdisk in install.386/xen as well as suitable kernel udebs and proper debs for the installed system. amd64 Xen has no similar requirement but we include the kernels

[PATCH 3/4] Add support for producing disks with (optional) extra variants.

2009-08-07 Thread Ian Campbell
This patch just adds the generic support code: * CONF.sh: Add $(VARIANTS) configuration variable. * eash-build.sh: Add command line parameter to enable variants. * Makefile: Define VARIANT_xxx when preprocessing package list. * boot/?/common.sh: Add a function fo

[PATCH 2/4] easy-build.sh: use getopts instead of rolling our own option parsing.

2009-08-07 Thread Ian Campbell
--- easy-build.sh | 28 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/easy-build.sh b/easy-build.sh index c586c1e..d85d810 100755 --- a/easy-build.sh +++ b/easy-build.sh @@ -25,19 +25,23 @@ if [ $# -eq 0 ]; then fi desktop= -if [ "$1" = "-d" ];

[PATCH 1/4] boot-x86: move creation of install.bat out of extra_image

2009-08-07 Thread Ian Campbell
There is currently only a single caller but soon I will be adding another which does not want install.bat created. --- tools/boot/squeeze/boot-x86 |5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/boot/squeeze/boot-x86 b/tools/boot/squeeze/boot-x86 index 29f5566..0