From 6d19f4bf1710d4af0c81b3de80f0f64582b72a0a Mon Sep 17 00:00:00 2001 From: downsj Date: Wed, 16 Apr 1997 12:38:21 +0000 Subject: [PATCH] Add a proper version number ala other ports, and clean up various parts of the Makefiles. Lots more to do... --- sys/arch/hp300/stand/Makefile | 20 +++++++------------- sys/arch/hp300/stand/inst.c | 9 +++++---- sys/arch/hp300/stand/libkern/Makefile.inc | 10 +++++++++- sys/arch/hp300/stand/libsa/Makefile.inc | 10 +++++++++- sys/arch/hp300/stand/uboot.c | 9 +++++---- sys/arch/hp300/stand/version.c | 12 ++++++++++++ 6 files changed, 47 insertions(+), 23 deletions(-) create mode 100644 sys/arch/hp300/stand/version.c diff --git a/sys/arch/hp300/stand/Makefile b/sys/arch/hp300/stand/Makefile index 6cf23f3c4a6..04659c58037 100644 --- a/sys/arch/hp300/stand/Makefile +++ b/sys/arch/hp300/stand/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 1997/04/16 11:56:36 downsj Exp $ +# $OpenBSD: Makefile,v 1.9 1997/04/16 12:38:21 downsj Exp $ # $NetBSD: Makefile,v 1.22 1996/10/18 06:03:25 thorpej Exp $ # @(#)Makefile 8.1 (Berkeley) 6/10/93 @@ -17,12 +17,11 @@ DEFS= -DSTANDALONE -DCOMPAT_NOLABEL ${CONS} -Dhp300 # -DROMPRF #DEFS+= -DLE_DEBUG CFLAGS= -O3 ${INCPATH} ${DEFS} -SRCS= autoconf.c cons.c devopen.c machdep.c prf.c +SRCS= autoconf.c cons.c ct.c dca.c dcm.c devopen.c dnkbd.c fhpib.c \ + hd.c hil.c hpib.c if_le.c ite.c ite_dv.c ite_gb.c ite_rb.c \ + ite_subr.c ite_tc.c ite_hy.c kbd.c kbdconf.c kbdvar.h machdep.c \ + nhpib.c prf.c scsi.c sd.c version.c OBJS= ${SRCS:N*.h:R:S/$/.o/g} -DSRCS= ct.c dca.c dcm.c dnkbd.c fhpib.c hd.c hil.c hpib.c if_le.c \ - ite.c ite_dv.c ite_gb.c ite_rb.c ite_subr.c ite_tc.c ite_hy.c \ - kbd.c kbdconf.c kbdvar.h nhpib.c scsi.c sd.c -DOBJS= ${DSRCS:N*.h:R:S/$/.o/g} S= ${.CURDIR}/../../.. @@ -42,7 +41,7 @@ LIBZ= ${ZLIB} .include "${.CURDIR}/libsa/Makefile.inc" LIBSA= ${SA_LIB} -LIBS= ${OBJS} libdrive.a ${LIBSA} ${LIBZ} ${LIBKERN} +LIBS= ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} BOOTS= uboot.lif inst.lif BOOTAOUTS=uboot inst @@ -52,11 +51,6 @@ all: ${ALL} ${BOOTS}: ${LIBS} -libdrive.a: ${DOBJS} - rm -f $@ - ${AR} cq $@ ${DOBJS} - ${RANLIB} $@ - # depend on DEFS devopen.o machdep.o srt0.o: Makefile @@ -101,7 +95,7 @@ installboot: ${.CURDIR}/installboot.sh clean:: rm -f *.o *.i rm -f a.out ${BOOTS} ${BOOTAOUTS} - rm -f libdrive.a mkboot installboot + rm -f mkboot installboot install: ${INSTALL} -d -m 755 -o ${BINOWN} -g ${BINGRP} \ diff --git a/sys/arch/hp300/stand/inst.c b/sys/arch/hp300/stand/inst.c index 1c368924b51..fa9b8e3bef1 100644 --- a/sys/arch/hp300/stand/inst.c +++ b/sys/arch/hp300/stand/inst.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inst.c,v 1.4 1997/03/21 07:16:20 downsj Exp $ */ +/* $OpenBSD: inst.c,v 1.5 1997/04/16 12:38:22 downsj Exp $ */ /* $NetBSD: inst.c,v 1.6 1996/12/21 21:23:43 thorpej Exp $ */ /* @@ -72,6 +72,8 @@ extern char *lowram; extern int noconsole; extern int netio_ask; +extern const char version[]; + char *kernel_name = "/bsd"; void dsklabel __P((void)); @@ -108,9 +110,8 @@ main() */ netio_ask = 1; - printf("\n>> OpenBSD [%dKB] MINIROOT INSTALLATION HP9000/%s CPU\n", - (__LDPGSZ / 1024), getmachineid()); - printf(">> $OpenBSD: inst.c,v 1.4 1997/03/21 07:16:20 downsj Exp $\n"); + printf("\n>> OpenBSD [%dKB] MINIROOT INSTALLATION %s HP9000/%s CPU\n", + (__LDPGSZ / 1024), version, getmachineid()); gethelp(); for (;;) { diff --git a/sys/arch/hp300/stand/libkern/Makefile.inc b/sys/arch/hp300/stand/libkern/Makefile.inc index 4dc628fd6a1..dc36d1b2148 100644 --- a/sys/arch/hp300/stand/libkern/Makefile.inc +++ b/sys/arch/hp300/stand/libkern/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.1 1997/01/17 08:33:05 downsj Exp $ +# $OpenBSD: Makefile.inc,v 1.2 1997/04/16 12:38:25 downsj Exp $ # NOTE: $S must correspond to the top of the 'sys' tree @@ -20,4 +20,12 @@ clean:: .NOTMAIN __always_make_kern_lib @echo cleaning the kernel library objects @(cd $(KERN_DIR) ; make clean) +cleandir: .NOTMAIN __always_make_kern_lib + @echo cleandiring the kernel library objects + @(cd $(KERN_DIR) ; make cleandir) + +depend:: .NOTMAIN __always_make_kern_lib + @echo depending the kernel library objects + @(cd $(KERN_DIR) ; make depend) + __always_make_kern_lib: .NOTMAIN diff --git a/sys/arch/hp300/stand/libsa/Makefile.inc b/sys/arch/hp300/stand/libsa/Makefile.inc index 5100e4ad20c..e66c30783d1 100644 --- a/sys/arch/hp300/stand/libsa/Makefile.inc +++ b/sys/arch/hp300/stand/libsa/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.2 1997/01/17 08:33:07 downsj Exp $ +# $OpenBSD: Makefile.inc,v 1.3 1997/04/16 12:38:26 downsj Exp $ # $NetBSD: Makefile.inc,v 1.1 1995/08/04 07:55:50 thorpej Exp $ # NOTE: $S must correspond to the top of the 'sys' tree @@ -21,4 +21,12 @@ clean:: .NOTMAIN __always_make_sa_lib @echo cleaning the stand-alone library objects @(cd $(SA_DIR) ; make clean) +cleandir: .NOTMAIN __always_make_sa_lib + @echo cleandiring the stand-alone library objects + @(cd $(SA_DIR) ; make cleandir) + +depend:: .NOTMAIN __always_make_sa_lib + @echo depending the stand-alone library objects + @(cd $(SA_DIR) ; make depend) + __always_make_sa_lib: .NOTMAIN diff --git a/sys/arch/hp300/stand/uboot.c b/sys/arch/hp300/stand/uboot.c index 34b5b2baf04..def37448c71 100644 --- a/sys/arch/hp300/stand/uboot.c +++ b/sys/arch/hp300/stand/uboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uboot.c,v 1.6 1997/03/21 07:16:22 downsj Exp $ */ +/* $OpenBSD: uboot.c,v 1.7 1997/04/16 12:38:23 downsj Exp $ */ /* $NetBSD: uboot.c,v 1.2 1996/10/14 07:33:45 thorpej Exp $ */ /*- @@ -55,6 +55,8 @@ extern u_int opendev; extern char *lowram; extern int noconsole; +extern const char version[]; + /* * XXX UFS accepts a /, NFS doesn't. */ @@ -70,9 +72,8 @@ main() { int currname = 0; - printf("\n>> OpenBSD [%dKB] UNIFIED BOOT HP9000/%s CPU\n", - (__LDPGSZ / 1024), getmachineid()); - printf(">> $OpenBSD: uboot.c,v 1.6 1997/03/21 07:16:22 downsj Exp $\n"); + printf("\n>> OpenBSD [%dKB] UNIFIED BOOT %s HP9000/%s CPU\n", + (__LDPGSZ / 1024), version, getmachineid()); printf(">> Enter \"reset\" to reset system.\n"); bdev = B_TYPE(bootdev); diff --git a/sys/arch/hp300/stand/version.c b/sys/arch/hp300/stand/version.c new file mode 100644 index 00000000000..afb4723d69b --- /dev/null +++ b/sys/arch/hp300/stand/version.c @@ -0,0 +1,12 @@ +/* $OpenBSD: version.c,v 1.1 1997/04/16 12:38:23 downsj Exp $ */ + +/* + * Record major changes in the boot code here, and increment the version + * number. + */ + +/* + * 2.0 INITIAL REVISION + */ + +const char version[] = "2.0"; -- 2.20.1