Changeset 3b7aa60


Ignore:
Timestamp:
10/09/13 08:34:13 (13 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:
c405e82
Parents:
0e66326 (diff), 0dd24a8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Location:
src-sh
Files:
2 edited

Legend:

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

    r607d79b rf54df3c  
    11#!/bin/sh 
    22# 
    3 # Copyright 2011 iXsystems (Kris Moore) 
     3# Copyright 2013 iXsystems (Kris Moore) 
    44# All rights reserved 
    55# 
     
    70807080        cp ${PBI_WRAPPERFILE} ${PBI_CHROOTDIR}/.pbiwrapper-$ARCH 
    70817081 
     7082        # If we are doing a PKGNG build, lets set it up 
    70827083        if [ "$PBI_PKGNGBUILD" = "YES" ] ; then 
    70837084                mkdir -p ${PBI_CHROOTDIR}/usr/local/etc 2>/dev/null 
    70847085                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 
    70857090                local pubKey=`cat /usr/local/etc/pkg.conf | grep "^PUBKEY:" | awk '{print $2}'` 
    70867091                if [ -n "$pubKey" ] ; then 
     
    70907095                        cp $pubKey ${PBI_CHROOTDIR}/$pubKey 
    70917096                fi 
     7097 
    70927098        fi 
    70937099 
  • src-sh/pbi-manager/install.sh

    rc60c604 r0e66326  
    110110  mv pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-i386 
    111111else 
    112   touch ${LB}/share/pbi-manager/.pbiwrapper-i386 
     112  touch ${LB}/share/pbi-manager/.pbiwrapper-amd64 
    113113fi 
    114114 
Note: See TracChangeset for help on using the changeset viewer.