[PC-BSD Commits] r5511 - in pbibuild: pbibuilder7/scripts pbibuilder8/scripts

[svn at pcbsd.org]

Author: kris
Date: 2009-12-09 06:55:39 -0800 (Wed, 09 Dec 2009)
New Revision: 5511

Modified:
   pbibuild/pbibuilder7/scripts/3.makepbi.sh
   pbibuild/pbibuilder8/scripts/3.makepbi.sh
Log:

Updated the 3.makepbi.sh script for pbibuilder, copy overlay-dir after
doing other population, so you can "override" a port's default file with
your own in a module



Modified: pbibuild/pbibuilder7/scripts/3.makepbi.sh
===================================================================
--- pbibuild/pbibuilder7/scripts/3.makepbi.sh	2009-12-09 14:02:47 UTC (rev 5510)
+++ pbibuild/pbibuilder7/scripts/3.makepbi.sh	2009-12-09 14:55:39 UTC (rev 5511)
@@ -109,21 +109,16 @@
 mkdir -p ${PBIDIR}
 cd ${PBIDIR}
 
-# Copy over the PBI overlay-dir directory (if it exists)
-if [ -e "/module/overlay-dir" ]
-then
-  tar cvf - -C /module/overlay-dir . 2>/dev/null | tar xvpf - -C ${PBIDIR} 2>/dev/null
-fi
 
 # Perform PBI auto-population
 if [ -e "/autopopulate.sh" ]
 then
   echo "/autopopulate.sh ${PKGNAME} ${PBILOCALBASE} ${PBIDIR} /autopopulate.sh"
-  if [ "${PBIAUTOPOPULATE}" = "FULL" ]
+  if [ "${PBIAUTOPOPULATE}" = "TARGETONLY" ]
   then
+    /autopopulate.sh "${PKGNAME}" "${PBILOCALBASE}" "${PBIDIR}"
+  else
     /autopopulate.sh "${PKGNAME}" "${PBILOCALBASE}" "${PBIDIR}" "/autopopulate.sh"
-  else
-    /autopopulate.sh "${PKGNAME}" "${PBILOCALBASE}" "${PBIDIR}"
   fi
 
   # Perform PBI auto-population for OTHERPORT
@@ -135,7 +130,7 @@
       then
         echo "AUTO-POPULATING: $line"
         OTHER_PKGNAME="`/usr/bin/make -C ${line} -V PKGNAME`"
-        /autopopulate.sh "${OTHER_PKGNAME}" "${PBILOCALBASE}" "${PBIDIR}"
+        /autopopulate.sh "${OTHER_PKGNAME}" "${PBILOCALBASE}" "${PBIDIR}" "/autopopulate.sh"
       fi
     done < "/tmp/otherports"
   fi
@@ -150,7 +145,7 @@
       then
         echo "AUTO-POPULATING: $line"
         OTHER_PKGNAME="`/usr/bin/make -C ${line} -V PKGNAME`"
-        /autopopulate.sh "${OTHER_PKGNAME}" "${PBILOCALBASE}" "${PBIDIR}"
+        /autopopulate.sh "${OTHER_PKGNAME}" "${PBILOCALBASE}" "${PBIDIR}" "/autopopulate.sh"
       fi
     done < "/tmp/autopop-extra-ports"
   fi
@@ -192,6 +187,12 @@
  echo "cp -R $line"
 done <"/module/copy-files"
 
+fi # End of copy-files check
+
+# Copy over the PBI overlay-dir directory (if it exists)
+if [ -e "/module/overlay-dir" ]
+then
+  tar cvf - -C /module/overlay-dir . 2>/dev/null | tar xvpf - -C ${PBIDIR} 2>/dev/null
 fi
 
 # Start the creation of the .pbc file

Modified: pbibuild/pbibuilder8/scripts/3.makepbi.sh
===================================================================
--- pbibuild/pbibuilder8/scripts/3.makepbi.sh	2009-12-09 14:02:47 UTC (rev 5510)
+++ pbibuild/pbibuilder8/scripts/3.makepbi.sh	2009-12-09 14:55:39 UTC (rev 5511)
@@ -109,21 +109,16 @@
 mkdir -p ${PBIDIR}
 cd ${PBIDIR}
 
-# Copy over the PBI overlay-dir directory (if it exists)
-if [ -e "/module/overlay-dir" ]
-then
-  tar cvf - -C /module/overlay-dir . 2>/dev/null | tar xvpf - -C ${PBIDIR} 2>/dev/null
-fi
 
 # Perform PBI auto-population
 if [ -e "/autopopulate.sh" ]
 then
   echo "/autopopulate.sh ${PKGNAME} ${PBILOCALBASE} ${PBIDIR} /autopopulate.sh"
-  if [ "${PBIAUTOPOPULATE}" = "FULL" ]
+  if [ "${PBIAUTOPOPULATE}" = "TARGETONLY" ]
   then
+    /autopopulate.sh "${PKGNAME}" "${PBILOCALBASE}" "${PBIDIR}"
+  else
     /autopopulate.sh "${PKGNAME}" "${PBILOCALBASE}" "${PBIDIR}" "/autopopulate.sh"
-  else
-    /autopopulate.sh "${PKGNAME}" "${PBILOCALBASE}" "${PBIDIR}"
   fi
 
   # Perform PBI auto-population for OTHERPORT
@@ -135,7 +130,7 @@
       then
         echo "AUTO-POPULATING: $line"
         OTHER_PKGNAME="`/usr/bin/make -C ${line} -V PKGNAME`"
-        /autopopulate.sh "${OTHER_PKGNAME}" "${PBILOCALBASE}" "${PBIDIR}"
+        /autopopulate.sh "${OTHER_PKGNAME}" "${PBILOCALBASE}" "${PBIDIR}" "/autopopulate.sh"
       fi
     done < "/tmp/otherports"
   fi
@@ -150,7 +145,7 @@
       then
         echo "AUTO-POPULATING: $line"
         OTHER_PKGNAME="`/usr/bin/make -C ${line} -V PKGNAME`"
-        /autopopulate.sh "${OTHER_PKGNAME}" "${PBILOCALBASE}" "${PBIDIR}"
+        /autopopulate.sh "${OTHER_PKGNAME}" "${PBILOCALBASE}" "${PBIDIR}" "/autopopulate.sh"
       fi
     done < "/tmp/autopop-extra-ports"
   fi
@@ -192,6 +187,12 @@
  echo "cp -R $line"
 done <"/module/copy-files"
 
+fi # End of copy-files check
+
+# Copy over the PBI overlay-dir directory (if it exists)
+if [ -e "/module/overlay-dir" ]
+then
+  tar cvf - -C /module/overlay-dir . 2>/dev/null | tar xvpf - -C ${PBIDIR} 2>/dev/null
 fi
 
 # Start the creation of the .pbc file