nrelease/Makefile.usr: Relocate the git gc for pkgsrc to nrelease.

Since it was only meant for keeping the LiveDVD smaller, put it into
its build and don't force everyone to sit through it. The time it
takes seems to increase significantly on virtual machines with just
1G of RAM, for example. It seems to be quite memory hungry.

Reported-by: many

diff --git a/etc/Makefile.usr b/etc/Makefile.usr
index 8b1bfdb..ed33b09 100644 (file)
--- a/etc/Makefile.usr
+++ b/etc/Makefile.usr
@@ -50,9 +50,6 @@ help all:
        @echo "make src-create and/or make pkgsrc-create to set up the initial"
        @echo "git repo."
 
-# NOTE: Adding the git gc --aggressive helps nrelease builds by significantly
-#      reducing the disk space required.
-#
 pkgsrc-create-repo:
        @echo "If problems occur you may have to rm -rf pkgsrc and try again."
        @echo ""
@@ -62,7 +59,6 @@ pkgsrc-create-repo:
                git remote add origin git://${GITHOST}/pkgsrcv2.git
        cd ${.CURDIR}/pkgsrc && git fetch origin
        cd ${.CURDIR}/pkgsrc && git branch master origin/master
-       cd ${.CURDIR}/pkgsrc && git gc --aggressive
 
 pkgsrc-create: pkgsrc-create-repo
        cd ${.CURDIR}/pkgsrc && git checkout master

diff --git a/nrelease/Makefile b/nrelease/Makefile
index b1ecb76..57e4259 100644 (file)
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -276,6 +276,10 @@ srcs:
        rm -f ${ISOROOT}/usr/src-sys.tgz
        rm -f ${ISOROOT}/usr/src-sys.tar.bz2
        cd ${ISOROOT}/usr && make pkgsrc-create-repo GITHOST=${GITHOST}
+       # NOTE: Adding the git gc --aggressive helps by significantly
+       #       reducing the disk space required.
+       #
+       cd ${ISOROOT}/usr/pkgsrc && git gc --aggressive
        cd ${ISOROOT}/usr && make src-create-repo GITHOST=${GITHOST}
 .else
        rm -f ${ISOROOT}/usr/src-sys.tgz