debootstrap working (with hacks)

[Richard Hirst <rhirst@linuxcare.com>]

Hi,
  I have debootstrap building me a root filesystem from base debs, as
it needs to as part of an install.  Hacks required, based on 0.1.12 are
below.  I'll get what I think are the valid bits added to debian source,
and hopefully the ugly hacks will go away with new pkgs soon.

The Makefile change is in 0.1.13 already.

The libc6.1 change needs to be ia64 specific, unless I missed the right way
of handling this (debootstrap thinks alpha is libc6.1 also...).

The big change to do with in_target_wrapper() is due to dpkg problems,
crashing when given lots of pkgs to handle at once, and wrong error
returns, maybe???  Anyway, as dpkg is old, I'll wait for a new one before
worrying further.

The woody.debs changes are partly down to missing pkgs:

+               base="$(without_package "fdutils" "$base")"

No fdutils.  Will we have one at some point?

+               base="$(without_package "groff" "$base")"

Wont be needed with 0.1.13

+               required="$(without_package "libdb3" "$required")"

No libdb3 yet?

+               required="$required gnupro"

For libstdc++3


Once I have a bit more confidence in it I'll put a deb somewhere.

Richard




diff -ur -x CVS debootstrap-0.1.12.ori/Makefile debootstrap-0.1.12/Makefile
--- debootstrap-0.1.12.ori/Makefile	Sun Jun 10 11:04:51 2001
+++ debootstrap-0.1.12/Makefile	Wed Jun 20 10:18:48 2001
@@ -26,6 +26,7 @@
 	install -o root -g root -m 0644 woody $(DSDIR)/scripts/
 	install -o root -g root -m 0644 woody.debs $(DSDIR)/scripts/
 	ln -s woody $(DSDIR)/scripts/sid
+	ln -s woody.debs $(DSDIR)/scripts/sid.debs
 	install -o root -g root -m 0644 functions $(DSDIR)/
 	install -o root -g root -m 0755 pkgdetails $(DSDIR)/
 	install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/
diff -ur -x CVS debootstrap-0.1.12.ori/woody debootstrap-0.1.12/woody
--- debootstrap-0.1.12.ori/woody	Fri Jun 15 19:18:57 2001
+++ debootstrap-0.1.12/woody	Thu Jun 21 02:30:14 2001
@@ -72,7 +72,7 @@
 if [ ! -e $TARGET/etc/localtime ]; then
   ln -s /usr/share/zoneinfo/UTC $TARGET/etc/localtime
 fi
-x_core_install libc6
+x_core_install libc6.1
 
 x_core_install perl-base
 x_core_install mawk
@@ -99,8 +99,25 @@
 
 info "Installing base packages"
 
-repeat 5 in_target dpkg --force-auto-select --force-overwrite \
-	--force-confold --skip-same-version --install $(debfor $base)
+in_target_wrapper()
+{
+  for i in $@ "/var/cache/apt/archives/klogd_*.deb /var/cache/apt/archives/sysklogd_*.deb"
+  do
+    in_target dpkg --force-auto-select --force-overwrite \
+        --force-confold --skip-same-version --install $i
+  done
+}
+
+set +e
+for cnt in 1 2 3 4 5
+do
+  echo "Attempt $cnt:"
+  in_target_wrapper $(debfor $base)
+done
+
+
+#repeat 5 in_target dpkg --force-auto-select --force-overwrite \
+#	--force-confold --skip-same-version --install $(debfor $base)
 
 mv $TARGET/sbin/start-stop-daemon.REAL $TARGET/sbin/start-stop-daemon
 
diff -ur -x CVS debootstrap-0.1.12.ori/woody.debs debootstrap-0.1.12/woody.debs
--- debootstrap-0.1.12.ori/woody.debs	Fri Jun 15 19:13:13 2001
+++ debootstrap-0.1.12/woody.debs	Wed Jun 20 10:30:39 2001
@@ -19,6 +19,15 @@
 		required="$(without_package "libperl5.6" "$required") mbr"
 		base="$base lilo pciutils setserial syslinux"   # pcmcia-cs
 		;;
+	"ia64")
+		base="$base elilo"
+		base="$(without_package "fdutils" "$base")"
+		base="$(without_package "groff" "$base")"
+		required="$(without_package "libc6" "$required") libc6.1"
+		required="$(without_package "libdb3" "$required")"
+		required="$(without_package "libstdc++2.10-glibc2.2" "$required")"
+		required="$required gnupro"
+		;;
 	"m68k")
 		base="$base atari-bootstrap atari-fdisk amiga-fdisk eject mac-fdisk pmac-fdisk-cross setserial vmelilo"
 		;;