* remove Retry_vbootstrap-post() from the vbuilder script:

   - the trick (implemented in 0.0.18-1) moved to vbootstrap/scripts/* instead
   - so that proper rpmdb is available even executing vbootstrap only
 * vbuilder 内の Retry_vbootstrap-post() を廃止
   - 代わりに vbootstrap/scripts/* 内で同等の内容を実行
   - これにより vbootstrap のみ実行した直後でも rpmdb が正しい状態にできる


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

vbootstrap.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.18
+%define version 0.0.19
 
 Summary: bootstrap scripts to create a basic Vine Linux system
 Summary(ja): Vine Linux の基本システムを作成するためのスクリプト
@@ -61,6 +61,10 @@ vbootstrap は Vine Linux の基本システムを既存の Vine Linux システ
 
 
 %changelog
+* Fri Mar 05 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 0.0.19-1
+- remove Retry_vbootstrap-post() from the vbuilder script:
+  the trick (implemented in 0.0.18-1) moved to vbootstrap/scripts/* instead
+
 * Thu Mar 04 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 0.0.18-1
 - vbuilder:Retry_vbootstrap-post(): pass --justdb option to rpm
   so that apt-get don't have to actually install packages again

vbootstrap/scripts/4.2

@@ -8,11 +8,17 @@ 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/__db.00*
-echo " rebuilding rpm database"
-chroot $INSTDIR rpm --rebuilddb
-echo " updating apt database"
+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 " installing vine-keyring"
-chroot $INSTDIR apt-get -qq -y --reinstall install vine-keyring
+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."
 }

vbootstrap/scripts/4.2_i386

@@ -8,11 +8,17 @@ 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/__db.00*
-echo " rebuilding rpm database"
-chroot $INSTDIR rpm --rebuilddb
-echo " updating apt database"
+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 " installing vine-keyring"
-chroot $INSTDIR apt-get -qq -y --reinstall install vine-keyring
+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."
 }

vbootstrap/scripts/5.1

@@ -8,11 +8,17 @@ 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/__db.00*
-echo " rebuilding rpm database"
-chroot $INSTDIR rpm --rebuilddb
-echo " updating apt database"
+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 " installing vine-keyring"
-chroot $INSTDIR apt-get -qq -y --reinstall install vine-keyring
+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."
 }

vbootstrap/scripts/5.1_i386

@@ -8,11 +8,17 @@ 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/__db.00*
-echo " rebuilding rpm database"
-chroot $INSTDIR rpm --rebuilddb
-echo " updating apt database"
+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 " installing vine-keyring"
-chroot $INSTDIR apt-get -qq -y --reinstall install vine-keyring
+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."
 }

vbootstrap/scripts/VineSeed

@@ -8,11 +8,17 @@ 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/__db.00*
-echo " rebuilding rpm database"
-chroot $INSTDIR rpm --rebuilddb
-echo " updating apt database"
+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 " installing vine-keyring"
-chroot $INSTDIR apt-get -qq -y --reinstall install vine-keyring
+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."
 }

vbootstrap/scripts/VineSeed_i386

@@ -8,11 +8,17 @@ 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/__db.00*
-echo " rebuilding rpm database"
-chroot $INSTDIR rpm --rebuilddb
-echo " updating apt database"
+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 " installing vine-keyring"
-chroot $INSTDIR apt-get -qq -y --reinstall install vine-keyring
+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."
 }

vbuilder.sh.in

@@ -447,19 +447,6 @@ Clean(){
     echo "Cleanup a build farm for ${VERSION} done."
 }
 
-Retry_vbootstrap-post(){
-    local CHROOT_DIST_RELEASE=$(cat ${BUILD_ROOT}/etc/vine-release | cut -f3 -d" " | cut -f1 -d.)
-    local DIST_RELEASE=$(cat /etc/vine-release | cut -f3 -d" " | cut -f1 -d.)
-
-    if [ "${CHROOT_DIST_RELEASE}" != "${DIST_RELEASE}" ]; then
-	. /usr/share/vbootstrap/scripts/${VERSION}
-	$__chroot_sh "rm /var/lib/rpm/*"
-	$__chroot_sh "rpmdb --initdb"
-	$__chroot_sh "apt-get -qq update"
-	$__chroot_sh "apt-get -qq -y install ${BASE_PKGS} -o RPM::Options::=--justdb"
-    fi
-}
-
 Build(){
     setup-vbootstrap
 
@@ -476,9 +463,6 @@ Build(){
 	/usr/sbin/vbootstrap ${VERSION} ${BUILD_ROOT}
     fi
 
-    ## retry vbootstrap post in Build()
-    Retry_vbootstrap-post
-
     mount-chroot cache_dir
     mount-chroot vfs
     # mount-chroot /tmp