[DragonFlyBSD - Submit #1496] (Closed) minor fixes for redoing nrelease sub-targets

[bugtracker-admin at leaf.dragonflybsd.org]

Issue #1496 has been updated by tuxillo.

Status changed from New to Closed
% Done changed from 0 to 100

Applied in changeset commit:1c9d98d011e8feb81b9e5b37a47dff656fa89f3e.

----------------------------------------
Submit #1496: minor fixes for redoing nrelease sub-targets
http://bugs.dragonflybsd.org/issues/1496#change-11897

* Author: qhwt+dfly
* Status: Closed
* Priority: Normal
* Assignee: 
* Category: Other
* Target version: 3.8.0
----------------------------------------
minor fixes for redoing nrelease sub-targets

- use reinstall targets for installing kernel/modules; we don't really
  want to leave *.old files in ISO image.
- pass -f to ln for kernel.BOOTP
- cp -p resolv.conf inherits file flags, but nrelease attempts to rm it
  later on, which may fail if it had schg set.
---
 nrelease/Makefile |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nrelease/Makefile b/nrelease/Makefile
index b56f836..f9152d7 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -235,16 +235,16 @@ buildiso:
 .if make(gui)
 	if [ ! -d ${ISOROOT}/kernel.smp/boot ]; then mkdir -p ${ISOROOT}/kernel.smp/boot; fi
 	cd ${.CURDIR}/..; \
-	make installkernel DESTDIR=${ISOROOT} \
+	make reinstallkernel DESTDIR=${ISOROOT} \
 	KERNCONF=DFLYLIVE DESTKERNNAME=kernel KERNCONFDIR=${.CURDIR}/gui/root; \
 	cd ${.CURDIR}/..; \
-	make installkernel DESTDIR=${ISOROOT} \
+	make reinstallkernel DESTDIR=${ISOROOT} \
 	KERNCONF=VKERNEL DESTKERNNAME=kernel.VKERNEL -DNO_MODULES KERNCONFDIR=${.CURDIR}/gui/root; \
 	cd ${.CURDIR}/..; \
-	make installkernel DESTDIR=${ISOROOT}/kernel.smp \
+	make reinstallkernel DESTDIR=${ISOROOT}/kernel.smp \
 	KERNCONF=DFLYLIVE-SMP DESTKERNNAME=kernel KERNCONFDIR=${.CURDIR}/gui/root; \
 	cd ${.CURDIR}/..; \
-	make installkernel DESTDIR=${ISOROOT}/kernel.smp \
+	make reinstallkernel DESTDIR=${ISOROOT}/kernel.smp \
 	KERNCONF=DFLYLIVE-SMP-NOAPIC DESTKERNNAME=kernel.noapic \
 		KERNCONFDIR=${.CURDIR}/gui/root -DNO_MODULES;
 .else
@@ -252,13 +252,13 @@ buildiso:
 	first=; \
 	for kernconf in ${KERNCONF}; do \
 		make DESTDIR=${ISOROOT} \
-			installkernel KERNCONF=$${kernconf} \
+			reinstallkernel KERNCONF=$${kernconf} \
 			$${first:+DESTKERNNAME=kernel.$${kernconf}} \
 			$${first:+-DNO_MODULES}; \
 		first=done; \
 	done
 .endif
-	ln -s kernel ${ISOROOT}/boot/kernel.BOOTP
+	ln -fs kernel ${ISOROOT}/boot/kernel.BOOTP
 	mtree -deU -f ${.CURDIR}/../etc/mtree/BSD.local.dist -p ${ISOROOT}/usr/local/
 	mtree -deU -f ${.CURDIR}/../etc/mtree/BSD.var.dist -p ${ISOROOT}/var
 	dev_mkdb -f ${ISOROOT}/var/run/dev.db ${ISOROOT}/dev
@@ -314,7 +314,7 @@ customizeiso:
 	# /usr/pkg infrastructure.  Otherwise we attempt to pick up where
 	# we left off.
 	#
-	cp -p /etc/resolv.conf ${ISOROOT}/etc
+	cp /etc/resolv.conf ${ISOROOT}/etc
 	${CHROOT_CMD} "ldconfig -elf /usr/lib /usr/lib/gcc* /usr/lib/compat"
 	- at umount ${ISOROOT}/usr/pkgsrc/distfiles
 	- at umount ${ISOROOT}/usr/pkgsrc
-- 
1.6.4



-- 
You have received this notification because you have either subscribed to it, or are involved in it.
To change your notification preferences, please click here: http://bugs.dragonflybsd.org/my/account