Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 1 contributor
Commits on Nov 26, 2013
@kmoore134 kmoore134 Fix two bugs, first only grab first LICENSE text line
Second fix an issue doing PKGNG builds, don't bother looking at a ports
tree to see if package exists, we can just 'pkg rquery' instead
f17bcf9
@kmoore134 kmoore134 Merge branch 'master' of github.com:pcbsd/pcbsd fbc8e89
Showing with 32 additions and 19 deletions.
  1. +32 −19 src-sh/pbi-manager10/pbi-manager
View
51 src-sh/pbi-manager10/pbi-manager
@@ -6044,36 +6044,49 @@ ab_get_build_list()
export PBI_MAKEPORT
fi
- if [ ! -d "${PORTSDIR}/${PBI_MAKEPORT}" ] ; then
- #echo "Skipping invalid port ${PORTSDIR}/${PBI_MAKEPORT}"
- continue
- fi
-
# Remove any trailing '/'
echo $PBI_MAKEPORT | grep -q "/$"
if [ $? -eq 0 ] ; then
PBI_MAKEPORT="`echo $PBI_MAKEPORT | sed 's|/$||g'`"
fi
- # Check if this port can be built on this architecture
- check_port_compat_arch "${PORTSDIR}/${PBI_MAKEPORT}"
- if [ "$?" = "1" ] ; then
- if [ "$PBI_ABFB32" != "YES" ] ; then
- echo "${PBI_MAKEPORT} - Skipping for invalid system arch"
- continue
- fi
- if [ "$have32" != "true" ] ; then
- echo "${PBI_MAKEPORT} - Skipping for invalid system arch"
- continue
- fi
- fi
-
# Check for missing port target
if [ -z "$PBI_MAKEPORT" ] ; then
#echo "Warning: Missing PBI_MAKEPORT for ${pbi}"
continue
fi
+ if [ "$PBI_AB_PKGBUILD" = "YES" -a -z "$PBI_AB_NOPKGBUILD" ] ; then
+ # Doing a package build for this PBI
+ pkg rquery "%v" ${PBI_MAKEPORT} >/dev/null 2>/dev/null
+ if [ $? -ne 0 ] ; then
+ echo "No package found for: ${PBI_MAKEPORT}"
+ continue
+ fi
+
+ else
+
+ # Doing a port build for this PBI
+ if [ ! -d "${PORTSDIR}/${PBI_MAKEPORT}" ] ; then
+ #echo "Skipping invalid port ${PORTSDIR}/${PBI_MAKEPORT}"
+ continue
+ fi
+
+ # Check if this port can be built on this architecture
+ check_port_compat_arch "${PORTSDIR}/${PBI_MAKEPORT}"
+ if [ "$?" = "1" ] ; then
+ if [ "$PBI_ABFB32" != "YES" ] ; then
+ echo "${PBI_MAKEPORT} - Skipping for invalid system arch"
+ continue
+ fi
+ if [ "$have32" != "true" ] ; then
+ echo "${PBI_MAKEPORT} - Skipping for invalid system arch"
+ continue
+ fi
+ fi
+
+ fi
+
# Check if another builder is already doing this port
pBuilding=0
for p in `ls ${PBI_TMPDIR}/*.bPort 2>/dev/null`
@@ -6964,7 +6977,7 @@ load_pkg_metadata()
fi
if [ -z "$PBI_LICENSE" ] ; then
- PBI_LICENSE="`pkg query '%L' ${PBI_MAKEPORT}`"
+ PBI_LICENSE="`pkg query '%L' ${PBI_MAKEPORT} | head -n 1`"
fi
if [ -z "$PBI_SHORTDESC" ] ; then
PBI_SHORTDESC="`pkg query '%c' ${PBI_MAKEPORT}`"

No commit comments for this range

Something went wrong with that request. Please try again.