Date: Sun, 29 Jul 2001 02:33:35 +0100 From: ian j hart <ianjhart@freeloader.freeserve.co.uk> To: "stable@FreeBSD.ORG" <freebsd-stable@FreeBSD.ORG> Subject: Re: Updating RELENG_4_3 Message-ID: <3B6367EF.14BE3252@freeloader.freeserve.co.uk> References: <3B62A31F.7EF92100@freeloader.freeserve.co.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
I've obviously been out in the sun too long (mad dogs ...)
At the risk of making things worse:
ian j hart wrote:
>
> cd /usr/src;make update (CVS) pulls down RELENG_4 not RELENG_4_3.
> There should at least be a warning in UPDATING. Shouldn't
> this be a variable in make.conf?
>
> <thinks out loud>
> Hmm. The -r would mean BRANCH would have to be a numeric or
> symbolic tag. What if you could do:
> CVSUPDATEFLAGS= -D "yesterday"
Not a good choice of name. This has caused some confusion, sorry.
In any case the value is wrong!
Try CVS_UPDATE_FLAGS, with default values (/etc/defaults/make.conf)
STABLE:
CVS_UPDATE_FLAGS= -rRELENG_4
CURRENT:
CVS_UPDATE_FLAGS= -A
SECURITY FIX BRANCH RELATIVE TO 4.3-RELEASE:
CVS_UPDATE_FLAGS= -rRELENG_4_3
*** Makefile.inc1.orig Sun Jul 29 00:51:01 2001
--- Makefile.inc1 Sun Jul 29 01:21:26 2001
***************
*** 508,514 ****
@echo
"--------------------------------------------------------------"
@echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
@echo
"--------------------------------------------------------------"
! cd ${.CURDIR}; cvs -q update -rRELENG_4 -P -d
.endif
#
--- 508,514 ----
@echo
"--------------------------------------------------------------"
@echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
@echo
"--------------------------------------------------------------"
! cd ${.CURDIR}; cvs -q update ${CVS_UPDATE_FLAGS} -P -d
.endif
#
You might want to add a paranoia default.
Example override in /etc/make.conf
CVS_UPDATE_FLAGS= -rRELENG_4 -D "yesterday"
> That would fix updating during a commit. Or maybe not. Must find
> a cvs wizard and ask them if the commit time stamps are atomic.
> </thinks out loud>
>
> While I'm on the subject, different output for uname -a would
> be _really_ useful (4.3-SECURITY?). How else can you tell you
> have RELENG_4_3?
>
> Cheers
>
> --
> ian j hart
>
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe freebsd-stable" in the body of the message
If this is still nonsense, just ignore. I'll have a lie down and be back
to normal tommorrow.
--
ian j hart
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3B6367EF.14BE3252>