update vbuilder.sh.in

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

Makefile

@@ -27,4 +27,4 @@ rpm: tarbz2
 	rpm -ba ${NAME}.spec
 
 clean:
-	rm -fr *~ .*???~ vbootstrap.sh
+	rm -fr *~ .*???~ vbootstrap.sh vbuilder.sh

vbootstrap.spec

@@ -2,7 +2,7 @@
 # If you find a BUG, report to Vine@vinelinux.org or mailing list or BTS.
 # $Id: vbootstrap.spec,v 1.4 2009/06/28 15:54:18 daisuke Exp $
 
-%define version 0.0.2
+%define version 0.0.3
 
 Summary: bootstrap scripts to create a basic Vine Linux system
 Summary(ja): Vine Linux の基本システムを作成するためのスクリプト
@@ -63,6 +63,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/vbootstrap/*/VineSeed_i386
 
 
 %changelog
+* Sat Jul 18 2009 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.3-1
+- update vbuilder.sh.in
+
 * Mon Jun 29 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 0.0.2-1
 - add vbuilder
 

vbuilder.sh.in

@@ -41,11 +41,13 @@ setup-vbootstrap(){
 
 	[ -z ${VARCH} ] && VARCH=$(uname -i)
 	[ "${VARCH}" != "$(uname -i)" ] && VERSION=${VERSION}_${VARCH}
-	
-	BUILD_ROOT=${VBOOTSTRAP_DIR}/${VERSION}
-	CACHE_DIR=${VBOOTSTRAP_DIR}/cache/${VERSION}
-	BUILD_DIR=/usr/src/vine
     fi
+	
+    BUILD_ROOT=${VBOOTSTRAP_DIR}/${VERSION}
+    CACHE_DIR=${VBOOTSTRAP_DIR}/cache/${VERSION}
+    BUILD_DIR=/usr/src/vine
+
+    mkdir -p $VBOOTSTRAP_DIR
 }
 
 ##############################################################################
@@ -129,7 +131,7 @@ RPM_Build(){
     /usr/sbin/chroot ${BUILD_ROOT} \
 	/bin/sh -c "cd ${BUILD_DIR} && rpmbuild --rebuild $RPM_OPTS $BASE_RPM_PKG"
     /usr/sbin/chroot ${BUILD_ROOT} \
-	/bin/sh -c "cd ${BUILD_DIR} && apt-get -y install $(find $BUILD_ROOT${BUILD_DIR}/RPMS -type f -regex '.*\.rpm' | sed -e s@${BUILD_ROOT}@@g -e 's/$/ \\/g')"
+	/bin/sh -c "cd ${BUILD_DIR} && apt-get -y install $(find $BUILD_ROOT${BUILD_DIR}/RPMS -type f -regex '.*\.rpm' | sed -e s@${BUILD_ROOT}@@g -e 's|.*\/compat32-.*||g' -e 's/$/ \\/g')"
 }