From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Tue, 15 Dec 2015 20:17:47 +0000 (-0800)
Subject: nrelease - Change target from /usr/release to /usr/obj/release
X-Git-Tag: v4.6.0rc~1177
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/a291abfbc5000434d99844925cb8e7a0ce8e8ee5

nrelease - Change target from /usr/release to /usr/obj/release

* Change the nrelease build target from /usr/release to /usr/obj/release.
  This is to help cleanup the root mount.  Most people don't need to
  backup the release build target.
---

diff --git a/nrelease/Makefile b/nrelease/Makefile
index 82f54345cf..0105bb5c10 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -15,7 +15,7 @@ gui installer img nopkgs:
 #########################################################################
 
 DPORTS_PATH?=	/usr/dports
-ISODIR?=	/usr/release
+ISODIR?=	/usr/obj/release
 ISOROOT?=	${ISODIR}/root
 OBJSYS=		${.OBJDIR}/../sys
 GITHOST?=	git.dragonflybsd.org
diff --git a/share/man/man7/release.7 b/share/man/man7/release.7
index 513b5ca366..f7b96b6820 100644
--- a/share/man/man7/release.7
+++ b/share/man/man7/release.7
@@ -127,10 +127,10 @@ Default prefix of
 and
 .Va ISOROOT
 (default is
-.Pa /usr/release ) .
+.Pa /usr/obj/release ) .
 .It Va ISOFILE
 Name of the ISO image to generate (default is
-.Pa /usr/release/dfly.iso ) .
+.Pa /usr/obj/release/dfly.iso ) .
 .It Va ISOROOT
 Location where the image contents are installed to before the ISO is prepared.
 .It Va KERNCONF
@@ -154,10 +154,10 @@ If set, this variable will prevent source code from being copied to
 the ISO image.
 .It Va IMGFILE
 The name of the image file (default is
-.Pa /usr/release/dfly.img ) .
+.Pa /usr/obj/release/dfly.img ) .
 .It Va IMGMNT
 The mount point for the image (default is
-.Pa /usr/release/mnt ) .
+.Pa /usr/obj/release/mnt ) .
 .It Va IMGUSBDEV
 The disk device to use in the image's
 .Xr fstab 5
@@ -186,7 +186,7 @@ make release
 .Ed
 .Pp
 After running these commands, the image will be available in the
-.Pa /usr/release
+.Pa /usr/obj/release
 directory.
 .\".Pp
 .\"The steps required for engineering a release are documented in (CVS)
diff --git a/tools/snapshots/dobuild b/tools/snapshots/dobuild
index 6b3f578dac..ea756a6ebb 100755
--- a/tools/snapshots/dobuild
+++ b/tools/snapshots/dobuild
@@ -83,9 +83,9 @@ mkdir -p $snapshots/$arch/images
 mkdir -p $snapshots/$arch/kernels
 set filepath = $snapshots/$arch
 umask 077
-bzip2 < $build/root/usr/release/dfly.iso > $filepath/images/$basename.iso.bz2
-bzip2 < $build/root/usr/release/dfly.img > $filepath/images/$basename.img.bz2
-(cd $build/root/usr/release/root; tar cf - boot | bzip2 > $filepath/kernels/$basename.boot.tar.bz2)
+bzip2 < $build/root/usr/obj/release/dfly.iso > $filepath/images/$basename.iso.bz2
+bzip2 < $build/root/usr/obj/release/dfly.img > $filepath/images/$basename.img.bz2
+(cd $build/root/usr/obj/release/root; tar cf - boot | bzip2 > $filepath/kernels/$basename.boot.tar.bz2)
 chmod 644 $filepath/images/$basename.iso.bz2
 chmod 644 $filepath/images/$basename.img.bz2
 chmod 644 $filepath/kernels/$basename.boot.tar.bz2