split configuration variables off into their own script

Author: ylixir

configuration

@@ -0,0 +1,40 @@
+# this file contains the configuration variables for the main script
+# vim: noai:ts=4:sw=4
+
+# basically our working directory
+BASE_DIR=`pwd`
+
+# target and sources for our chroor
+ROOT_TARGET=build_environment
+ROOT_SUITE=wheezy
+ROOT_SOURCE=http://http.debian.net/debian
+REQUIRED_PACKAGES=gcc-arm-linux-gnueabihf,ccache,git,kernel-wedge,libncursesw5-dev
+
+# debootstrap sources and working directory
+DEBOOT_DEB=debootstrap_1.0.55_all.deb
+DEBOOT_SRC=http://ftp.debian.org/debian/pool/main/d/debootstrap
+DEBOOT_TMP=deboot_working
+
+# this patch from http://blog.tsunanet.net/2013/01/using-debootstrap-with-grsec.html?m=1
+# it fixed deboot throwing an error when it tries to mount the proc system
+MOUNT_PATCH="--- usr/share/debootstrap/functions.orig	2013-11-26 07:15:53.909242727 -0600
++++ usr/share/debootstrap/functions	2013-11-26 07:17:39.464665969 -0600
+@@ -998,12 +998,14 @@
+ 		umount_on_exit /proc/bus/usb
+ 		umount_on_exit /proc
+ 		umount "'"'"\$TARGET/proc"'"'" 2>/dev/null || true
+-		in_target mount -t proc proc /proc
++#		in_target mount -t proc proc /proc
++		sudo mount -o bind /proc "'"'"\$TARGET/proc"'"'"
+ 		if [ -d "'"'"\$TARGET/sys"'"'" ] && \\
+ 		   grep -q '[[:space:]]sysfs' /proc/filesystems 2>/dev/null; then
+ 			umount_on_exit /sys
+ 			umount "'"'"\$TARGET/sys"'"'" 2>/dev/null || true
+-			in_target mount -t sysfs sysfs /sys
++#			in_target mount -t sysfs sysfs /sys
++			sudo mount -o bin /sys "'"'"\$TARGET/sys"'"'"
+ 		fi
+ 		on_exit clear_mtab
+ 		;;
+"
+

setup.sh

@@ -1,14 +1,12 @@
 #!/bin/bash
 # vim: noai:ts=4:sw=4
 
-BASE_DIR=`pwd`
-DEBOOT_DEB=debootstrap_1.0.55_all.deb
-DEBOOT_TMP=deboot_working
-ROOT_DIR=root
+# this is the main script for controlling the build environment and such
+source configuration
 
 if [ 'clean' == "$1" ]; then
   echo "Removing the debian chroot"
-  rm -rf $ROOT_DIR
+  rm -rf $ROOT_TARGET
   rm -rf $DEBOOT_TMP
   exit 0;
 fi
@@ -29,54 +27,32 @@ case "$MACHINE_TYPE" in
     ;;
 esac
 
-# this patch from http://blog.tsunanet.net/2013/01/using-debootstrap-with-grsec.html?m=1
-MOUNT_PATCH="--- usr/share/debootstrap/functions.orig	2013-11-26 07:15:53.909242727 -0600
-+++ usr/share/debootstrap/functions	2013-11-26 07:17:39.464665969 -0600
-@@ -998,12 +998,14 @@
- 		umount_on_exit /proc/bus/usb
- 		umount_on_exit /proc
- 		umount "'"'"\$TARGET/proc"'"'" 2>/dev/null || true
--		in_target mount -t proc proc /proc
-+#		in_target mount -t proc proc /proc
-+		sudo mount -o bind /proc "'"'"\$TARGET/proc"'"'"
- 		if [ -d "'"'"\$TARGET/sys"'"'" ] && \\
- 		   grep -q '[[:space:]]sysfs' /proc/filesystems 2>/dev/null; then
- 			umount_on_exit /sys
- 			umount "'"'"\$TARGET/sys"'"'" 2>/dev/null || true
--			in_target mount -t sysfs sysfs /sys
-+#			in_target mount -t sysfs sysfs /sys
-+			sudo mount -o bin /sys "'"'"\$TARGET/sys"'"'"
- 		fi
- 		on_exit clear_mtab
- 		;;
-"
-
 mkdir -p $DEBOOT_TMP
 cd $DEBOOT_TMP
-wget -c http://ftp.debian.org/debian/pool/main/d/debootstrap/$DEBOOT_DEB
+wget -c $DEBOOT_SRC/$DEBOOT_DEB
 ar -x $DEBOOT_DEB
 tar -xf data.tar.xz
 printf '%s' "$MOUNT_PATCH"|patch --ignore-whitespace --verbose usr/share/debootstrap/functions
 
 cd $BASE_DIR
-mkdir -p $ROOT_DIR
+mkdir -p $ROOT_TARGET
 DEBOOTSTRAP_DIR=$BASE_DIR/$DEBOOT_TMP/usr/share/debootstrap
 export DEBOOTSTRAP_DIR
-$BASE_DIR/$DEBOOT_TMP/usr/sbin/debootstrap --arch $ARCH --no-check-gpg wheezy $BASE_DIR/$ROOT_DIR http://http.debian.net/debian
+$BASE_DIR/$DEBOOT_TMP/usr/sbin/debootstrap --arch=$ARCH --include=$REQUIRED_PACKAGES --no-check-gpg $ROOT_SUITE $BASE_DIR/$ROOT_TARGET $ROOT_SOURCE
 
 echo Unmounting proc from chroot
-umount $BASE_DIR/$ROOT_DIR/proc
+umount $BASE_DIR/$ROOT_TARGET/proc
 
 #stop dpkg from running daemons
 echo Disabling dpkg daemons
-cat > $BASE_DIR/$ROOT_DIR/usr/sbin/policy-rc.d <<EOF
+cat > $BASE_DIR/$ROOT_TARGET/usr/sbin/policy-rc.d <<EOF
 #!/bin/sh
 exit 101
 EOF
-chmod a+x $BASE_DIR/$ROOT_DIR/usr/sbin/policy-rc.d
+chmod a+x $BASE_DIR/$ROOT_TARGET/usr/sbin/policy-rc.d
 
 #divert ischroot
 #note that this throws error, my need to be fixed, not sure
 echo Diverting ischroot
-chroot $BASE_DIR/$ROOT_DIR dpkg-divert --divert /usr/bin/ischroot.debianutils --rename /usr/bin/ischroot
-chroot $BASE_DIR/$ROOT_DIR /bin/ln -s /bin/true /usr/bin/ischroot
+chroot $BASE_DIR/$ROOT_TARGET dpkg-divert --divert /usr/bin/ischroot.debianutils --rename /usr/bin/ischroot
+chroot $BASE_DIR/$ROOT_TARGET /bin/ln -s /bin/true /usr/bin/ischroot