Browse Source

vbootstrap-0.2
- Vine Linux 6.5対応
- vbootstrap に LANG=C を追加


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

daisuke 5 years ago
parent
commit
e57cf110a6

+ 1 - 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
+VBUILDER_STABLE_VERSION=6.5
 VBUILDER_DEFAULT_VERSION=VineSeed
 VBUILDER_CATEGORIES=main,plus,nonfree
 VBUILDER_VBOOTSTRAP_FETCH_URL=http://updates.vinelinux.org/apt

+ 2 - 2
libvbuilder.sh.in

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

+ 7 - 3
vbootstrap-vl.spec

@@ -1,13 +1,13 @@
 # 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.1
+%define version 0.2
 
 Summary: bootstrap scripts to create a basic Vine Linux system
 Summary(ja): Vine Linux の基本システムを作成するためのスクリプト
 Name: vbootstrap
 Version: %{version}
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 License: public domain
 Group: Development/Tools
 Url: http://trac.vinelinux.org/wiki/VineBootstrap
@@ -58,7 +58,7 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 %build
 %__make \
     %if %{?_dist_release} == "vl6"
-      VBUILDER_DEFAULT_VERSION=\${VBUILDER_STABLE_VERSION}
+      VBUILDER_DEFAULT_VERSION=6.5
     %endif
     %if %{?_dist_release} == "vl5"
       VBUILDER_DEFAULT_VERSION=5.2
@@ -81,6 +81,7 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 %{_bindir}/vbuilder
 %{_sbindir}/vbootstrap
 %{_sbindir}/vbuilder
+%{_sbindir}/vchroot
 %dir %{_datadir}/vbootstrap
 %{_datadir}/vbootstrap/*
 %{_sysconfdir}/bash_completion.d/vbuilder
@@ -91,6 +92,9 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 
 
 %changelog
+* Sun Mar 26 2017 Daisuke SUZUKI <daisuke@vinelinux.org> 0.2-1
+- add support Vine Linux 6.5
+
 * Mon Jan 13 2014 Munehiro Yamamoto <munepi@vinelinux.org> 0.1-2
 - rebuilt
 

+ 5 - 0
vbootstrap.sh.in

@@ -5,6 +5,8 @@ TEXTDOMAINDIR=/usr/share/locale
 
 VERSION=@@VBOOTSTRAP_VERSION@@
 
+LANG=C
+
 ##
 
 VBOOTSTRAPDIR="/usr/share/vbootstrap"
@@ -108,6 +110,9 @@ do
   apt-get -y -qq $APT_OPTS install $i
 done
 
+# remove process limits
+rm -f $INSTDIR/etc/security/limits.d/90-nproc.conf
+
 # run post install script
 vbootstrap_post
 

+ 24 - 0
vbootstrap/scripts/6.5_i386.sh

@@ -0,0 +1,24 @@
+# 6.5_i386
+
+INSTVER="6.5_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"
+
+vbootstrap_post()
+{
+echo $"running vbootstrap post install scripts for $INSTVER on $INSTDIR"
+cp -a /etc/resolv.conf $INSTDIR/etc/
+rm -f $INSTDIR/var/lib/rpm/*
+echo -n $" reinitializing rpm database... "
+chroot $INSTDIR rpm --initdb
+echo $"DONE."
+echo -n $" updating apt database... "
+chroot $INSTDIR apt-get -qq update
+echo $"DONE."
+echo -n $" rebuilding rpm database with chroot rpm... "
+chroot $INSTDIR apt-get -qq -y install ${BASE_PKGS} -o RPM::Options::=--justdb
+echo $"DONE."
+#echo $" installing vine-keyring... "
+#chroot $INSTDIR apt-get -qq -y --reinstall install vine-keyring
+#echo $"DONE."
+}

+ 24 - 0
vbootstrap/scripts/6.5_x86_64.sh

@@ -0,0 +1,24 @@
+# 6.5_x86_64
+
+INSTVER="6.5_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"
+
+vbootstrap_post()
+{
+echo $"running vbootstrap post install scripts for $INSTVER on $INSTDIR"
+cp -a /etc/resolv.conf $INSTDIR/etc/
+rm -f $INSTDIR/var/lib/rpm/*
+echo -n $" reinitializing rpm database... "
+chroot $INSTDIR rpm --initdb
+echo $"DONE."
+echo -n $" updating apt database... "
+chroot $INSTDIR apt-get -qq update
+echo $"DONE."
+echo -n $" rebuilding rpm database with chroot rpm... "
+chroot $INSTDIR apt-get -qq -y install ${BASE_PKGS} -o RPM::Options::=--justdb
+echo $"DONE."
+#echo $" installing vine-keyring... "
+#chroot $INSTDIR apt-get -qq -y --reinstall install vine-keyring
+#echo $"DONE."
+}

+ 1 - 0
vbootstrap/sources.list.d/6.5_i386

@@ -0,0 +1 @@
+rpm @@FETCHURL@@ 6.5/i386 main updates plus nonfree

+ 1 - 0
vbootstrap/sources.list.d/6.5_x86_64

@@ -0,0 +1 @@
+rpm @@FETCHURL@@ 6.5/x86_64 main updates plus nonfree

+ 1 - 1
vbuilder-bash-completion.sh

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

+ 2 - 2
vbuilder.sh.in

@@ -230,7 +230,7 @@ setup-vbootstrap(){
 
 	## check chroot version
 	case ${VERSION} in
-	    4.2|5.2|6|VineSeed)
+	    4.2|5.2|6|6.5|VineSeed)
 		;;
 	    6.?)
 	    	VERSION="6"
@@ -631,7 +631,7 @@ Build(){
 	    # [ $with_category_security -eq 1 ] && \
 	    # 	echo 
 	    ;;
-	5.2|@@VBUILDER_STABLE_VERSION@@)
+	5.2|6|@@VBUILDER_STABLE_VERSION@@)
 	    $__replace_fetch_url ${BUILD_ROOT}/etc/apt/sources.list.d/main.list
 	    $__chroot_sh 'apt-get -qq update && apt-get -qq -y dist-upgrade'
 	    [ $with_category_plus -eq 1 ] && \