From: downsj <downsj@openbsd.org>
Date: Thu, 6 Feb 1997 02:53:49 +0000 (+0000)
Subject: Enable support for gzip'd kernels.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ba66cf1a10e315c90448663bbf951cc9c4537a91;p=openbsd

Enable support for gzip'd kernels.
---

diff --git a/sys/arch/hp300/stand/Makefile b/sys/arch/hp300/stand/Makefile
index 08e974c9ed9..bd32f6be329 100644
--- a/sys/arch/hp300/stand/Makefile
+++ b/sys/arch/hp300/stand/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 1997/02/03 07:19:01 downsj Exp $
+#	$OpenBSD: Makefile,v 1.6 1997/02/06 02:53:49 downsj Exp $
 #	$NetBSD: Makefile,v 1.22 1996/10/18 06:03:25 thorpej Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/10/93
 
@@ -33,10 +33,15 @@ INCPATH=-I${.CURDIR} -I${.CURDIR}/../.. -I${S} -I${S}/lib/libsa
 .include "${.CURDIR}/libkern/Makefile.inc"
 LIBKERN=	${KERN_LIB}
 
+### find out what to use for libz
+Z_AS=	library
+.include "${S}/lib/libz/Makefile.inc"
+LIBZ=	${ZLIB}
+
 .include "${.CURDIR}/libsa/Makefile.inc"
 LIBSA=	${SA_LIB}
 
-LIBS=	${OBJS} libdrive.a ${LIBSA} ${LIBKERN}
+LIBS=	${OBJS} libdrive.a ${LIBSA} ${LIBZ} ${LIBKERN}
 
 BOOTS=	uboot.lif inst.lif
 BOOTAOUTS=uboot inst
diff --git a/sys/arch/hp300/stand/libsa/Makefile b/sys/arch/hp300/stand/libsa/Makefile
index 94be65a1a9f..a114fd755f0 100644
--- a/sys/arch/hp300/stand/libsa/Makefile
+++ b/sys/arch/hp300/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 1997/02/05 11:16:41 downsj Exp $
+#	$OpenBSD: Makefile,v 1.6 1997/02/06 02:53:51 downsj Exp $
 #	$NetBSD: Makefile,v 1.5 1996/06/26 17:44:42 thorpej Exp $
 
 LIB=	sa
@@ -10,8 +10,8 @@ LIB=	sa
 # DEBUGFLAGS=-DNETIF_DEBUG -DRPC_DEBUG -DNFS_DEBUG -DRARP_DEBUG -DNET_DEBUG
 # DEBUGFLAGS+=-DEXEC_DEBUG
 
-CFLAGS+=-Dhp300 -DSTANDALONE -DCOMPAT_UFS -DNO_LSEEK ${DEBUGFLAGS}
-CFLAGS+=-I${.CURDIR}/..
+CFLAGS+=-Dhp300 -DSTANDALONE -DCOMPAT_UFS -DNO_LSEEK -D__INTERNAL_LIBSA_CREAD
+CFLAGS+=${DEBUGFLAGS} -I${.CURDIR}/..
 CFLAGS+=-I${.CURDIR}/../../../..  -I${.CURDIR}/../../../../lib/libsa
 
 # stand routines
@@ -20,7 +20,7 @@ SRCS=	alloc.c exit.c exec.c getfile.c gets.c globals.c \
 
 # io routines
 SRCS+=	close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c ioctl.c lseek.c \
-	open.c read.c stat.c write.c
+	open.c read.c stat.c write.c cread.c
 
 # network routines
 SRCS+=	arp.c ether.c in_cksum.c net.c netif.c rpc.c
diff --git a/sys/arch/hp300/stand/uboot.c b/sys/arch/hp300/stand/uboot.c
index 3e3ce3614c7..5e08a75397e 100644
--- a/sys/arch/hp300/stand/uboot.c
+++ b/sys/arch/hp300/stand/uboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uboot.c,v 1.4 1997/02/06 01:06:19 downsj Exp $	*/
+/*	$OpenBSD: uboot.c,v 1.5 1997/02/06 02:53:50 downsj Exp $	*/
 /*	$NetBSD: uboot.c,v 1.2 1996/10/14 07:33:45 thorpej Exp $	*/
 
 /*-
@@ -60,7 +60,7 @@ extern	int noconsole;
  */
 char *name;
 char *names[] = {
-	"bsd", "obsd", "bsd.old",
+	"bsd", "bsd.gz", "obsd", "obsd.gz", "bsd.old", "bsd.old.gz"
 };
 #define NUMNAMES	(sizeof(names) / sizeof(char *))
 
@@ -72,7 +72,7 @@ main()
 
 	printf("\n>> OpenBSD [%dKB] UNIFIED BOOT HP9000/%s CPU\n",
 	       (__LDPGSZ / 1024), getmachineid());
-	printf(">> $OpenBSD: uboot.c,v 1.4 1997/02/06 01:06:19 downsj Exp $\n");
+	printf(">> $OpenBSD: uboot.c,v 1.5 1997/02/06 02:53:50 downsj Exp $\n");
 	printf(">> Enter \"reset\" to reset system.\n");
 
 	bdev   = B_TYPE(bootdev);