Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Instead of needing to build pkgng from source, install it when

we extract the chroot
  • Loading branch information...
commit 471d7d31cc71c2c27345d32501ba9b3bf11cf051 1 parent 3359ccf
@kmoore134 kmoore134 authored
Showing with 7 additions and 11 deletions.
  1. +7 −11 src-sh/pbi-manager10/pbi-manager
View
18 src-sh/pbi-manager10/pbi-manager
@@ -1823,17 +1823,7 @@ set_make_options() {
# Make sure ldconfig is primed
/etc/rc.d/ldconfig start
- if [ "$PBI_PKGNGBUILD" ] ; then
- echo "Installing pkgng..."
- pkgFetchURL=`grep "^packagesite:" /usr/local/etc/pkg.conf | awk '{print $2}' | sed 's|pkg+||g'`
- cd /tmp
- fetch -o pkg.txz ${pkgFetchURL}/Latest/pkg.txz
- if [ $? -ne 0 ] ; then exit_err "Failed fetching pkgng..."; fi
- tar xvf pkg.txz >/dev/null 2>/dev/null
- ./usr/local/sbin/pkg-static add pkg.txz
- if [ $? -ne 0 ] ; then exit_err "Failed installing pkgng..."; fi
- rm pkg.txz
- else
+ if [ -z "$PBI_PKGNGBUILD" ] ; then
echo "Building pkgng..."
cd /usr/ports/ports-mgmt/pkg
make install clean
@@ -7210,6 +7200,12 @@ chroot_extract() {
cp $pubKey ${PBI_CHROOTDIR}/$pubKey
fi
+ # Install pkgng into the chroot
+ pkg-static -c ${PBI_CHROOTDIR} install -y ports-mgmt/pkg
+ if [ $? -ne 0 ] ; then
+ exit_err "Failed installing pkgng into chroot"
+ fi
+
fi
# If we have a custom PBI_MAKECONF include it
Please sign in to comment.
Something went wrong with that request. Please try again.