Changeset 14495 for trunk/base


Ignore:
Timestamp:
Oct 9, 2005, 6:29:09 AM (15 years ago)
Author:
jkh
Message:

Remove obsolete STUCK_BASEDEV stuff
Add support for RPM packages on Intel

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/portmgr/buildall.sh

    r14402 r14495  
    113113prepchroot() {
    114114        dir=$1
    115         if [ $STUCK_BASEDEV = 0 ]; then
    116                 rm -f ${CHROOTBASE}.shadow
    117                 BASEDEV=`hdiutil attach ${CHROOTBASE} -mountpoint $dir -shadow -noverify 2>&1 | awk '/dev/ {if (x == 0) {print $1; x = 1}}'`
    118                 mkdir -p $dir/.vol
    119         fi
     115        rm -f ${CHROOTBASE}.shadow
     116        BASEDEV=`hdiutil attach ${CHROOTBASE} -mountpoint $dir -shadow -noverify 2>&1 | awk '/dev/ {if (x == 0) {print $1; x = 1}}'`
     117        mkdir -p $dir/.vol
    120118        DPORTSDEV=`hdiutil attach ${DPORTSCACHE} -mountpoint $dir/opt/local/var/db/dports -union -noverify 2>&1 | awk '/dev/ {if (x == 0) {print $1; x = 1}}'`
    121119        /sbin/mount_devfs devfs $dir/dev || bomb "unable to mount devfs"
     
    126124teardownchroot() {
    127125        dir=$1
    128         umount -f $dir/dev  || (echo "unable to umount devfs"; STUCK_BASEDEV=1)
    129         umount -f $dir/dev  || (echo "unable to umount fdesc"; STUCK_BASEDEV=1)
     126        umount -f $dir/dev  || (echo "unable to umount devfs")
     127        umount -f $dir/dev  || (echo "unable to umount fdesc")
    130128        [ -z "$DPORTSDEV" ] || (hdiutil detach $DPORTSDEV -force >& /dev/null || bomb "unable to detach DPORTSDEV")
    131129        DPORTSDEV=""
    132130        if [ ! -z "$BASEDEV" ]; then
    133                 if hdiutil detach $BASEDEV -force >& /dev/null; then
    134                         STUCK_BASEDEV=0
    135                         BASEDEV=""
    136                 else
     131                if ! hdiutil detach $BASEDEV -force >& /dev/null; then
    137132                        echo "Warning: Unable to detach BASEDEV ($BASEDEV)"
    138                         STUCK_BASEDEV=1
    139133                fi
    140134        fi
     
    182176
    183177mkchrootbase $DIR
    184 # Hack to work around sticking volfs problem.
    185 STUCK_BASEDEV=0
     178ARCH="`uname -p`"
     179if [ "${ARCH}" = "powerpc" ]; then
     180        ARCH=ppc
     181fi
    186182
    187183echo "Starting packaging run for `wc -l $TGTPORTS | awk '{print $1}'` ports."
     
    212208                    mv $DIR/Package/*.mpkg outputdir/Packages/
    213209                elif [ "$PKGTYPE" = "rpmpackage" ]; then
    214                     mv $DIR/Package/RPMS/ppc/*.rpm outputdir/Packages/
     210                    mv $DIR/Package/RPMS/${ARCH}/*.rpm outputdir/Packages/
    215211                elif [ "$PKGTYPE" = "dpkg" ]; then
    216212                    mv $DIR/Package/*.deb outputdir/Packages/
Note: See TracChangeset for help on using the changeset viewer.