Changeset cadcbd2


Ignore:
Timestamp:
05/09/14 08:43:26 (13 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
40d27fc, 7e29143
Parents:
a940224 (diff), 1dae080 (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

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-extractoverlay/pc-extractoverlay

    r12b4844 r1dae080  
    22 
    33PCBSD_ETCCONF="/usr/local/etc/pcbsd.conf" 
    4  
    5 # Get the PACKAGE_SET to use for this pkgng repo 
    6 PACKAGE_SET="PRODUCTION" 
    7 _pkgChk="`sed -n 's/PACKAGE_SET: //p' ${PCBSD_ETCCONF} 2>/dev/null | awk '{print $1}'`" 
    8 if [ -n "${_pkgChk}" ] ; then PACKAGE_SET="$_pkgChk" ; fi 
    9  
    10 # Check the PACKAGE_SET variable 
    11 case $PACKAGE_SET in 
    12    PRODUCTION|EDGE) ;; 
    13   CUSTOM) # Using a custom package set? 
    14           # Lets check that we have a URL provided 
    15           _urlChk="`sed -n 's/PACKAGE_URL: //p' ${PCBSD_ETCCONF} 2>/dev/null | awk '{print $1}'`" 
    16           if [ -z "${_urlChk}" ] ; then 
    17              echo "Warning: PACKAGE_SET is CUSTOM, but no PACKAGE_URL set!" 
    18              echo "Reverting back to PRODUCTION repo..." 
    19              sleep 3 
    20              CUSTOM_URL="" 
    21              PACKAGE_SET="PRODUCTION" 
    22           else 
    23              CUSTOM_URL="$_urlChk" 
    24           fi 
    25           ;; 
    26        *) echo "Warning: Invalid PACKAGE_SET!"  
    27           PACKAGE_SET="PRODUCTION" ;;  
    28 esac 
    294 
    305do_prune() 
     
    141116  fi 
    142117 
    143   # See if we need to adjust pcbsd.conf repo file 
    144   if [ ! -e "/usr/local/etc/pkg/repos/pcbsd.conf.dist" ];then 
    145      echo "WARNING: Missing /usr/local/etc/pkg/repos/pcbsd.conf.dist" 
    146      status="1" 
    147      return 
    148   fi 
     118  # Update the pkgng configuration 
     119  pc-updatemanager syncconf 2>/dev/null >/dev/null 
    149120 
    150   ARCH=`uname -m` 
    151   FBSDVER=`uname -r | cut -d '-' -f 1-2` 
    152  
    153   # If using the EDGE package set, set the right path 
    154   case $PACKAGE_SET in 
    155        EDGE) FBSDVER="$FBSDVER/edge";; 
    156           *) ;; 
    157   esac 
    158  
    159   if [ "$PACKAGE_SET" = "CUSTOM" ] ; then 
    160      # Setup the custom pcbsd.conf repo 
    161      cat << EOF >/usr/local/etc/pkg/repos/pcbsd.conf 
    162 pcbsd: { 
    163                url: "$CUSTOM_URL", 
    164                signature_type: "fingerprints", 
    165                fingerprints: "/usr/local/etc/pkg/fingerprints/pcbsd", 
    166                enabled: true 
    167               } 
    168 EOF 
    169   else 
    170      # Using PC-BSD CDN 
    171      cat /usr/local/etc/pkg/repos/pcbsd.conf.dist \ 
    172         | sed "s|VERSION|$FBSDVER|g" \ 
    173         | sed "s|ARCH|$ARCH|g" > /usr/local/etc/pkg/repos/pcbsd.conf 
    174   fi 
    175121} 
    176122 
  • src-sh/pc-updatemanager/pc-updatemanager

    r08a3270 r1dae080  
    3333# Set the system arch type 
    3434ARCH=`uname -m` 
    35  
    36 # Default pcbsd.conf file 
    37 PCBSD_ETCCONF="/usr/local/etc/pcbsd.conf" 
    3835 
    3936# Patchset Data 
     
    7168# Done with config values 
    7269###################################################################### 
     70 
     71# Get the PACKAGE_SET to use for this pkgng repo 
     72PACKAGE_SET="PRODUCTION" 
     73_pkgChk="`sed -n 's/PACKAGE_SET: //p' ${PCBSD_ETCCONF} 2>/dev/null | awk '{print $1}'`" 
     74if [ -n "${_pkgChk}" ] ; then PACKAGE_SET="$_pkgChk" ; fi 
     75 
     76# Check the PACKAGE_SET variable 
     77case $PACKAGE_SET in 
     78   PRODUCTION|EDGE) ;; 
     79  CUSTOM) # Using a custom package set? 
     80          # Lets check that we have a URL provided 
     81          _urlChk="`sed -n 's/PACKAGE_URL: //p' ${PCBSD_ETCCONF} 2>/dev/null | awk '{print $1}'`" 
     82          if [ -z "${_urlChk}" ] ; then 
     83             echo "Warning: PACKAGE_SET is CUSTOM, but no PACKAGE_URL set!" 
     84             echo "Reverting back to PRODUCTION repo..." 
     85             sleep 3 
     86             CUSTOM_URL="" 
     87             PACKAGE_SET="PRODUCTION" 
     88          else 
     89             CUSTOM_URL="$_urlChk" 
     90          fi 
     91          ;; 
     92       *) echo "Warning: Invalid PACKAGE_SET!"  
     93          PACKAGE_SET="PRODUCTION" ;;  
     94esac 
     95 
     96 
    7397 
    7498# Files we always want to upgrade in /etc 
     
    84108  pkgcheck              - Check for updates to packages 
    85109  pkgupdate             - Install packages updates 
    86   syncconf              - Update jails pkgng config to match system 
     110  syncconf              - Update PC-BSD pkgng configuration 
     111  confcheck             - Check PC-BSD pkgng configuration 
    87112  -j <jail>             - Operate on the jail specified 
    88113"        
    89114 
    90115        exit 1 
     116} 
     117 
     118setup_pkgng_conf() { 
     119 
     120  # See if we need to adjust pcbsd.conf repo file 
     121  if [ ! -e "/usr/local/etc/pkg/repos/pcbsd.conf.dist" ];then 
     122     echo "WARNING: Missing /usr/local/etc/pkg/repos/pcbsd.conf.dist" 
     123     status="1" 
     124     return 1 
     125  fi 
     126 
     127  ARCH=`uname -m` 
     128  FBSDVER=`uname -r | cut -d '-' -f 1-2` 
     129 
     130  # If using the EDGE package set, set the right path 
     131  case $PACKAGE_SET in 
     132       EDGE) FBSDVER="$FBSDVER/edge";; 
     133          *) ;; 
     134  esac 
     135 
     136  if [ "$PACKAGE_SET" = "CUSTOM" ] ; then 
     137     # Setup the custom pcbsd.conf repo 
     138     cat << EOF >/usr/local/etc/pkg/repos/pcbsd.conf 
     139pcbsd: { 
     140               url: "$CUSTOM_URL", 
     141               signature_type: "fingerprints", 
     142               fingerprints: "/usr/local/etc/pkg/fingerprints/pcbsd", 
     143               enabled: true 
     144              } 
     145EOF 
     146  else 
     147     # Using PC-BSD CDN 
     148     cat /usr/local/etc/pkg/repos/pcbsd.conf.dist \ 
     149        | sed "s|VERSION|$FBSDVER|g" \ 
     150        | sed "s|ARCH|$ARCH|g" > /usr/local/etc/pkg/repos/pcbsd.conf 
     151  fi 
     152 
    91153} 
    92154 
     
    9691031 
    9701032sync_pkgconf() { 
    971   if [ -z "$INJAIL" ] ; then 
    972      exit_err "Usage: pc-updatemanager -j <jail> syncconf" 
    973   fi 
    974  
    975   # Need to update pkgng config in the jail to match systems 
    976   jDir="`jls | grep " $INJAIL " | awk '{print $4}'`" 
    977   if [ ! -d "$jDir/usr/local/etc/pkg/repos" ] ; then 
    978      mkdir -p ${jDir}/usr/local/etc/pkg/repos 
    979   fi 
    980   cp /usr/local/etc/pkg/repos/pcbsd.conf ${jDir}/usr/local/etc/pkg/repos/ 
    981  
     1033 
     1034  # Update systems pkgng configuration 
     1035  setup_pkgng_conf 
     1036 
     1037  if [ -n "$INJAIL" ] ; then 
     1038    # Need to update pkgng config in the jail to match systems 
     1039    jDir="`jls | grep " $INJAIL " | awk '{print $4}'`" 
     1040    if [ ! -d "$jDir/usr/local/etc/pkg/repos" ] ; then 
     1041       mkdir -p ${jDir}/usr/local/etc/pkg/repos 
     1042    fi 
     1043    cp /usr/local/etc/pkg/repos/pcbsd.conf ${jDir}/usr/local/etc/pkg/repos/ 
     1044  fi 
     1045} 
     1046 
     1047check_pkgconf() { 
     1048 
     1049  if [ -n "$INJAIL" ] ; then 
     1050    # Update systems pkgng configuration 
     1051    setup_pkgng_conf 
     1052 
     1053    # Need to update pkgng config in the jail to match systems 
     1054    jDir="`jls | grep " $INJAIL " | awk '{print $4}'`" 
     1055    diff /usr/local/etc/pkg/repos/pcbsd.conf ${jDir}/usr/local/etc/pkg/repos/pcbsd.conf >/dev/null 2>/dev/null 
     1056    if [ $? -eq 0 ] ; then 
     1057       echo "Config OK!" 
     1058       exit 0 
     1059    else 
     1060       exit_err "Config differs from systems" 
     1061    fi 
     1062  fi 
     1063 
     1064  # Update systems pkgng configuration 
     1065  setup_pkgng_conf 
     1066  exit $? 
    9821067} 
    9831068 
     
    11311216        pkgcheck) checkup_pkgs ; break ;; 
    11321217        syncconf) sync_pkgconf ; break ;; 
     1218       confcheck) check_pkgconf ; break ;; 
    11331219       pkgupdate) update_pkgs "$2" ; break ;; 
    11341220finish-major-update) finish_major_fbsd_update ; break ;; 
  • src-qt4/pc-systemupdatertray/pc-systemupdatertray.pro

    rda0d856 ra940224  
    8686desktop.files=pcbsdpbu.desktop 
    8787 
    88 images.path=/usr/local/share/pcbsd/pc-systemupdatertray/images 
    89 images.files=images/* 
     88#images.path=/usr/local/share/pcbsd/pc-systemupdatertray/images 
     89#images.files=images/* 
    9090 
    9191TARGET  = pc-systemupdatertray 
    9292target.path = /usr/local/bin/ 
    9393 
    94 INSTALLS += target dotrans desktop images 
     94INSTALLS += target dotrans desktop 
    9595 
    9696QMAKE_LIBDIR = /usr/local/lib/qt4 /usr/local/lib 
Note: See TracChangeset for help on using the changeset viewer.