[PC-BSD Commits] r7861 - in pcbsd/current/src-sh/pbi-manager: . module-examples

[svn at pcbsd.org]

Author: kris
Date: 2010-10-21 07:24:03 -0700 (Thu, 21 Oct 2010)
New Revision: 7861

Modified:
   pcbsd/current/src-sh/pbi-manager/module-examples/convertoldmod.sh
   pcbsd/current/src-sh/pbi-manager/pbi-manager
Log:

When converting old modules, make sure to add PBI_MAKEPORT to new pbi.conf,
and when doing auto-builds, don't search through .svn directories



Modified: pcbsd/current/src-sh/pbi-manager/module-examples/convertoldmod.sh
===================================================================
--- pcbsd/current/src-sh/pbi-manager/module-examples/convertoldmod.sh	2010-10-19 00:29:44 UTC (rev 7860)
+++ pcbsd/current/src-sh/pbi-manager/module-examples/convertoldmod.sh	2010-10-21 14:24:03 UTC (rev 7861)
@@ -122,6 +122,12 @@
   echo " " >>${ndir}/pbi.conf
   expts="${expts} PBI_PROGICON"  
 fi
+if [ ! -z "${PBIPORT}" ] ; then
+  echo "# The target port we are building
+PBI_MAKEPORT=\"${PBIPORT}\"" >>${ndir}/pbi.conf
+  echo " " >>${ndir}/pbi.conf
+  expts="${expts} PBI_MAKEPORT"  
+fi
 if [ ! -z "${MAKEOPTS}" ] ; then
   echo "# Additional options for make.conf
 PBI_MAKEOPTS=\"${MAKEOPTS}\"" >>${ndir}/pbi.conf

Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2010-10-19 00:29:44 UTC (rev 7860)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2010-10-21 14:24:03 UTC (rev 7861)
@@ -3351,7 +3351,7 @@
 	cd "${PBI_AB_CONFDIR}"
 	init_tmpdir
 	
-	find . -type f -name "${PBI_CONFFILE}" >"${PBI_TMPDIR}/.autob.$$"
+	find . -type f -name "${PBI_CONFFILE}" | grep -v '\.svn' >"${PBI_TMPDIR}/.autob.$$"
 	while read pbi
 	do
 		# Figure out the target port for this build