[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: simple-cdd bzr working with etch again



On Mon, Mar 12, 2007 at 09:34:49AM -0700, vagrant@freegeek.org wrote:
> On Mon, Mar 12, 2007 at 03:28:47PM +0100, Vincent Bernat wrote:
> > 
> > On Mon, 12 Mar 2007 15:23:02 +0100, Vincent Bernat <bernat@luffy.cx> wrote:
> > 
> > > Therefore, I suppose that the mismatch is about nic-modules-*.udeb. And
> > > I don't have those udebs on the CD (but I have them in the mirror pool) :
> > > 
> > > ./mirror/pool/main/l/linux-kernel-di-i386-2.6/nic-extra-modules-2.6.18-4-486-di_1.44_i386.udeb
> > > ./mirror/pool/main/l/linux-kernel-di-i386-2.6/nic-usb-modules-2.6.18-4-486-di_1.44_i386.udeb
...snip...
> yes, something appears broken. i tried with debian-cd 3.0.0 and
> debian-cd svn, and neither worked. i also added the "generate_di*_list"
> bits back into build-simple-cdd and that didn't appear to work either.

it appears that tools/generate_di_list and tools/generate_di+k_list no
longer put their files into tasks/ but drop them into the top level
directory of whereever you run them from... should this be considered a
bug in debian-cd ?

i've got a hackish workaround now... i'll see if i can't come up with
something cleaner:

=== modified file 'build-simple-cdd'
--- build-simple-cdd    2007-03-04 21:38:22 +0000
+++ build-simple-cdd    2007-03-12 16:55:18 +0000
@@ -367,6 +367,9 @@

 cd $BASEDIR

+./tools/generate_di_list
+./tools/generate_di+k_list || echo "WARNING: generate_di+k_list
failed."
+
 # Just to satisfy debian-cd 3.0 insanity -- stratus
 #mkdir $MIRROR/doc $MIRROR/tools

@@ -374,6 +377,11 @@
 make distclean
 make status

+for f in debian-installer-$CODENAME debian-installer+kernel-$CODENAME ;
do
+  if [ -f "$f" ]; then
+    cp $f $BASEDIR/tasks/
+  fi
+done
 mv $TASK $BASEDIR/tasks/
 make packagelists TASK=tasks/simple-cdd.task


live well,
  vagrant



Reply to: