From owner-freebsd-current Wed Mar 29 17: 5:43 2000 Delivered-To: freebsd-current@freebsd.org Received: from rtp.tfd.com (rtp.tfd.com [198.79.53.206]) by hub.freebsd.org (Postfix) with ESMTP id DFAE437BA7E for ; Wed, 29 Mar 2000 17:05:38 -0800 (PST) (envelope-from kent@lab1.tfd.com) Received: from lab1.tfd.com (lab1.tfd.com [10.9.200.31]) by rtp.tfd.com (8.9.3/8.9.3) with SMTP id UAA02426 for ; Wed, 29 Mar 2000 20:06:08 -0500 (EST) Received: by lab1.tfd.com id AA07427 (5.67b/IDA-1.5 for freebsd-current@freebsd.org); Wed, 29 Mar 2000 20:03:37 -0500 Date: Wed, 29 Mar 2000 20:03:37 -0500 From: Kent Hauser Message-Id: <200003300103.AA07427@lab1.tfd.com> To: freebsd-current@freebsd.org, problem@lab1.tfd.com Subject: make rerelease Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG 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