Date: Sun, 18 Mar 2001 10:11:51 -0800 From: Alfred Perlstein <bright@wintelcom.net> To: Jordan Hubbard <jkh@osd.bsdi.com> Cc: wes@softweyr.com, arch@FreeBSD.ORG, obrien@FreeBSD.ORG Subject: Re: [patch] Re: NO MORE '-BETA' Message-ID: <20010318101151.I29888@fw.wintelcom.net> In-Reply-To: <20010318095024.H29888@fw.wintelcom.net>; from bright@wintelcom.net on Sun, Mar 18, 2001 at 09:50:24AM -0800 References: <20010316071040.V29888@fw.wintelcom.net> <20010316104124Z.jkh@osd.bsdi.com> <3AB2E8DE.CEBC23D9@softweyr.com> <20010317190007Z.jkh@osd.bsdi.com> <20010318095024.H29888@fw.wintelcom.net>
next in thread | previous in thread | raw e-mail | index | archive | help
* Alfred Perlstein <bright@wintelcom.net> [010318 09:50] wrote:
> * Jordan Hubbard <jkh@osd.bsdi.com> [010317 19:01] wrote:
> > > And I though bikeshed arguments were stoopid.
> >
> > No, this is without question the stupidest thread on record and a
> > gross abuse of the "arch" mailing list. Special thanks must go to
> > Alfred Perlstein for raising this issue to the point of absurdity and
> > hijacking god-only-knows how many hours of developer time in debating
> > this whole thing. With friends like this, who needs competition from
> > Linux? ;)
>
> Bite me libdialog boy.
>
> This is somewhat tested, what do you think? Will it screw up the
> release target?
To test this, you want to just bump the version in sys/conf/newvers.sh
and it should trip the warning message.
>
> I can probably make a delta for -BETA (:P) as well.
>
> Index: Makefile.inc1
> ===================================================================
> RCS file: /home/ncvs/src/Makefile.inc1,v
> retrieving revision 1.193
> diff -u -r1.193 Makefile.inc1
> --- Makefile.inc1 2001/03/02 16:52:06 1.193
> +++ Makefile.inc1 2001/03/18 17:46:21
> @@ -301,7 +301,7 @@
> #
> # Installs everything compiled by a 'buildworld'.
> #
> -installworld:
> +installworld: verscheck
> mkdir -p ${INSTALLTMP}
> for prog in [ awk cat chflags chmod chown date echo egrep find grep \
> install ln make makewhatis mtree mv perl rm sed sh sysctl \
> @@ -440,7 +440,7 @@
> #
> # Install the kernel defined by INSTALLKERNEL
> #
> -installkernel:
> +installkernel: verscheck
> cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
> ${CROSSENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} install
> reinstallkernel:
> @@ -801,5 +801,24 @@
> .endfor
> par-${__target}: ${SUBDIR:S/$/.${__target}__D/}
> .endfor
> +
> +verscheck:
> +.if !defined(NOVERSCHECK)
> + @uname=`uname -r` ;\
> + sysname=`uname -s` ;\
> + newvers=`sh ${.CURDIR}/sys/conf/newvers.sh -r` ;\
> + if [ $$uname = $$newvers ] ; then \
> + exit 0; \
> + fi; \
> + echo "--------------------------------------------------------------"; \
> + echo ">>> WARNING"; \
> + echo ">>> You are currently using $$sysname $$uname."; \
> + echo ">>> If you install you will be upgrading" \
> + "to $$sysname $$newvers."; \
> + echo ">>> If you're sure you want to upgrade add 'NOVERSCHECK=YES'"; \
> + echo ">>> to your make command or /etc/make.conf"; \
> + echo "--------------------------------------------------------------"; \
> + exit 1;
> +.endif
>
> .include <bsd.subdir.mk>
> Index: release/Makefile
> ===================================================================
> RCS file: /home/ncvs/src/release/Makefile,v
> retrieving revision 1.596
> diff -u -r1.596 Makefile
> --- release/Makefile 2001/03/07 07:39:32 1.596
> +++ release/Makefile 2001/03/18 17:40:41
> @@ -40,6 +40,7 @@
> .endif
>
> KERNCONF=GENERIC
> +NOVERSCHECK=YES
>
> # If you want to pass flags to the world build such as -j X, use
> # WORLD_FLAGS. Similarly, you can specify make flags for kernel
> Index: sys/conf//newvers.sh
> ===================================================================
> RCS file: /home/ncvs/src/sys/conf/newvers.sh,v
> retrieving revision 1.47
> diff -u -r1.47 newvers.sh
> --- sys/conf//newvers.sh 2001/03/02 16:52:13 1.47
> +++ sys/conf//newvers.sh 2001/03/18 17:47:24
> @@ -40,6 +40,11 @@
> RELEASE="${REVISION}-${BRANCH}"
> VERSION="${TYPE} ${RELEASE}"
>
> +if [ "$1" = "-r" ]; then
> + echo $RELEASE
> + exit 0
> +fi
> +
> if [ "X${PARAMFILE}" != "X" ]; then
> RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \
> ${PARAMFILE})
>
>
>
> --
> -Alfred Perlstein - [bright@wintelcom.net|alfred@freebsd.org]
>
>
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe freebsd-arch" in the body of the message
--
-Alfred Perlstein - [bright@wintelcom.net|alfred@freebsd.org]
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-arch" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010318101151.I29888>