Changeset cd20ca3


Ignore:
Timestamp:
12/09/13 13:34:24 (21 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, enter/10, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2, releng/10.2, stable/10
Children:
f5897a1
Parents:
a3d8948
Message:

Move the pcbsd pkgng repo file from pcbsd.cfg -> pcbsd.conf

Copy over the new /usr/local/etc/pkg dir when creating PBIs from packages

Location:
src-sh
Files:
1 edited
1 moved

Legend:

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

    r7ff5d68 rcd20ca3  
    71927192                mkdir -p ${PBI_CHROOTDIR}/usr/local/etc 2>/dev/null 
    71937193                cp /usr/local/etc/pkg.conf ${PBI_CHROOTDIR}/usr/local/etc/pkg.conf 
    7194                 # Make sure we change pkgng ARCH to what we are building 
    7195                 sed -i '' "s|amd64|$ARCH|g" ${PBI_CHROOTDIR}/usr/local/etc/pkg.conf      
    7196                 sed -i '' "s|i386|$ARCH|g" ${PBI_CHROOTDIR}/usr/local/etc/pkg.conf       
    7197                 # Now make sure to copy over the pubkey 
    7198                 local pubKey=`cat /usr/local/etc/pkg.conf | grep "^PUBKEY:" | awk '{print $2}'` 
    7199                 if [ -n "$pubKey" ] ; then 
    7200                         if [ ! -d "${PBI_CHROOTDIR}/`dirname $pubKey`" ] ; then 
    7201                                 mkdir "${PBI_CHROOTDIR}/`dirname $pubKey`" 
    7202                         fi 
    7203                         cp $pubKey ${PBI_CHROOTDIR}/$pubKey 
    7204                 fi 
     7194                # Copy over the pkg/repo and friends 
     7195                cp -r /usr/local/etc/pkg ${PBI_CHROOTDIR}/usr/local/etc/ 
    72057196 
    72067197                # Install pkgng into the chroot 
Note: See TracChangeset for help on using the changeset viewer.