Changeset 471d7d31


Ignore:
Timestamp:
11/28/13 17:08:07 (13 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
cc22601
Parents:
3359ccf
Message:

Instead of needing to build pkgng from source, install it when
we extract the chroot

File:
1 edited

Legend:

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

    r3359ccf r471d7d31  
    18241824        /etc/rc.d/ldconfig start 
    18251825 
    1826         if [ "$PBI_PKGNGBUILD" ] ; then 
    1827                 echo "Installing pkgng..." 
    1828                 pkgFetchURL=`grep "^packagesite:" /usr/local/etc/pkg.conf | awk '{print $2}' | sed 's|pkg+||g'` 
    1829                 cd /tmp 
    1830                 fetch -o pkg.txz ${pkgFetchURL}/Latest/pkg.txz 
    1831                 if [ $? -ne 0 ] ; then exit_err "Failed fetching pkgng..."; fi 
    1832                 tar xvf pkg.txz >/dev/null 2>/dev/null 
    1833                 ./usr/local/sbin/pkg-static add pkg.txz 
    1834                 if [ $? -ne 0 ] ; then exit_err "Failed installing pkgng..."; fi 
    1835                 rm pkg.txz 
    1836         else 
     1826        if [ -z "$PBI_PKGNGBUILD" ] ; then 
    18371827                echo "Building pkgng..." 
    18381828                cd /usr/ports/ports-mgmt/pkg 
     
    72117201                fi 
    72127202 
     7203                # Install pkgng into the chroot 
     7204                pkg-static -c ${PBI_CHROOTDIR} install -y ports-mgmt/pkg 
     7205                if [ $? -ne 0 ] ; then 
     7206                        exit_err "Failed installing pkgng into chroot" 
     7207                fi 
     7208 
    72137209        fi 
    72147210 
Note: See TracChangeset for help on using the changeset viewer.