add "--no-build-essential" option

R: aufs-util on vl7 or upper


git-svn-id: http://trac.vinelinux.org/repos/projects/vbootstrap/trunk@5508 ec354946-7b23-47d6-9f5a-488ba84defc7

vbootstrap-vl.spec

@@ -1,7 +1,7 @@
 # This package is maintained on trac svn repository. Please do not change on local.
 # If you find a BUG, please report to Vine@vinelinux.org or mailing list or BTS.
 
-%define version 0.0.51
+%define version 0.0.52
 
 Summary: bootstrap scripts to create a basic Vine Linux system
 Summary(ja): Vine Linux の基本システムを作成するためのスクリプト
@@ -18,7 +18,11 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 BuildRequires: sed
 Requires: bash, apt
+%if %{?_dist_release} >= "vl7"
+Requires: aufs-util
+%else
 Requires: unionfs-utils
+%endif
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -84,6 +88,11 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 
 
 %changelog
+* Fri Jan 27 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 0.0.52-1
+- update vbuilder.sh.in
+  - add "--no-build-essential" option
+- R: aufs-util on vl7 or upper
+
 * Fri Jan 27 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 0.0.51-1
 - update vbuilder.sh.in, libvbuilder.sh.in
   - support aufs

vbuilder.sh.in

@@ -20,6 +20,7 @@ Options:
 	--dist-upgrade:		make VineSeed bootstrap via ${STABLE_VERSION}
 	--unionfs:		cover a bootstrap with unionfs
 	--target:		build rpms with [target]
+	--no-build-essential:	do not install build-essential
 	--with-compat32:	build rpms with compat32 on bootstrap
 	--rpmbuild-define:	give a option --define [macro_expr] to rpmbuild
 	--rpmbuild-with:	give a option --with [bcond_with] to rpmbuild
@@ -83,6 +84,7 @@ initialize-variables(){
     with_category_test=0
     with_category_proposed_updates=0
     with_category_security=0
+    with_build_essential=1
 
     return 0
 }
@@ -110,7 +112,7 @@ check-parameter(){
 		shift
 		check-next-parameter $1 || return 1
 		;;
-	    --dist-upgrade|--unionfs|--with-compat32|--sign|--no-install|--login|--debug)
+	    --dist-upgrade|--unionfs|--with-compat32|--sign|--no-install|--login|--no-build-essential|--debug)
 		[ $with_actions -eq 1 ] && \
 		    echo $"E: You can give no more options after actions" && \
 		    return 1
@@ -654,7 +656,9 @@ Build(){
     [ $with_dist_upgrade -eq 1 ] && \
 	$__chroot_sh 'apt-get -qq update && apt-get -qq -y dist-upgrade'
 
-    $__chroot_sh 'apt-get -qq -y install build-essential'
+    [ $with_build_essential -eq 1 ] && \
+        $__chroot_sh 'apt-get -qq -y install build-essential'
+
     $__chroot_sh 'apt-get -qq -y install etcskel shadow-utils'
 
     $__chroot_sh 'cd /dev && /sbin/MAKEDEV console'
@@ -916,7 +920,7 @@ while [ $# -gt 0 ]; do
 	--version|--arch|--category|--fetch-url|--target|--rpmbuild-define|--rpmbuild-with|--rpmbuild-without|--bootstrap-dir|--unionfs-dir|--cache-dir|--built-rpms-dir)
 	    shift
 	    ;;
-	--dist-upgrade|--unionfs|--with-compat32|--sign|--no-install|--login|--debug)
+	--dist-upgrade|--unionfs|--with-compat32|--sign|--no-install|--login|--no-build-essential|--debug)
 	    ;;
 	--build-rpm|build-rpm|--install-rpm|install-rpm|--remove-rpm|remove-rpm)
 	    shift
@@ -972,6 +976,9 @@ while [ $# -gt 0 ]; do
 	--no-install)
 	    with_no_install=1
 	    ;;
+	--no-build-essential)
+	    with_build_essential=0
+	    ;;
 	--login)
 	    with_login=1
 	    ;;