From bad5757ade771cb803eea778f61da9a4ff74b87e Mon Sep 17 00:00:00 2001 From: Ethan Benson Date: Mon, 25 Mar 2002 14:05:52 +0000 Subject: [PATCH] Commit yaboot 1.3.1 Commit yaboot 1.3.1. git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-2 --- ChangeLog | 13 +++++++++++++ Makefile | 16 ++++++++++------ changelog | 11 +++++++++++ doc/README.rs6000 | 22 ++++++++++++---------- ybin/ybin | 2 +- 5 files changed, 47 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index f096b15..25a56d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,19 @@ # tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3 # +2002-03-25 14:05:52 GMT Ethan Benson patch-2 + + Summary: + Commit yaboot 1.3.1 + Revision: + yaboot--devel--1.3--patch-2 + + Commit yaboot 1.3.1. + + modified files: + ChangeLog Makefile changelog doc/README.rs6000 ybin/ybin + + 2002-03-25 07:43:37 GMT Ethan Benson patch-1 Summary: diff --git a/Makefile b/Makefile index 94ce349..7e547ec 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ## Configuration section -VERSION = 1.3 +VERSION = 1.3.1 # Debug mode (verbose) DEBUG = 0 ROOT = @@ -124,6 +124,8 @@ bindist: all mkdir -p -m 755 ../yaboot-binary-${VERSION}/usr/local/share/doc/yaboot cp -a COPYING ../yaboot-binary-${VERSION}/usr/local/share/doc/yaboot/COPYING cp -a README ../yaboot-binary-${VERSION}/usr/local/share/doc/yaboot/README + mv ../yaboot-binary-${VERSION}/etc/yaboot.conf ../yaboot-binary-${VERSION}/usr/local/share/doc/ + rmdir ../yaboot-binary-${VERSION}/etc ${GETROOT} tar -C ../yaboot-binary-${VERSION} -zcvpf ../yaboot-binary-${VERSION}.tar.gz . rm -rf ../yaboot-binary-${VERSION} @@ -137,11 +139,13 @@ clean: chmod -R u+rwX,go=rX . chmod a-w COPYING -install: all - @strip second/yaboot - @strip --remove-section=.comment second/yaboot - @strip util/addnote - @strip --remove-section=.comment --remove-section=.note util/addnote +strip: all + strip second/yaboot + strip --remove-section=.comment second/yaboot + strip util/addnote + strip --remove-section=.comment --remove-section=.note util/addnote + +install: all strip install -d -o root -g root -m 0755 ${ROOT}/etc/ install -d -o root -g root -m 0755 ${ROOT}/${PREFIX}/sbin/ install -d -o root -g root -m 0755 ${ROOT}/${PREFIX}/lib diff --git a/changelog b/changelog index 7eb52a6..7b39323 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,14 @@ +2001-09-20 Ethan Benson + + * Version 1.3.1 + + * Don't include /etc/yaboot.conf in binary dist, instead put the + example in /usr/local/share/doc. This way extracting the tarball + from / won't blow away existing configs. + + * Move strip commands from install target to strip target, install + now depends on strip. + 2001-09-20 Ethan Benson * Version 1.3 diff --git a/doc/README.rs6000 b/doc/README.rs6000 index 67dd904..75c810c 100644 --- a/doc/README.rs6000 +++ b/doc/README.rs6000 @@ -11,7 +11,7 @@ A. System Partitioning: This partition must be less than 10MB. Recommended partition configuration: - /dev/sda1 : PREP Boot. Type 0x41. Size = 4 MB + /dev/sda1 : PREP Boot. Type 0x41. Size = 800K /dev/sda2 : Linux swap. Type 0x82. Size = 128 MB /dev/sda3 : Linux native. Type 0x83. @@ -20,13 +20,12 @@ B. Building & Installation: your system partitions when installing Linux. 2. Build yaboot by doing: make clean; make - 3. Install yaboot by doing (as root): - dd if=yaboot of=/dev/sdax - where x is the boot partition; for example: dd if=yaboot of=/dev/sda1 - 4. Make a yaboot.conf file in /etc/yaboot.conf + 3. Make a yaboot.conf file in /etc/yaboot.conf + 4. Install yaboot by doing (as root): + mkofboot C. Configuration File (/etc/yaboot.conf): - 1. See the ybin documentation for the full range of options. + 1. See the yaboot.conf(5) man page for the full range of options. 2. Options tested on an RS/6000 include: timeout =