瀏覽代碼

deleted VineSeed_i686

git-svn-id: http://trac.vinelinux.org/repos/projects/vbootstrap/trunk@469 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 15 年之前
父節點
當前提交
2eeb86d2d9
共有 3 個文件被更改,包括 7 次插入21 次删除
  1. 0 18
      vbootstrap/scripts/VineSeed_i686
  2. 0 1
      vbootstrap/sources.list.d/VineSeed_i686
  3. 7 2
      vbuilder.sh.in

+ 0 - 18
vbootstrap/scripts/VineSeed_i686

@@ -1,18 +0,0 @@
-# VineSeed_i686
-
-INSTVER="VineSeed_i686"
-BASE_PKGS="setup glibc coreutils bash rpm 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/__db.00*
-echo " rebuilding rpm database"
-chroot $INSTDIR rpm --rebuilddb
-echo " updating apt database"
-chroot $INSTDIR apt-get -qq update
-echo " installing vine-keyring"
-chroot $INSTDIR apt-get -qq -y --reinstall install vine-keyring
-}

+ 0 - 1
vbootstrap/sources.list.d/VineSeed_i686

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

+ 7 - 2
vbuilder.sh.in

@@ -206,13 +206,18 @@ setup-vbootstrap(){
 			Msg_NoSupportVARCH_$LOCALE
 		    [ $? -eq 0 ] && exit 1
 		    ;;
+		i686)
+		    [ "$(uname -i)" = "ppc" ] && \
+			Msg_NoSupportVARCH_$LOCALE
+		    [ $? -eq 0 ] && exit 1
+		    ;;
 		x86_64)
 		    [ "$(uname -i)" = "ppc" ] && \
 			Msg_NoSupportVARCH_$LOCALE
 		    [ $? -eq 0 ] && exit 1
 		    ;;
 		ppc)
-		    [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ] && \
+		    [ "$(uname -i)" = "i386" -o "$(uname -i)" = "i686" -o "$(uname -i)" = "x86_64" ] && \
 			Msg_NoSupportVARCH_$LOCALE
 		    [ $? -eq 0 ] && exit 1
 		    ;;
@@ -531,7 +536,7 @@ RPM_Build(){
     RPM_PKG_USER=$(stat -c %U $RPM_PKG)
     RPM_PKG_GROUP=$(stat -c %G $RPM_PKG)
     local __install="install -p -v -o ${RPM_PKG_USER} -g ${RPM_PKG_GROUP}"
-    RPM_PKG_ARCH_LIST="RPMS/i386 RPMS/x86_64 RPMS/ppc RPMS/noarch SRPMS"
+    RPM_PKG_ARCH_LIST="RPMS/i386 RPMS/i686 RPMS/x86_64 RPMS/ppc RPMS/noarch SRPMS"
     [ -z "${TARGET}" ] || \
 	RPM_PKG_ARCH_LIST="RPMS/${TARGET} ${RPM_PKG_ARCH_LIST}"