vbootstrap: tagging 0.0.32, 0.0.31

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

Makefile

@@ -2,7 +2,7 @@ NAME=vbootstrap
 VERSION=$(shell awk '/%define version/ { print $$3 }' ${NAME}-vl.spec)
 REVISION=$(shell LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2)
 
-VBUILDER_STABLE_VERSION=5.1
+VBUILDER_STABLE_VERSION=5.2
 VBUILDER_DEFAULT_VERSION=VineSeed
 VBUILDER_CATEGORIES=main,plus,nonfree
 VBUILDER_VBOOTSTRAP_DIR=/var/local/vbootstrap
@@ -56,3 +56,4 @@ rpm: tarbz2
 
 clean:
 	rm -fr *~ .*???~ vbootstrap.sh vbuilder.sh vbuilder.conf
+	find . -name *~ -exec rm -f {} \;

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.29
+%define version 0.0.32
 
 Summary: bootstrap scripts to create a basic Vine Linux system
 Summary(ja): Vine Linux の基本システムを作成するためのスクリプト
@@ -75,6 +75,16 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 
 
 %changelog
+* Fri Dec 10 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.32-1
+- setarch ix86 if ix86 chroot on x86_64 host
+
+* Fri Dec 03 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.31-1
+- supported Vine Linux 5.2
+
+* Sun Aug 08 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.30-1
+- updated vbuilder.sh.in
+  - added --rpmbuild-with option
+
 * Sat Jul 17 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.29-1
 - updated vbuilder.sh.in
   - added --sign option

vbootstrap/scripts/5.1 → vbootstrap/scripts/5.2

@@ -1,6 +1,6 @@
-# 5.1
+# 5.2
 
-INSTVER="5.1"
+INSTVER="5.2"
 BASE_PKGS="setup glibc coreutils bash apt rootfiles vine-release libstdc++34"
 APT_LINE="-o Dir::Etc::sourcelist=$VBOOTSTRAPDIR/sources.list.d/$INSTVER"
 

vbootstrap/scripts/5.1_i386 → vbootstrap/scripts/5.2_i386

@@ -1,6 +1,6 @@
-# 5.1_i386
+# 5.2_i386
 
-INSTVER="5.1_i386"
+INSTVER="5.2_i386"
 BASE_PKGS="setup glibc coreutils bash apt rootfiles vine-release libstdc++34"
 APT_LINE="-o Dir::Etc::sourcelist=$VBOOTSTRAPDIR/sources.list.d/$INSTVER"
 

vbootstrap/sources.list.d/5.1

@@ -1 +0,0 @@
-rpm http://updates.vinelinux.org/apt 5.1/$(ARCH) main plus nonfree

vbootstrap/sources.list.d/5.1_i386

@@ -1 +0,0 @@
-rpm http://updates.vinelinux.org/apt 5.1/i386 main plus nonfree

vbootstrap/sources.list.d/5.2

@@ -0,0 +1 @@
+rpm http://updates.vinelinux.org/apt 5.2/$(ARCH) main plus nonfree

vbootstrap/sources.list.d/5.2_i386

@@ -0,0 +1 @@
+rpm http://updates.vinelinux.org/apt 5.2/i386 main plus nonfree

vbuilder-bash-completion.sh

@@ -22,7 +22,7 @@ _vbuilder()
     first="${COMP_WORDS[1]}"
 
     ## The basic options we'll complete.
-    options="--version --arch --category --dist-upgrade --unionfs --target --with-compat32 --sign --no-install"
+    options="--version --arch --category --dist-upgrade --unionfs --target --with-compat32 --rpmbuild-with --sign --no-install --bootstrap-dir --cache-dir --built-rpms-dir"
     actions="clean build build-rpm install-rpm remove-rpm show-info"
     opts="$options $actions"
 
@@ -34,9 +34,9 @@ _vbuilder()
     case "${prev}" in
 	--version)
 	    if [ "$_arch" = "x86_64" ]; then
-		local running="VineSeed VineSeed_i386 5.1 5.1_i386 4.2_i386"
+		local running="VineSeed VineSeed_i386 5.2 5.2_i386 4.2_i386"
 	    else
-		local running="VineSeed 5.1 4.2"
+		local running="VineSeed 5.2 4.2"
 	    fi
 	    COMPREPLY=( $(compgen -W "${running}" -- "${cur}") )
 	    ;;

vbuilder.sh.in

@@ -77,7 +77,7 @@ E: そのようなカテゴリは存在しません: $para
 EOF
 }
 
-Msg_GiveMoreOptions_C(){
+Msg_GiveNoMoreOptions_C(){
     cat<<EOF
 E: You can give no more options after actions
 EOF
@@ -278,6 +278,7 @@ setup-vbuilder(){
     with_sign=0
     with_no_install=0
     with_actions=0
+    with_ix86_on_x86_64=0
     with_category_main=0
     with_category_plus=0
     with_category_nonfree=0
@@ -319,7 +320,9 @@ setup-vbootstrap(){
 	fi
 
 	## support i386 chroot on x86_64 below: 
-	[ "${VARCH}" != "$(uname -i)" ] && VERSION=${VERSION}_${VARCH}
+	[ "${VARCH}" != "$(uname -i)" ] && \
+	    VERSION=${VERSION}_${VARCH} && \
+	    with_ix86_on_x86_64=1
 
         ## check support ${VERSION}
 	if [ -z "$(/usr/sbin/vbootstrap | sed -e s/^Usage:.*// -e s/^E:.*// | grep -m 1 ${VERSION})" ]; then
@@ -411,6 +414,9 @@ setup-vbootstrap-rpm(){
 
     ## check ${BUILD_ROOT}
     [ -d ${BUILD_ROOT} ] || Build
+    ## setarch ix86 if ix86 chroot on x86_64 host
+    [ $with_ix86_on_x86_64 -eq 1 ] && \
+	__chroot_sh="/usr/sbin/chroot ${BUILD_ROOT} setarch ${VARCH} /bin/sh -c"
 
     DIST_RELEASE=$(cat ${BUILD_ROOT}/etc/vine-release | cut -f3 -d" " | cut -f1 -d.)