Changeset 14495 for trunk/base

Timestamp:

Oct 9, 2005, 6:29:09 AM (19 years ago)

Author:

jkh

Message:

Remove obsolete STUCK_BASEDEV stuff
Add support for RPM packages on Intel

File:

• trunk/base/src/portmgr/buildall.sh (modified) (4 diffs)

trunk/base/src/portmgr/buildall.sh

@@ -113 +113 @@
 prepchroot() {
         dir=$1
-        if [ $STUCK_BASEDEV = 0 ]; then
-                rm -f ${CHROOTBASE}.shadow
-                BASEDEV=`hdiutil attach ${CHROOTBASE} -mountpoint $dir -shadow -noverify 2>&1 | awk '/dev/ {if (x == 0) {print $1; x = 1}}'`
-                mkdir -p $dir/.vol
-        fi
+        rm -f ${CHROOTBASE}.shadow
+        BASEDEV=`hdiutil attach ${CHROOTBASE} -mountpoint $dir -shadow -noverify 2>&1 | awk '/dev/ {if (x == 0) {print $1; x = 1}}'`
+        mkdir -p $dir/.vol
         DPORTSDEV=`hdiutil attach ${DPORTSCACHE} -mountpoint $dir/opt/local/var/db/dports -union -noverify 2>&1 | awk '/dev/ {if (x == 0) {print $1; x = 1}}'`
         /sbin/mount_devfs devfs $dir/dev || bomb "unable to mount devfs"
@@ -126 +124 @@
 teardownchroot() {
         dir=$1
-        umount -f $dir/dev  || (echo "unable to umount devfs"; STUCK_BASEDEV=1)
-        umount -f $dir/dev  || (echo "unable to umount fdesc"; STUCK_BASEDEV=1)
+        umount -f $dir/dev  || (echo "unable to umount devfs")
+        umount -f $dir/dev  || (echo "unable to umount fdesc")
         [ -z "$DPORTSDEV" ] || (hdiutil detach $DPORTSDEV -force >& /dev/null || bomb "unable to detach DPORTSDEV")
         DPORTSDEV=""
         if [ ! -z "$BASEDEV" ]; then
-                if hdiutil detach $BASEDEV -force >& /dev/null; then
-                        STUCK_BASEDEV=0
-                        BASEDEV=""
-                else
+                if ! hdiutil detach $BASEDEV -force >& /dev/null; then
                         echo "Warning: Unable to detach BASEDEV ($BASEDEV)"
-                        STUCK_BASEDEV=1
                 fi
         fi
@@ -182 +176 @@
 
 mkchrootbase $DIR
-# Hack to work around sticking volfs problem.
-STUCK_BASEDEV=0
+ARCH="`uname -p`"
+if [ "${ARCH}" = "powerpc" ]; then
+        ARCH=ppc
+fi
 
 echo "Starting packaging run for `wc -l $TGTPORTS | awk '{print $1}'` ports."
@@ -212 +208 @@
                     mv $DIR/Package/*.mpkg outputdir/Packages/
                 elif [ "$PKGTYPE" = "rpmpackage" ]; then
-                    mv $DIR/Package/RPMS/ppc/*.rpm outputdir/Packages/
+                    mv $DIR/Package/RPMS/${ARCH}/*.rpm outputdir/Packages/
                 elif [ "$PKGTYPE" = "dpkg" ]; then
                     mv $DIR/Package/*.deb outputdir/Packages/