Fix snapshot building (hopefully).
authorSascha Wildner <saw@online.de>
Wed, 13 Apr 2011 08:08:27 +0000 (10:08 +0200)
committerSascha Wildner <saw@online.de>
Wed, 13 Apr 2011 08:08:52 +0000 (10:08 +0200)
Since pkgsrc making USE_DESTDIR active by default snapshot building was
broken since it would try to build a package for the bootstrap and failed:

=> Creating binary package /usr/pkgsrc/packages/All/bootstrap-mk-files-20090807nb2.tgz
pkg_create: Package building is not supported in bootstrap mode

Until this is fixed in pkgsrc, set USE_DESTDIR to "no" to fix snapshot
building.

nrelease/Makefile

index 8cf271f..b3b68ca 100644 (file)
@@ -342,7 +342,7 @@ customizeiso:
                    ${ISOROOT}/var/db/pkg.refcount
        test -e ${ISODIR}/.didbootstrap || \
            ${CHROOT_CMD} "cd /usr/pkgsrc/bootstrap;    \
                    ${ISOROOT}/var/db/pkg.refcount
        test -e ${ISODIR}/.didbootstrap || \
            ${CHROOT_CMD} "cd /usr/pkgsrc/bootstrap;    \
-               export share_dir=/usr/pkgobj/bootstrap/work/share; \
+               export share_dir=/usr/pkgobj/bootstrap/work/share USE_DESTDIR=no; \
                ./bootstrap --workdir /usr/pkgobj/bootstrap/work"
        test -e ${ISODIR}/.didbootstrap || \
            echo ".ifdef BSD_PKG_MK     # added by nrelease" \
                ./bootstrap --workdir /usr/pkgobj/bootstrap/work"
        test -e ${ISODIR}/.didbootstrap || \
            echo ".ifdef BSD_PKG_MK     # added by nrelease" \