Commit yaboot 1.3.1

Commit yaboot 1.3.1.
git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-2

diff --git a/ChangeLog b/ChangeLog
index f096b152f0e6a384e2974fd0a7c02feaafec3216..25a56d42aa39ca891255eb0711cc49b5d3e3fcea 100644 (file)
--- 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 <erbenson@alaska.net>      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 <erbenson@alaska.net>      patch-1
 
     Summary:

diff --git a/Makefile b/Makefile
index 94ce349fa135672a1b974800fea54fabf6abc9a0..7e547ec0d2443ed2b32b4c9e1c8da6a56556f1f6 100644 (file)
--- 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 7eb52a62198e378815b3b2fc61d1b40fb7d55c86..7b393232c50dc2ab031cc10524f79a5975c51371 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,3 +1,14 @@
+2001-09-20  Ethan Benson  <erbenson@alaska.net>
+
+       * 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  <erbenson@alaska.net>
 
        * Version 1.3

diff --git a/doc/README.rs6000 b/doc/README.rs6000
index 67dd90475883a4c28cdffff2b13c2ed099125fe5..75c810c0b78b9c189d3deb49c047f3f85dfd3e2e 100644 (file)
--- 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 = <time in tenths of a second>
       default = <default label>
@@ -38,6 +37,11 @@ C. Configuration File (/etc/yaboot.conf):
 
       ## example /etc/yaboot.conf for RS/6000
       ## Timeout value is in tenths of a second
+      boot=/dev/sda1
+      fstype=raw
+      install=/usr/local/lib/yaboot/yaboot
+      nonvram
+      partition=3
       timeout=200
       default=linux
 
@@ -65,14 +69,12 @@ D. Tested Configurations:
 
    2. RS/6000 Model 260 (PPC 630; CHRP IBM,7043-260)
 
-      * Set "CONFIG_PPC64BRIDGE = y" in the Makefile!
-
    3. RS/6000 Model F50 (PPC 630; CHRP IBM,7025-F50)
 
 
 E. Other Documentation:
-   1. The ybin distribution includes addition README files and
-      man pages.
+   1. man pages under man/
+   2. other README files in doc/
 
 F. Questions & comments can be directed to:
    engebret@us.ibm.com or

diff --git a/ybin/ybin b/ybin/ybin
index 591e04e070d2724943a26922af173b17301b55a8..834e6ae6e518352a8b8226371f1b40adc9d798d1 100755 (executable)
--- a/ybin/ybin
+++ b/ybin/ybin
@@ -28,7 +28,7 @@ if [ -n "$PATH_PREFIX" ] ; then
 fi
 PRG="${0##*/}"
 SIGINT="$PRG: Interrupt caught ... exiting"
-VERSION=1.3
+VERSION=1.3.1
 DEBUG=0
 VERBOSE=0
 TMP="${TMPDIR:-/tmp}"