Ignore:
Timestamp:
10/09/13 08:04:04 (11 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
0dd24a8
Parents:
0466028
Message:

Set pkg.conf $ARCH on the fly, so we can pull from i386 repos
on a amd64 host

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pbi-manager10/pbi-manager

    r0466028 rf54df3c  
    61646164           if [ "$PBI_ABFB32" = "YES" -a "$have32" = "true" ] ; then 
    61656165              _flags="${_flags} -32" 
    6166               _flags="`echo ${_flags} | sed 's| --pkgbuild||g'`" 
    61676166           fi 
    61686167        fi 
     
    70817080        cp ${PBI_WRAPPERFILE} ${PBI_CHROOTDIR}/.pbiwrapper-$ARCH 
    70827081 
     7082        # If we are doing a PKGNG build, lets set it up 
    70837083        if [ "$PBI_PKGNGBUILD" = "YES" ] ; then 
    70847084                mkdir -p ${PBI_CHROOTDIR}/usr/local/etc 2>/dev/null 
    70857085                cp /usr/local/etc/pkg.conf ${PBI_CHROOTDIR}/usr/local/etc/pkg.conf 
     7086                # Make sure we change pkgng ARCH to what we are building 
     7087                sed -i '' "s|amd64|$ARCH|g" ${PBI_CHROOTDIR}/usr/local/etc/pkg.conf      
     7088                sed -i '' "s|i386|$ARCH|g" ${PBI_CHROOTDIR}/usr/local/etc/pkg.conf       
     7089                # Now make sure to copy over the pubkey 
    70867090                local pubKey=`cat /usr/local/etc/pkg.conf | grep "^PUBKEY:" | awk '{print $2}'` 
    70877091                if [ -n "$pubKey" ] ; then 
     
    70917095                        cp $pubKey ${PBI_CHROOTDIR}/$pubKey 
    70927096                fi 
     7097 
    70937098        fi 
    70947099 
Note: See TracChangeset for help on using the changeset viewer.