making ready for uploading to Debian archive, changing depends line to debootstrap with versioned depends. Re-tabbing, extactbuildplace function is created to move common code out from create and build. added an error message for unknown parameter option. added a TAGS target to the makefile to make ETAGS work.

1 files changed, 35 insertions, 11 deletions

diff --git a/pbuilder-modules b/pbuilder-modules
index fb4e996..7d836d7 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -2,27 +2,51 @@
 # common modules for pbuilder.
 
 function umountproc () {
-  if [ "$USEPROC" = "yes" ]; then
-    echo " -> unmounting proc"
-    umount "$BUILDPLACE/proc"
-  fi
+    if [ "$USEPROC" = "yes" ]; then
+	echo " -> unmounting proc"
+	umount "$BUILDPLACE/proc"
+    fi
 }
 
 function mountproc () {
-  if [ "$USEPROC" = "yes" ]; then
-    echo " -> mounting proc"
-    mkdir -p $BUILDPLACE/proc
-    mount -t proc /proc "$BUILDPLACE/proc"
-  fi
+    if [ "$USEPROC" = "yes" ]; then
+	echo " -> mounting proc"
+	mkdir -p $BUILDPLACE/proc
+	mount -t proc /proc "$BUILDPLACE/proc"
+    fi
 }
 
 function cleanbuildplace () {
     if [ -d "$BUILDPLACE" ]; then 
-      echo cleaning the build env
-      rm -rf "$BUILDPLACE"
+	echo cleaning the build env
+	rm -rf "$BUILDPLACE"
     fi;
 }
 
+function extractbuildplace () {
+    # after calling this function, umountproc, and cleanbuildplace
+    # needs to be called. 
+    cleanbuildplace
+    echo "building the build env"
+    echo " -> extracting base.tgz"
+    mkdir -p "$BUILDPLACE"
+    (cd "$BUILDPLACE" && tar xfzp "$BASETGZ")
+    mountproc
+    mkdir -p "$BUILDPLACE/tmp/buildd"
+    echo " -> copying local configuration"
+    for a in passwd hosts hostname resolv.conf; do 
+	cp /etc/$a "$BUILDPLACE/etc/$a";
+    done
+    
+    if [ -n "$DISTRIBUTION" ]; then
+	echo Installing apt-lines
+	cat > "$BUILDPLACE"/etc/apt/sources.list << EOF
+deb $MIRRORSITE $DISTRIBUTION main contrib non-free
+deb-src $MIRRORSITE debian $DISTRIBUTION main contrib non-free
+EOF
+    fi
+}
+
 #required for some packages to install...
 export LANG=C
 export LC_ALL=C