Colin, I found the following changes, plus flattening the scripts/ directory in deboostrap's source tree, and including the symlinks in it were useful since they allowed running debootstrap from a VCS checkout.
It is more cluttered, but the easier debugging is worth it IMHO. Any
strong counter-preference?
diff --git a/packages/debootstrap/Makefile b/packages/debootstrap/Makefile
index 65b6d8e..ff4ff3a 100644
--- a/packages/debootstrap/Makefile
+++ b/packages/debootstrap/Makefile
@@ -13,28 +13,9 @@ install:
mkdir -p $(DSDIR)/scripts
mkdir -p $(DESTDIR)/usr/sbin
- install -o root -g root -m 0644 scripts/debian/* $(DSDIR)/scripts/
- install -o root -g root -m 0644 scripts/ubuntu/* $(DSDIR)/scripts/
+ cp -a scripts/* $(DSDIR)/scripts/
install -o root -g root -m 0644 functions $(DSDIR)/
- # recent debian releases can all be handled by the sid script
- ln -s sid $(DSDIR)/scripts/etch
- ln -s sid $(DSDIR)/scripts/etch-m68k
- ln -s sid $(DSDIR)/scripts/lenny
- ln -s sid $(DSDIR)/scripts/squeeze
-
- # allow using symbolic release names instead of code names too
- ln -s sid $(DSDIR)/scripts/stable
- ln -s sid $(DSDIR)/scripts/testing
- ln -s sid $(DSDIR)/scripts/unstable
-
- # recent ubuntu releases can all be handled by the gutsy script
- ln -s gutsy $(DSDIR)/scripts/hardy
- ln -s gutsy $(DSDIR)/scripts/intrepid
- ln -s gutsy $(DSDIR)/scripts/jaunty
- ln -s gutsy $(DSDIR)/scripts/karmic
- ln -s gutsy $(DSDIR)/scripts/lucid
-
sed 's/@VERSION@/$(VERSION)/g' debootstrap
>$(DESTDIR)/usr/sbin/debootstrap
chown root:root $(DESTDIR)/usr/sbin/debootstrap
chmod 0755 $(DESTDIR)/usr/sbin/debootstrap
diff --git a/packages/debootstrap/README b/packages/debootstrap/README
new file mode 100644
index 0000000..275cf6a
--- /dev/null
+++ b/packages/debootstrap/README
@@ -0,0 +1,5 @@
+To run debootstrap from this source tree without installing it:
+
+fakeroot make devices.tar.gz
+export DEBOOTSTRAP_DIR=`pwd`
+debootstrap sid sid
diff --git a/packages/debootstrap/debian/changelog
b/packages/debootstrap/debian/changelog
index 2fba951..4d511a7 100644
--- a/packages/debootstrap/debian/changelog
+++ b/packages/debootstrap/debian/changelog
@@ -29,6 +29,9 @@ debootstrap (1.0.21) UNRELEASED; urgency=low
[ Joey Hess ]
* Allow the suite to be stable, testing, or unstable when debootstrapping
Debian. Closes: #288109
+ * Make scripts directory in source tree look like installed directory,
+ and add a README explaining an easy way to run debootstrap from its source
+ tree w/o installing it.
-- Frans Pop <[email protected]> Sun, 27 Dec 2009 18:51:06 +0100
--
see shy jo
signature.asc
Description: Digital signature
