Browse Source

tag 0.0.57

git-svn-id: http://trac.vinelinux.org/repos/projects/vbootstrap/tags/0.0.57@6666 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 10 years ago
parent
commit
80c3249c64

+ 4 - 1
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=6.0
+VBUILDER_STABLE_VERSION=6.1
 VBUILDER_DEFAULT_VERSION=VineSeed
 VBUILDER_CATEGORIES=main,plus,nonfree
 VBUILDER_VBOOTSTRAP_FETCH_URL=http://updates.vinelinux.org/apt
@@ -77,6 +77,9 @@ tarbz2: clean
 rpm: tarbz2
 	rpmbuild -ba ${NAME}-vl.spec
 
+srpm: tarbz2
+	rpmbuild -bs ${NAME}-vl.spec
+
 clean:
 	rm -fr *~ .*???~ vbootstrap.sh vbuilder.sh vbuilder.conf
 	find . -name *~ -exec rm -f {} \;

+ 4 - 1
libvbuilder.sh.in

@@ -163,7 +163,10 @@ setup-vbootstrap(){
 
 	## check chroot version
 	case ${VERSION} in
-	    4.2|5.2|6.0|VineSeed)
+	    4.2|5.2|6|VineSeed)
+		;;
+	    6.?)
+	    	VERSION="6"
 		;;
 	    *)
 		echo $"E: ${VERSION} is NOT supported"

+ 1 - 1
sample.conf.skip

@@ -15,7 +15,7 @@
 ## 
 
 ## Vine Linux Version for chroot
-#VERSION=6.0
+#VERSION=6.1
 
 ## Archtecture for chroot
 #ARCH=x86_64

+ 5 - 1
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.56
+%define version 0.0.57
 
 Summary: bootstrap scripts to create a basic Vine Linux system
 Summary(ja): Vine Linux の基本システムを作成するためのスクリプト
@@ -88,6 +88,10 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 
 
 %changelog
+* Mon Jul 30 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 0.0.57-1
+- change 6.0 to 6
+- install MAKEDEV
+
 * Tue Jun 19 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 0.0.56-1
 - use /proc/filesystem to detect aufs capability
 

+ 2 - 2
vbootstrap/scripts/6.0_i386.sh → vbootstrap/scripts/6_i386.sh

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

+ 2 - 2
vbootstrap/scripts/6.0_x86_64.sh → vbootstrap/scripts/6_x86_64.sh

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

+ 0 - 0
vbootstrap/sources.list.d/6.0_i386 → vbootstrap/sources.list.d/6_i386


+ 0 - 0
vbootstrap/sources.list.d/6.0_x86_64 → vbootstrap/sources.list.d/6_x86_64


+ 1 - 1
vbuilder-bash-completion.sh

@@ -36,7 +36,7 @@ _vbuilder()
 	    ;;
 
 	--version)
-	    local running="VineSeed 6.0 5.2 4.2"
+	    local running="VineSeed 6 5.2 4.2"
 	    COMPREPLY=( $(compgen -W "${running}" -- "${cur}") )
 	    ;;
 

+ 5 - 2
vbuilder.sh.in

@@ -230,7 +230,10 @@ setup-vbootstrap(){
 
 	## check chroot version
 	case ${VERSION} in
-	    4.2|5.2|6.0|VineSeed)
+	    4.2|5.2|6|VineSeed)
+		;;
+	    6.?)
+	    	VERSION="6"
 		;;
 	    *)
 		echo $"E: ${VERSION} is NOT supported"
@@ -660,7 +663,7 @@ Build(){
     [ $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 'apt-get -qq -y install etcskel shadow-utils MAKEDEV'
 
     $__chroot_sh 'cd /dev && /sbin/MAKEDEV console'
     $__chroot_sh 'cd /dev && /sbin/MAKEDEV ptmx'