pkg - Adjust pkg-bootstrap-force
authorMatthew Dillon <dillon@apollo.backplane.com>
Wed, 10 Dec 2014 21:05:57 +0000 (13:05 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Wed, 10 Dec 2014 21:05:57 +0000 (13:05 -0800)
* Adjust the pkg-bootstrap-force target to also remove
  "/usr/local/etc/pkg.conf".  Older pkg.conf files (e.g. 3.5 or earlier,
  possibly 3.6 or earlier) can interfere with newer pkg bootstraps.

etc/Makefile.usr

index 295b596..e9442eb 100644 (file)
@@ -198,7 +198,11 @@ dports-replace:
        rm -f ${DPTBALL}
 .endif
 
+# NOTE: In force mode we also have to remove any old pkg.conf
+#      which might interfere with the newer pkg bootstrap.
+#
 pkg-bootstrap-force:
+       @rm -f /usr/local/etc/pkg.conf
        @fetch -o ${PKGBALL} ${PKGBOOT}
        @tar -xJf ${PKGBALL} -C ${.CURDIR}/local
        @rm -f ${PKGBALL}