summaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
Diffstat (limited to 'release')
-rw-r--r--release/ChangeLog11
-rw-r--r--release/INSTALL-GRUB-MBR41
-rw-r--r--release/INSTALL-binary22
-rw-r--r--release/Makefile5
-rw-r--r--release/SETUP44
-rw-r--r--release/SOURCES.0.211
-rw-r--r--release/checklist20
-rw-r--r--release/menu.lst11
8 files changed, 75 insertions, 90 deletions
diff --git a/release/ChangeLog b/release/ChangeLog
index 64ef79da..5cdb9595 100644
--- a/release/ChangeLog
+++ b/release/ChangeLog
@@ -1,3 +1,14 @@
+Fri Apr 11 14:21:29 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
+
+ * SETUP: Comment out frobbing of BOOT_DEV; grub does that on it's
+ own now.
+ * INSTALL-GRUB-MBR: Delete file.
+ * Makefile (dist-files): Omit INSTALL-GRUB-MBR.
+ (install-dist): Likewise.
+ * menu.lst (title): Replace install entries with new versions.
+ * INSTALL-binary (STEP IV): Revised instructions to correspond to
+ new reality, with Grub 0.4.
+
Tue Sep 24 16:47:04 1996 Miles Bader <miles@gnu.ai.mit.edu>
* servers.boot (/hurd/ufs.static): Change --machdev to -Tdevice.
diff --git a/release/INSTALL-GRUB-MBR b/release/INSTALL-GRUB-MBR
deleted file mode 100644
index fa4e2c6e..00000000
--- a/release/INSTALL-GRUB-MBR
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-# Install grub stage1 as the MBR, copying the dos partition table from the
-# existing MBR.
-
-DEV="$1"
-STAGE1=/boot/grub/stage1
-
-if [ ! "$DEV" -o ! -w "$DEV" ]; then
- echo 2>&1 "Usage: $0 DEVICE"
- exit 1
-fi
-
-case "$DEV" in
- *d[0-9])
- ;;
- *)
- echo "The device $DEV doesn't seem to be a whole-disk raw device; continue? [n] "
- read C
- case "$C" in
- [Yy]*)
- ;;
- *)
- echo 2>&1 "$0: Aborting";
- exit 2
- ;;
- esac
- ;;
-esac
-
-cd /tmp
-
-dd if="$DEV" of=,mbr bs=512 count=1 \
-&& /bin/cp $STAGE1 ,stage1 \
-&& dd if=,mbr of=,stage1 conv=notrunc bs=1 seek=446 skip=446 count=64 \
-&& dd if=,stage1 of="$DEV" bs=512 count=1 \
-|| { echo 2>&1 "$0: Install failed!" ; exit 5 ; }
-
-rm ,mbr ,stage1
-
-echo "$0: $STAGE1 installed in MBR"
-echo "$0: Don't forget to use the grub \`install=' command to install stage2"
diff --git a/release/INSTALL-binary b/release/INSTALL-binary
index 25a3f932..745ff4a5 100644
--- a/release/INSTALL-binary
+++ b/release/INSTALL-binary
@@ -126,17 +126,12 @@ and you may notice that pipes don't work.
In order to set up the translators for this to be a fully functional
Hurd system, say
- /bin/sh /SETUP disk
-
-where `disk' is the name of the disk to install the boot block on,
-without partition name, for example `sd0' or `hd0'. (If you give no
-arg, it will ask you for the device to install the boot block on in
-case you forgot. If you really don't want a boot block, just hit RET
-when it asks.)
+ /bin/sh /SETUP
This will set up some initial translators so that the system runs
-normally, and then offer to reboot the system. When it comes back up,
-boot it single-user again, so that you can do step V.
+normally, and then offer to reboot the system. When you get to the
+GRUB menu, do step V.
+
NOTE: Do NOT RUN BSD FSCK on a Hurd FFS!
@@ -157,10 +152,11 @@ NOTE: Do NOT RUN BSD FSCK on a Hurd FFS!
STEP V:
-Now boot from the floppy again. This time, select the "grub install"
-option. (If your disk isn't known as hd0 to grub, then you will need
-to edit the commands accordingly.) Reset your PC and take the floppy
-disk out of the drive. The hard disk should now boot successfully.
+Now boot from the floppy again. This time, select the option to
+install grub from the floppy. (If your disk isn't known as hd0 to
+grub, then you will need to edit the commands accordingly.) Reset
+your PC and take the floppy disk out of the drive. The hard disk
+should now boot successfully.
Select the single-user boot menu option, and proceed to STEP VI.
diff --git a/release/Makefile b/release/Makefile
index 038c8974..a4c2a583 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,5 +1,5 @@
# Makefile for Hurd release tools
-# Copyright (C) 1996 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
# Written by Michael I. Bushnell, p/BSG.
#
# This file is part of the GNU Hurd.
@@ -22,7 +22,7 @@ dir := release
makemode := misc
# Files that go into the root of binary distributions
-dist-files = INSTALL-binary dist-README SETUP INSTALL-GRUB-MBR servers.boot \
+dist-files = INSTALL-binary dist-README SETUP servers.boot \
menu.lst COPYING.LIB SOURCES.0.0
# Tools for making images
@@ -38,7 +38,6 @@ install-dist: dist-links
cp $(srcdir)/dist-README $(dist-root)/README
cp $(srcdir)/SETUP $(dist-root)/SETUP
cp $(srcdir)/SOURCES.0.0 $(dist-root)/SOURCES
- cp $(srcdir)/INSTALL-GRUB-MBR $(dist-root)/INSTALL-GRUB-MBR
cp $(srcdir)/servers.boot $(dist-root)/boot/servers.boot
cp $(srcdir)/menu.lst $(dist-root)/boot/grub/menu.lst
cp $(top_srcdir)/COPYING $(dist-root)/share/misc/COPYING
diff --git a/release/SETUP b/release/SETUP
index 92f3c241..4f410792 100644
--- a/release/SETUP
+++ b/release/SETUP
@@ -3,20 +3,20 @@
PATH=/bin:/sbin
-BOOT_DEV="$1"
-if [ ! "$BOOT_DEV" ]; then
- echo "No device to install a boot loader was specified."
- echo "Here are some possible devices to use:"
- /bin/devprobe sd0 hd0 sd1 hd1
- echo -n "Boot device? [none] "
- read BOOT_DEV
-fi
-
-if [ "$BOOT_DEV" ]; then
- if /bin/devprobe -s "$BOOT_DEV"; then true; else
- echo 2>&1 "$0: $BOOT_DEV: No such device known"; exit 1
- fi
-fi
+# BOOT_DEV="$1"
+# if [ ! "$BOOT_DEV" ]; then
+# echo "No device to install a boot loader was specified."
+# echo "Here are some possible devices to use:"
+# /bin/devprobe sd0 hd0 sd1 hd1
+# echo -n "Boot device? [none] "
+# read BOOT_DEV
+# fi
+#
+# if [ "$BOOT_DEV" ]; then
+# if /bin/devprobe -s "$BOOT_DEV"; then true; else
+# echo 2>&1 "$0: $BOOT_DEV: No such device known"; exit 1
+# fi
+# fi
set -v
@@ -33,14 +33,14 @@ cd /dev
set +v
-if test "$BOOT_DEV" && /bin/sh ./MAKEDEV "$BOOT_DEV"; then
- echo -n "Install grub as main boot record on $BOOT_DEV? [y] "
- read yn
- case "$yn" in
- "" | "[yY]*")
- /bin/sh /INSTALL-GRUB-MBR /dev/$BOOT_DEV;;
- esac
-fi
+# if test "$BOOT_DEV" && /bin/sh ./MAKEDEV "$BOOT_DEV"; then
+# echo -n "Install grub as main boot record on $BOOT_DEV? [y] "
+# read yn
+# case "$yn" in
+# "" | "[yY]*")
+# /bin/sh /INSTALL-GRUB-MBR /dev/$BOOT_DEV;;
+# esac
+# fi
echo 'Hit ^C now for shell prompt or RET to reboot'
read response
diff --git a/release/SOURCES.0.2 b/release/SOURCES.0.2
index 011096e5..dd17cd07 100644
--- a/release/SOURCES.0.2
+++ b/release/SOURCES.0.2
@@ -38,7 +38,7 @@ cfengine (1.3.19)
* gawk (3.0.0) (don't use 3.0.2)
* gcal (2.10)
* gcc (2.7.2.2) (includes patches from g77 0.5.19.1)
-C gdb (gdb-gnu-5)
+C gdb (gdb-gnu-5 special!)
* gettext (0.10)
glibc (2.0.2)
glibc-crypt (??)
@@ -61,17 +61,18 @@ hurd (0.2)
* ncurses (1.9.9g)
nethack (??) (modified?)
* nvi (1.71)
-patch (2.1) [ Comment out basename in backupfile.c. ]
+* patch (2.1) [ Comment out basename in backupfile.c. ]
* perl (5.003)
* ptx (0.4)
* readline (2.0)
* rcs (5.7)
* recode (3.4.1)
-C sed (2.05) [ compilation error ]
-- sendmail (8.8.5) (modified)
+* sed (2.05) [ Change sed.c to include <errno.h> and also use
+ strerror instead sys_errlist in read_file(). ]
+* sendmail (8.8.5) [ with special! patch ]
* sh-utils (1.16) [ use latest getloadavg.c ]
* sharutils (4.2)
-tar (1.11.8)
+* tar (1.11o) [special!]
* termutils (2.0)
* texinfo (3.9)
[ Omit OCRNL from the expression in which it occurs in
diff --git a/release/checklist b/release/checklist
index 838151fc..05176933 100644
--- a/release/checklist
+++ b/release/checklist
@@ -1,10 +1,26 @@
-Checklist for Hurd releases.
+Order for building binary distribution:
+
+1) Make tools on build machine
+* Build/install libc and header files from mach and hurd.
+* Build/install gcc (just LANGUAGES=c)
+* Build/install binutils.
+
+2) Make everything for release; install both on build machine and dist dir.
+* Build/install binutils again (now using new as and ld).
+* Build/install gcc again. (only one stage necessary).
+* Build/install libc again.
+* Build/install everything else.
+
+
+Checklist for binary image filesystems
* Symlinks in /bin; esp. sh, awk, more, cc.
+* Symlink /lib/libtermcap.a -> /lib/libncurses.a
* Check all symlinks to make sure they don't reference /gd4/hurdinst.
* Build some static fileutils: ls, ln, cp, mv, chmod.
+* Make sure /include/obstack.h is from libc and not binutils.
* Make sure there is no /include/i386.
-* Make sure /i486-gnu contains hard links, not copies.
+* Make sure there is no /i486-gnu.
* Make sure we are using Hurd versions of su and uptime, not sh-utils.
* Make sure we are using Hurd fsck, not e2fs.
* Make install-dist from release dir.
diff --git a/release/menu.lst b/release/menu.lst
index 7686778a..a0214c84 100644
--- a/release/menu.lst
+++ b/release/menu.lst
@@ -39,9 +39,12 @@ kernel= /boot/kernel root=hd0a -s
module= /boot/serverboot
-# Installation step for GRUB hard disk boot blocks
+# Installation steps for GRUB hard disk boot blocks
# Entry 4:
-title= grub install
-root= hd(0)
-install=hd(0,a)/boot/grub/stage2
+title= Install grub from floppy onto hard disk
+install= (fd0)+1 (hd0) (hd0,a)/boot/grub/stage2 0b8000 p
+
+# Entry 5:
+title= Reinstall grub from hard disk to itself
+install= (hd0)/boot/grub/stage1 (hd0) (hd0,a)/boot/grub/stage2 0x8000 p