summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-02-22 00:24:45 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-02-22 00:24:45 +0000
commitacf300f5047795ee72e3a4d8b64b99dbb759d27c (patch)
treee41125981b9894b7098b4e1ac505a49cd1442193 /distrib
parent304b5f7890af30d628011acaf0341c2d050fccc5 (diff)
boot floppy support. unfortunately for now because of how the sets and
lists and disktab work, we are constrained, and a few things must go missing until we seperate that out.
Diffstat (limited to 'distrib')
-rw-r--r--distrib/amd64/Makefile8
-rw-r--r--distrib/amd64/cdfs/Makefile32
-rw-r--r--distrib/amd64/common/Makefile.inc4
-rw-r--r--distrib/amd64/common/list8
-rw-r--r--distrib/amd64/ramdiskA/Makefile7
5 files changed, 48 insertions, 11 deletions
diff --git a/distrib/amd64/Makefile b/distrib/amd64/Makefile
index 1f7df270f75..5978683ad74 100644
--- a/distrib/amd64/Makefile
+++ b/distrib/amd64/Makefile
@@ -1,11 +1,9 @@
-# $OpenBSD: Makefile,v 1.1 2004/02/07 21:16:47 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 2004/02/22 00:24:41 deraadt Exp $
-SUBDIR= ramdisk_cd # ramdiskA ramdiskB ramdiskC cdfs
+SUBDIR= ramdisk_cd ramdiskA cdfs
unconfig:
cd ramdisk_cd; ${MAKE} unconfig
- #cd ramdiskA; ${MAKE} unconfig
- #cd ramdiskB; ${MAKE} unconfig
- #cd ramdiskC; ${MAKE} unconfig
+ cd ramdiskA; ${MAKE} unconfig
.include <bsd.subdir.mk>
diff --git a/distrib/amd64/cdfs/Makefile b/distrib/amd64/cdfs/Makefile
new file mode 100644
index 00000000000..a4b46155ef0
--- /dev/null
+++ b/distrib/amd64/cdfs/Makefile
@@ -0,0 +1,32 @@
+# $OpenBSD: Makefile,v 1.1 2004/02/22 00:24:43 deraadt Exp $
+
+TOP= ${.CURDIR}/..
+
+.include "${TOP}/Makefile.inc"
+
+CDFS= cdrom${REV}.fs
+CDROM= cd${REV}.iso
+
+all: ${CDROM}
+
+${CDROM}:
+ -rm -rf ${.OBJDIR}/cd-dir
+ mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/amd64
+ cp ${.OBJDIR}/../ramdisk_cd/${CDFS} ${.OBJDIR}/cd-dir/${OSREV}/amd64
+ mkhybrid -a -R -T -L -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
+ -A "OpenBSD ${OSREV} amd64 bootonly CD" \
+ -P "Copyright (c) 2003 Theo de Raadt, The OpenBSD project" \
+ -p "Theo de Raadt <deraadt@openbsd.org>" \
+ -V "OpenBSD/amd64 ${OSREV} boot-only CD" \
+ -b ${OSREV}/amd64/${CDFS} -c ${OSREV}/amd64/boot.catalog \
+ ${.OBJDIR}/cd-dir
+
+install:
+ cp ${CDROM} ${DESTDIR}/snapshot
+
+clean cleandir:
+ /bin/rm -f ${CDROM}
+ rm -rf cd-dir
+
+.include <bsd.obj.mk>
+.include <bsd.subdir.mk>
diff --git a/distrib/amd64/common/Makefile.inc b/distrib/amd64/common/Makefile.inc
index 65f0c02b647..f4690819de3 100644
--- a/distrib/amd64/common/Makefile.inc
+++ b/distrib/amd64/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.1 2004/02/07 21:16:47 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.2 2004/02/22 00:24:43 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -48,7 +48,7 @@ ${FS}: bsd.gz
rm ${REALIMAGE}
DISKTYPE?= rdroot
-NBLKS?= 4096
+NBLKS?= 3510
# minfree, opt, b/i trks, sects, cpg
NEWFSARGS= -m 0 -o space -c 16 -i 4096
diff --git a/distrib/amd64/common/list b/distrib/amd64/common/list
index e9a479cc521..22bdb8633d4 100644
--- a/distrib/amd64/common/list
+++ b/distrib/amd64/common/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.3 2004/02/08 18:17:12 deraadt Exp $
+# $OpenBSD: list,v 1.4 2004/02/22 00:24:43 deraadt Exp $
SRCDIRS distrib/special
SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin
@@ -24,7 +24,7 @@ LINK instbin bin/sleep
LINK instbin bin/stty
LINK instbin sbin/chmod bin/chgrp sbin/chown
LINK instbin sbin/disklabel
-LINK instbin sbin/dhclient
+#LINK instbin sbin/dhclient
LINK instbin sbin/fdisk
LINK instbin sbin/dmesg
LINK instbin sbin/fsck_ffs sbin/fsck
@@ -74,7 +74,7 @@ SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
SYMLINK /tmp/hosts etc/hosts
# dhcp things
-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
+#SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
# and the installation tools
SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile
@@ -82,4 +82,4 @@ SCRIPT ${CURDIR}/../common/install.md install.md
SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade
SCRIPT ${CURDIR}/../../miniroot/install.sh install
SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub
-SPECIAL chmod 755 install upgrade sbin/dhclient-script
+#SPECIAL chmod 755 install upgrade sbin/dhclient-script
diff --git a/distrib/amd64/ramdiskA/Makefile b/distrib/amd64/ramdiskA/Makefile
new file mode 100644
index 00000000000..03e0a7e0498
--- /dev/null
+++ b/distrib/amd64/ramdiskA/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2004/02/22 00:24:44 deraadt Exp $
+
+.PATH: ${.CURDIR}/../ramdiskA
+RAMDISK=RAMDISK
+NOBSDRD=1
+
+.include "${.CURDIR}/../common/Makefile.inc"