Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 29 Mar 2000 20:03:37 -0500
From:      Kent Hauser <kent@lab1.tfd.com>
To:        freebsd-current@freebsd.org, problem@lab1.tfd.com
Subject:   make rerelease
Message-ID:  <200003300103.AA07427@lab1.tfd.com>

next in thread | raw e-mail | index | archive | help
Hi,

Today I did a "make rerelease" in "/usr/src/release" and the kernels
were rebuilt, but the binaries weren't. I think the following patch
to "release/Makefile" fixes the problem.

Basically, this patch does a "make world" for target "release" &
for target "rerelease" if "/tmp/.world_done" doesn't exist. Otherwise
for target "rerelease" it does "make all install". I believe this is what's
wanted.

As I'm a flunkie (not a commiter), I submit this for review by
someone who knows what they're doing.

Kent





--- Makefile-dist	Wed Mar 29 19:54:56 2000
+++ Makefile	Wed Mar 29 19:56:16 2000
@@ -242,17 +242,19 @@
 	# Don't remove this, or the build will fall over!
 	echo "export RELEASEDIR=${_R}"		>> ${CHROOTDIR}/mk
 	echo "export PATH=${BOOTSTRAPDIR}:$${PATH}:${LOCALDIR}" >> ${CHROOTDIR}/mk
-	echo "if [ ! -f /tmp/.world_done ]; then" >> ${CHROOTDIR}/mk
 	echo "	cd /usr/src"			>> ${CHROOTDIR}/mk
-.if make(release)
+.if make(rerelease)
+	echo "if [ ! -f /tmp/.world_done ]; then" >> ${CHROOTDIR}/mk
+.endif
 	echo "	(cd etc; make distrib-dirs distribution)" >> ${CHROOTDIR}/mk
 	echo "	make world"			>> ${CHROOTDIR}/mk
-.endif
+	echo "	touch /tmp/.world_done"		>> ${CHROOTDIR}/mk
 .if make(rerelease)
+	echo " else
 	echo "	make all install"		>> ${CHROOTDIR}/mk
-.endif
-	echo "	touch /tmp/.world_done"		>> ${CHROOTDIR}/mk
 	echo "fi"				>> ${CHROOTDIR}/mk
+.endif
 	echo "cd /usr/src/release/sysinstall"	>> ${CHROOTDIR}/mk
 	echo "make obj"				>> ${CHROOTDIR}/mk
 	echo "cd /usr/src/release"		>> ${CHROOTDIR}/mk


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200003300103.AA07427>