Changeset af5442e


Ignore:
Timestamp:
11/29/13 05:29:15 (10 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
54c22c2
Parents:
20ddec1 (diff), 3147183 (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

    r3359ccf r3147183  
    16691669 
    16701670        # Check first if we have this pkg in PKGNG 
    1671         if [ -n "$PBI_PKGNGBUILD" ] ; then 
     1671        if [ -n "$PBI_PKGNGBUILD" -a -z "$PBI_AB_NOPKGBUILD" ] ; then 
    16721672                testPkgVer="`pkg-static rquery '%v' ${PBI_MAKEPORT}`" 
    16731673                if [ -n "$testPkgVer" ] ; then 
     
    16801680                        return 0 
    16811681                fi 
    1682                 exit_err "Failed to get PBI_PROGVERSION" 
     1682                exit_err "Failed to get PBI_PROGVERSION for ${PBI_MAKEPORT}" 
    16831683        fi 
    16841684 
     
    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 
     
    59545944                  sync 
    59555945                  sleep 3 
    5956                   zfs destroy -r ${zDir} 
     5946                  zfs destroy -r "${zDir}" 
    59575947                  rmdir "${zDir}" >/dev/null 2>/dev/null 
    59585948                fi 
     
    60196009 
    60206010                # Builder idle, lets figure out the next build 
    6021                 echo "==> Finding target for build process [$build]" 
     6011                #echo "==> Finding target for build process [$build]" 
    60226012                start_next_ab_target "$build" 
    60236013                if [ $? -eq 0 ] ; then  
     
    60596049        # Figure out the target port for this build 
    60606050        unset PBI_MAKEPORT PBI_BUILDKEY PBI_PROGVERSION PBI_REQUIRESROOT PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MKPORTBEFORE PBI_MKPORTAFTER PBI_MAKEOPTS PBI_EXCLUDELIST PBI_AB_PRIORITY PBI_HASH_EXCLUDES PBI_AB_NOTMPFS PBI_PROGREVISION PBI_AB_NOPKGBUILD 
    6061         PBI_AB_NOPKGBUILD="" 
    60626051 
    60636052        . ${pbi} 
     
    61336122        if [ "$?" = "0" ] ; then         
    61346123           AB_FOUND="1" 
    6135  
    6136            if [ "$PBI_AB_PKGBUILD" = "YES" -a -z "$PBI_AB_NOPKGBUILD"  ] ; then 
    6137               echo "Doing package build for $PBI_MAKEPORT" 
    6138            else 
    6139               echo "Doing source build for $PBI_MAKEPORT" 
    6140            fi 
    61416124 
    61426125           # Unset the priority if set to 00 / 0 
     
    61996182  # We have something to build lets do it! 
    62006183  pbi="$CUR_WORKING_PBI" 
    6201   unset PBI_MAKEPORT PBI_BUILDKEY PBI_PROGVERSION PBI_REQUIRESROOT PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MKPORTBEFORE PBI_MKPORTAFTER PBI_MAKEOPTS PBI_EXCLUDELIST PBI_AB_PRIORITY PBI_HASH_EXCLUDES PBI_AB_NOTMPFS PBI_PROGREVISION 
     6184  unset PBI_MAKEPORT PBI_BUILDKEY PBI_PROGVERSION PBI_REQUIRESROOT PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MKPORTBEFORE PBI_MKPORTAFTER PBI_MAKEOPTS PBI_EXCLUDELIST PBI_AB_PRIORITY PBI_HASH_EXCLUDES PBI_AB_NOTMPFS PBI_PROGREVISION PBI_AB_NOPKGBUILD 
    62026185  . ${pbi} 
    62036186 
    62046187  _cd=$(dirname $pbi | sed 's|./||') 
    62056188  PBI_CONFDIR="$_cd" 
    6206  
    6207   # Get the prog version 
    6208   get_pbi_progversion 
    62096189 
    62106190  if [ -z "${PBI_MAKEPORT}" ] ; then 
     
    62186198  fi 
    62196199 
    6220   echo "==> Starting build process [$curBuilder]: $PBI_MAKEPORT" 
     6200  # Get the prog version 
     6201  get_pbi_progversion 
     6202 
     6203  if [ "$PBI_AB_PKGBUILD" = "YES" -a -z "$PBI_AB_NOPKGBUILD"  ] ; then 
     6204     ttag="package" 
     6205  else 
     6206     ttag="source" 
     6207  fi 
     6208 
     6209  echo "==> Starting $ttag build [$curBuilder]: $PBI_MAKEPORT" 
    62216210  echo "$PBI_MAKEPORT" >${PBI_TMPDIR}/${curBuilder}.bPort 
    62226211 
     
    63556344 
    63566345        if [ -e "${PBI_TMPDIR}/${build}.result" -a "`cat ${PBI_TMPDIR}/${build}.result`" = "0" ] ; then 
     6346 
     6347                echo "===> Build of ${_mp} was successfull! [$build]" 
     6348 
    63576349                echo "$_pv" > "${_od}/pbi-version" 
    63586350                echo "OK" > "${_od}/pbi-result" 
     
    63836375 
    63846376        else 
     6377                echo "===> Build of ${_mp} failed! [$build]" 
    63856378                echo "Failed" > "${_od}/pbi-result" 
    63866379                if [ -n "${PBI_AB_HELPS}" ] ; then 
     
    71367129             # If we are running as a result of pbi_autobuild, let it do the ZFS cleanup 
    71377130             if [ -z "${PBI_AB_TMPDIR}" ] ; then 
    7138                 zfs destroy -r ${tank}${PBI_CHROOTDIR} 
     7131                zfs destroy -r "${tank}${PBI_CHROOTDIR}" 
    71397132                rmdir "${PBI_CHROOTDIR}" >/dev/null 2>/dev/null 
    71407133             fi 
     
    72107203                        cp $pubKey ${PBI_CHROOTDIR}/$pubKey 
    72117204                fi 
     7205 
     7206                # Install pkgng into the chroot 
     7207                pkg-static -c ${PBI_CHROOTDIR} install -y ports-mgmt/pkg 
     7208                if [ $? -ne 0 ] ; then 
     7209                        exit_err "Failed installing pkgng into chroot" 
     7210                fi 
    72127211 
    72137212        fi 
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/bin/xdg-open

    rdb60a53 r20ddec1  
    357357open_kde() 
    358358{ 
    359     if kde-open -v 2>/dev/null 1>&2; then 
    360         kde-open "$1" 
     359    if kioclient -v 2>/dev/null 1>&2; then 
     360        kioclient exec "$1" 
    361361    else 
    362362        if [ x"$KDE_SESSION_VERSION" = x"4" ]; then 
Note: See TracChangeset for help on using the changeset viewer.