From c8468c1549669e3f06387ab6a162e5d6498c6de7 Mon Sep 17 00:00:00 2001 From: Ethan Benson Date: Sun, 17 Nov 2002 23:33:17 +0000 Subject: [PATCH] Add support for IDE controllers with identity crisis * ofpath: Add support for IDE controllers that pretend they are scsi. * Prepare 1.3.8-rc2. git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-40 --- 0arch-timestamps0 | 512 +++++++++++++++++++++++----------------------- ChangeLog | 15 ++ Makefile | 2 +- changelog | 4 +- ybin/ofpath | 25 ++- ybin/yabootconfig | 2 +- ybin/ybin | 2 +- 7 files changed, 292 insertions(+), 270 deletions(-) diff --git a/0arch-timestamps0 b/0arch-timestamps0 index baa6e7a..65ff2a7 100644 --- a/0arch-timestamps0 +++ b/0arch-timestamps0 @@ -1,256 +1,256 @@ -./include/xfs/.arch-ids/=id 1037502189 1017069090 -./include/xfs/.arch-ids/xfs.h.id 1037502189 1017069096 -./include/xfs/.arch-ids 1037502546 1017069096 -./include/xfs/xfs.h 1037502189 1002101334 -./include/xfs 1037502546 1007269244 -./include/.arch-ids/errors.h.id 1037502187 1017069108 -./include/.arch-ids/=id 1037502186 1017027153 -./include/.arch-ids/bootinfo.h.id 1037502187 1017027154 -./include/.arch-ids/byteorder.h.id 1037502187 1017027154 -./include/.arch-ids/cfg.h.id 1037502187 1017027154 -./include/.arch-ids/cmdline.h.id 1037502187 1017027154 -./include/.arch-ids/ctype.h.id 1037502187 1017027155 -./include/.arch-ids/fdisk-part.h.id 1037502187 1017027157 -./include/.arch-ids/file.h.id 1037502187 1017027157 -./include/.arch-ids/fs.h.id 1037502187 1017027157 -./include/.arch-ids/mac-part.h.id 1037502187 1017027159 -./include/.arch-ids/md5.h.id 1037502187 1017027159 -./include/.arch-ids/partition.h.id 1037502187 1017027159 -./include/.arch-ids/prom.h.id 1037502187 1017027159 -./include/.arch-ids/setjm2.h.id 1037502187 1017027160 -./include/.arch-ids/setjmp.h.id 1037502187 1017027160 -./include/.arch-ids/stdlib.h.id 1037502187 1017027161 -./include/.arch-ids/string.h.id 1037502187 1017027161 -./include/.arch-ids/swab.h.id 1037502187 1017027161 -./include/.arch-ids/types.h.id 1037502187 1017027162 -./include/.arch-ids/yaboot.h.id 1037502187 1017027162 -./include/.arch-ids/debug.h.id 1037502187 1017154770 -./include/.arch-ids 1037502546 1017154770 -./include/asm/.arch-ids/=id 1037502187 1017027153 -./include/asm/.arch-ids/elf.h.id 1037502187 1017027153 -./include/asm/.arch-ids/ppc_asm.tmpl.id 1037502187 1017027153 -./include/asm/.arch-ids/processor.h.id 1037502187 1017027154 -./include/asm/.arch-ids 1037502546 1017027154 -./include/asm/elf.h 1037502187 1000991730 -./include/asm/ppc_asm.tmpl 1037502187 1000991730 -./include/asm/processor.h 1037502187 1000991730 -./include/asm 1037502546 1007269243 -./include/et/.arch-ids/=id 1037502187 1017027155 -./include/et/.arch-ids/com_err.h.id 1037502187 1017027155 -./include/et/.arch-ids 1037502546 1017155400 -./include/et/com_err.h 1037502188 1000991731 -./include/et 1037502546 1007269243 -./include/ext2fs/.arch-ids/=id 1037502188 1017027156 -./include/ext2fs/.arch-ids/bitops.h.id 1037502188 1017027156 -./include/ext2fs/.arch-ids/ext2_err.h.id 1037502188 1017027156 -./include/ext2fs/.arch-ids/ext2_io.h.id 1037502188 1017027156 -./include/ext2fs/.arch-ids/ext2fs.h.id 1037502188 1017027156 -./include/ext2fs/.arch-ids 1037502546 1017027156 -./include/ext2fs/bitops.h 1037502188 1003927524 -./include/ext2fs/ext2_err.h 1037502188 1003927524 -./include/ext2fs/ext2_io.h 1037502188 1003927524 -./include/ext2fs/ext2fs.h 1037502188 1003927524 -./include/ext2fs 1037502546 1007269243 -./include/linux/.arch-ids/=id 1037502188 1017027157 -./include/linux/.arch-ids/elf.h.id 1037502188 1017027158 -./include/linux/.arch-ids/ext2_fs.h.id 1037502188 1017027158 -./include/linux/.arch-ids/iso_fs.h.id 1037502188 1017027158 -./include/linux/.arch-ids/stat.h.id 1037502188 1017027158 -./include/linux/.arch-ids/types.h.id 1037502188 1017027159 -./include/linux/.arch-ids 1037502546 1017027159 -./include/linux/elf.h 1037502188 1000991731 -./include/linux/ext2_fs.h 1037502188 1000991731 -./include/linux/iso_fs.h 1037502188 1000991731 -./include/linux/stat.h 1037502188 1000991731 -./include/linux/types.h 1037502188 1000991731 -./include/linux 1037502546 1007269243 -./include/reiserfs/.arch-ids/=id 1037502188 1017027160 -./include/reiserfs/.arch-ids/reiserfs.h.id 1037502188 1017027160 -./include/reiserfs/.arch-ids 1037502546 1017027160 -./include/reiserfs/reiserfs.h 1037502188 1025684115 -./include/reiserfs 1037502546 1025684115 -./include/errors.h 1037502187 1007200690 -./include/bootinfo.h 1037502187 1007200690 -./include/byteorder.h 1037502187 1000991730 -./include/cfg.h 1037502187 1007200690 -./include/cmdline.h 1037502187 1007200690 -./include/ctype.h 1037502187 1003656411 -./include/fdisk-part.h 1037502188 1007200690 -./include/file.h 1037502188 1007200690 -./include/fs.h 1037502188 1007200690 -./include/mac-part.h 1037502188 1007200690 -./include/md5.h 1037502188 1000991730 -./include/partition.h 1037502188 1007200690 -./include/prom.h 1037502188 1007200690 -./include/setjm2.h 1037502188 1000991730 -./include/setjmp.h 1037502188 1000991730 -./include/stdlib.h 1037502188 1000991730 -./include/string.h 1037502188 1002620217 -./include/swab.h 1037502188 1000991730 -./include/types.h 1037502188 1000991730 -./include/yaboot.h 1037502189 1007200690 -./include/debug.h 1037502187 1007200690 -./include 1037502546 1007269244 -./second/.arch-ids/fs_xfs.c.id 1037502190 1017069120 -./second/.arch-ids/=id 1037502190 1017027166 -./second/.arch-ids/cache.S.id 1037502190 1017027167 -./second/.arch-ids/cfg.c.id 1037502190 1017027167 -./second/.arch-ids/cmdline.c.id 1037502190 1017027167 -./second/.arch-ids/crt0.S.id 1037502190 1017027167 -./second/.arch-ids/file.c.id 1037502190 1017027167 -./second/.arch-ids/fs.c.id 1037502190 1017027168 -./second/.arch-ids/fs_ext2.c.id 1037502190 1017027168 -./second/.arch-ids/fs_iso.c.id 1037502190 1017027168 -./second/.arch-ids/fs_of.c.id 1037502190 1017027168 -./second/.arch-ids/fs_reiserfs.c.id 1037502190 1017027169 -./second/.arch-ids/iso_util.c.id 1037502190 1017027170 -./second/.arch-ids/md5.c.id 1037502190 1017027170 -./second/.arch-ids/partition.c.id 1037502190 1017027170 -./second/.arch-ids/prom.c.id 1037502190 1017027170 -./second/.arch-ids/setjmp.S.id 1037502190 1017027171 -./second/.arch-ids/yaboot.c.id 1037502190 1017027171 -./second/.arch-ids 1037502546 1017069120 -./second/fs_xfs.c 1037502190 1032059541 -./second/cache.S 1037502190 1007200690 -./second/cfg.c 1037502190 1007200690 -./second/cmdline.c 1037502190 1032059589 -./second/crt0.S 1037502190 1000991731 -./second/file.c 1037502190 1032059581 -./second/fs.c 1037502190 1032059574 -./second/fs_ext2.c 1037502190 1032059564 -./second/fs_iso.c 1037502190 1007200690 -./second/fs_of.c 1037502190 1032059553 -./second/fs_reiserfs.c 1037502190 1007200690 -./second/iso_util.c 1037502190 1003656415 -./second/md5.c 1037502190 1032059532 -./second/partition.c 1037502190 1032059525 -./second/prom.c 1037502190 1032059515 -./second/setjmp.S 1037502190 1000991732 -./second/yaboot.c 1037502191 1032059504 -./second 1037502546 1032765950 -./.arch-ids/Config.id 1037502185 1017069133 -./.arch-ids/0arch-timestamps0.id 1037502185 1020516949 -./.arch-ids/ChangeLog.id 1037502185 1017026820 -./.arch-ids/BUGS.id 1037502185 1017027147 -./.arch-ids/COPYING.id 1037502185 1017027147 -./.arch-ids/INSTALL.id 1037502185 1017027147 -./.arch-ids/Makefile.id 1037502185 1017027148 -./.arch-ids/README.id 1037502185 1017027148 -./.arch-ids/README.man.patch.id 1037502185 1017027148 -./.arch-ids/THANKS.id 1037502185 1017027148 -./.arch-ids/TODO.id 1037502185 1017027149 -./.arch-ids/changelog.id 1037502185 1017027149 -./.arch-ids/man.patch.id 1037502185 1017027166 -./.arch-ids 1037502546 1020516949 -./doc/.arch-ids/=id 1037502185 1017027149 -./doc/.arch-ids/README.ofboot.id 1037502185 1017027149 -./doc/.arch-ids/README.ofpath.id 1037502186 1017027149 -./doc/.arch-ids/README.rs6000.id 1037502186 1017027150 -./doc/.arch-ids/Makefile.id 1037502185 1017235762 -./doc/.arch-ids/yaboot-howto.sgml.id 1037502186 1017235765 -./doc/.arch-ids/yaboot-howto.de.sgml.id 1037502186 1017238100 -./doc/.arch-ids 1037502546 1017238100 -./doc/examples/.arch-ids/=id 1037502186 1017027150 -./doc/examples/.arch-ids/README.dualboot.chrp.id 1037502186 1017027150 -./doc/examples/.arch-ids/README.mbicons.id 1037502186 1017027150 -./doc/examples/.arch-ids/README.simpleboot.chrp.id 1037502186 1017027150 -./doc/examples/.arch-ids/dualboot.chrp.id 1037502186 1017027151 -./doc/examples/.arch-ids/large-penguin.mbicon.id 1037502186 1017027151 -./doc/examples/.arch-ids/simpleboot.chrp.id 1037502186 1017027151 -./doc/examples/.arch-ids/yaboot.conf.multi-boot.id 1037502186 1017027151 -./doc/examples/.arch-ids/yaboot.conf.rs6000.id 1037502186 1017027152 -./doc/examples/.arch-ids 1037502546 1017236175 -./doc/examples/README.dualboot.chrp 1037502186 1000991730 -./doc/examples/README.mbicons 1037502186 1000991730 -./doc/examples/README.simpleboot.chrp 1037502186 1000991730 -./doc/examples/dualboot.chrp 1037502186 1000991730 -./doc/examples/large-penguin.mbicon 1037502186 1000991730 -./doc/examples/simpleboot.chrp 1037502186 1006347336 -./doc/examples/yaboot.conf.multi-boot 1037502186 1006348765 -./doc/examples/yaboot.conf.rs6000 1037502186 1006348765 -./doc/examples 1037502546 1007269243 -./doc/README.ofboot 1037502186 1000991730 -./doc/README.ofpath 1037502186 1000991730 -./doc/README.rs6000 1037502186 1007200689 -./doc/Makefile 1037502186 1019310768 -./doc/yaboot-howto.sgml 1037502186 1032059987 -./doc/yaboot-howto.de.sgml 1037502186 1032059970 -./doc 1037502546 1032059987 -./etc/.arch-ids/=id 1037502186 1017027152 -./etc/.arch-ids/yaboot.conf.id 1037502186 1017027152 -./etc/.arch-ids 1037502546 1017027152 -./etc/yaboot.conf 1037502186 1006348765 -./etc 1037502546 1007269243 -./first/.arch-ids/=id 1037502186 1017027152 -./first/.arch-ids/ofboot.id 1037502186 1017027152 -./first/.arch-ids 1037502546 1017027152 -./first/ofboot 1037502186 1032060202 -./first 1037502546 1032060202 -./lib/.arch-ids/=id 1037502189 1017027162 -./lib/.arch-ids/ctype.c.id 1037502189 1017027163 -./lib/.arch-ids/libext2fs.a.id 1037502189 1017027163 -./lib/.arch-ids/malloc.c.id 1037502189 1017027163 -./lib/.arch-ids/nosys.c.id 1037502189 1017027163 -./lib/.arch-ids/string.S.id 1037502189 1017027163 -./lib/.arch-ids/strstr.c.id 1037502189 1017027164 -./lib/.arch-ids/strtol.c.id 1037502189 1017027164 -./lib/.arch-ids/vsprintf.c.id 1037502189 1017027164 -./lib/.arch-ids 1037502546 1017027164 -./lib/ctype.c 1037502189 1000991731 -./lib/libext2fs.a 1037502189 1003927524 -./lib/malloc.c 1037502189 1007200690 -./lib/nosys.c 1037502189 1000991731 -./lib/string.S 1037502189 1007200690 -./lib/strstr.c 1037502189 1000991731 -./lib/strtol.c 1037502189 1000991731 -./lib/vsprintf.c 1037502189 1000991731 -./lib 1037502546 1014816709 -./man/.arch-ids/=id 1037502189 1017027164 -./man/.arch-ids/bootstrap.8.id 1037502189 1017027165 -./man/.arch-ids/mkofboot.8.id 1037502189 1017027165 -./man/.arch-ids/ofpath.8.id 1037502189 1017027165 -./man/.arch-ids/yaboot.8.id 1037502189 1017027165 -./man/.arch-ids/yaboot.conf.5.id 1037502189 1017027166 -./man/.arch-ids/yabootconfig.8.id 1037502189 1017027166 -./man/.arch-ids/ybin.8.id 1037502189 1017027166 -./man/.arch-ids 1037502546 1017027166 -./man/bootstrap.8 1037502189 1000991731 -./man/mkofboot.8 1037502189 1006348765 -./man/ofpath.8 1037502189 1000991731 -./man/yaboot.8 1037502189 1006348765 -./man/yaboot.conf.5 1037502189 1004256691 -./man/yabootconfig.8 1037502189 1027929577 -./man/ybin.8 1037502190 1006348765 -./man 1037502546 1027929577 -./util/.arch-ids/=id 1037502191 1017027171 -./util/.arch-ids/addnote.c.id 1037502191 1017027171 -./util/.arch-ids/elfextract.c.id 1037502191 1017027172 -./util/.arch-ids 1037502546 1017027172 -./util/addnote.c 1037502191 1007200691 -./util/elfextract.c 1037502191 1007303237 -./util 1037502546 1014816709 -./ybin/.arch-ids/=id 1037502191 1017027172 -./ybin/.arch-ids/mkofboot.id 1037502191 1017027172 -./ybin/.arch-ids/ofpath.id 1037502191 1017027172 -./ybin/.arch-ids/yabootconfig.id 1037502191 1017027172 -./ybin/.arch-ids/ybin.id 1037502191 1017027173 -./ybin/.arch-ids 1037502546 1017027173 -./ybin/mkofboot 1037502191 1030918600 -./ybin/ofpath 1037502191 1037499958 -./ybin/yabootconfig 1037502191 1037500382 -./ybin/ybin 1037502191 1037499892 -./ybin 1037502546 1037500382 -./Config 1037502185 1002101497 -./0arch-timestamps0 1037502185 1037502546 -./ChangeLog 1037502185 1037498541 -./BUGS 1037502185 1000991730 -./COPYING 1037502185 1000991730 -./INSTALL 1037502185 1000991730 -./README 1037502185 1033253141 -./README.man.patch 1037502185 1000991730 -./THANKS 1037502185 1006350263 -./TODO 1037502185 1006527567 -./changelog 1037502185 1037502537 -./man.patch 1037502189 1006348761 -./Makefile 1037502185 1037500435 -. 1037502546 1037502542 +./include/xfs/.arch-ids/=id 1037502781 1017069090 +./include/xfs/.arch-ids/xfs.h.id 1037502781 1017069096 +./include/xfs/.arch-ids 1037575853 1017069096 +./include/xfs/xfs.h 1037502846 1002101334 +./include/xfs 1037575853 1007269244 +./include/.arch-ids/errors.h.id 1037502779 1017069108 +./include/.arch-ids/=id 1037502778 1017027153 +./include/.arch-ids/bootinfo.h.id 1037502778 1017027154 +./include/.arch-ids/byteorder.h.id 1037502778 1017027154 +./include/.arch-ids/cfg.h.id 1037502778 1017027154 +./include/.arch-ids/cmdline.h.id 1037502778 1017027154 +./include/.arch-ids/ctype.h.id 1037502778 1017027155 +./include/.arch-ids/fdisk-part.h.id 1037502779 1017027157 +./include/.arch-ids/file.h.id 1037502779 1017027157 +./include/.arch-ids/fs.h.id 1037502779 1017027157 +./include/.arch-ids/mac-part.h.id 1037502779 1017027159 +./include/.arch-ids/md5.h.id 1037502779 1017027159 +./include/.arch-ids/partition.h.id 1037502779 1017027159 +./include/.arch-ids/prom.h.id 1037502779 1017027159 +./include/.arch-ids/setjm2.h.id 1037502779 1017027160 +./include/.arch-ids/setjmp.h.id 1037502779 1017027160 +./include/.arch-ids/stdlib.h.id 1037502779 1017027161 +./include/.arch-ids/string.h.id 1037502779 1017027161 +./include/.arch-ids/swab.h.id 1037502779 1017027161 +./include/.arch-ids/types.h.id 1037502779 1017027162 +./include/.arch-ids/yaboot.h.id 1037502779 1017027162 +./include/.arch-ids/debug.h.id 1037502779 1017154770 +./include/.arch-ids 1037575853 1017154770 +./include/asm/.arch-ids/=id 1037502779 1017027153 +./include/asm/.arch-ids/elf.h.id 1037502779 1017027153 +./include/asm/.arch-ids/ppc_asm.tmpl.id 1037502779 1017027153 +./include/asm/.arch-ids/processor.h.id 1037502779 1017027154 +./include/asm/.arch-ids 1037575853 1017027154 +./include/asm/elf.h 1037502839 1000991730 +./include/asm/ppc_asm.tmpl 1037502838 1000991730 +./include/asm/processor.h 1037502838 1000991730 +./include/asm 1037575853 1007269243 +./include/et/.arch-ids/=id 1037502779 1017027155 +./include/et/.arch-ids/com_err.h.id 1037502779 1017027155 +./include/et/.arch-ids 1037575853 1017155400 +./include/et/com_err.h 1037502843 1000991731 +./include/et 1037575853 1007269243 +./include/ext2fs/.arch-ids/=id 1037502779 1017027156 +./include/ext2fs/.arch-ids/bitops.h.id 1037502779 1017027156 +./include/ext2fs/.arch-ids/ext2_err.h.id 1037502780 1017027156 +./include/ext2fs/.arch-ids/ext2_io.h.id 1037502780 1017027156 +./include/ext2fs/.arch-ids/ext2fs.h.id 1037502780 1017027156 +./include/ext2fs/.arch-ids 1037575853 1017027156 +./include/ext2fs/bitops.h 1037502843 1003927524 +./include/ext2fs/ext2_err.h 1037502843 1003927524 +./include/ext2fs/ext2_io.h 1037502843 1003927524 +./include/ext2fs/ext2fs.h 1037502843 1003927524 +./include/ext2fs 1037575853 1007269243 +./include/linux/.arch-ids/=id 1037502780 1017027157 +./include/linux/.arch-ids/elf.h.id 1037502780 1017027158 +./include/linux/.arch-ids/ext2_fs.h.id 1037502780 1017027158 +./include/linux/.arch-ids/iso_fs.h.id 1037502780 1017027158 +./include/linux/.arch-ids/stat.h.id 1037502780 1017027158 +./include/linux/.arch-ids/types.h.id 1037502780 1017027159 +./include/linux/.arch-ids 1037575853 1017027159 +./include/linux/elf.h 1037502839 1000991731 +./include/linux/ext2_fs.h 1037502843 1000991731 +./include/linux/iso_fs.h 1037502842 1000991731 +./include/linux/stat.h 1037502780 1000991731 +./include/linux/types.h 1037502842 1000991731 +./include/linux 1037575853 1007269243 +./include/reiserfs/.arch-ids/=id 1037502780 1017027160 +./include/reiserfs/.arch-ids/reiserfs.h.id 1037502780 1017027160 +./include/reiserfs/.arch-ids 1037575853 1017027160 +./include/reiserfs/reiserfs.h 1037502847 1025684115 +./include/reiserfs 1037575853 1025684115 +./include/errors.h 1037502839 1007200690 +./include/bootinfo.h 1037502839 1007200690 +./include/byteorder.h 1037502847 1000991730 +./include/cfg.h 1037502839 1007200690 +./include/cmdline.h 1037502839 1007200690 +./include/ctype.h 1037502839 1003656411 +./include/fdisk-part.h 1037502842 1007200690 +./include/file.h 1037502839 1007200690 +./include/fs.h 1037502839 1007200690 +./include/mac-part.h 1037502842 1007200690 +./include/md5.h 1037502839 1000991730 +./include/partition.h 1037502839 1007200690 +./include/prom.h 1037502839 1007200690 +./include/setjm2.h 1037502780 1000991730 +./include/setjmp.h 1037502842 1000991730 +./include/stdlib.h 1037502839 1000991730 +./include/string.h 1037502839 1002620217 +./include/swab.h 1037502847 1000991730 +./include/types.h 1037502839 1000991730 +./include/yaboot.h 1037502839 1007200690 +./include/debug.h 1037502839 1007200690 +./include 1037575853 1007269244 +./second/.arch-ids/fs_xfs.c.id 1037502782 1017069120 +./second/.arch-ids/=id 1037502782 1017027166 +./second/.arch-ids/cache.S.id 1037502782 1017027167 +./second/.arch-ids/cfg.c.id 1037502782 1017027167 +./second/.arch-ids/cmdline.c.id 1037502782 1017027167 +./second/.arch-ids/crt0.S.id 1037502782 1017027167 +./second/.arch-ids/file.c.id 1037502782 1017027167 +./second/.arch-ids/fs.c.id 1037502782 1017027168 +./second/.arch-ids/fs_ext2.c.id 1037502782 1017027168 +./second/.arch-ids/fs_iso.c.id 1037502782 1017027168 +./second/.arch-ids/fs_of.c.id 1037502782 1017027168 +./second/.arch-ids/fs_reiserfs.c.id 1037502782 1017027169 +./second/.arch-ids/iso_util.c.id 1037502782 1017027170 +./second/.arch-ids/md5.c.id 1037502782 1017027170 +./second/.arch-ids/partition.c.id 1037502782 1017027170 +./second/.arch-ids/prom.c.id 1037502782 1017027170 +./second/.arch-ids/setjmp.S.id 1037502782 1017027171 +./second/.arch-ids/yaboot.c.id 1037502782 1017027171 +./second/.arch-ids 1037575853 1017069120 +./second/fs_xfs.c 1037502846 1032059541 +./second/cache.S 1037502841 1007200690 +./second/cfg.c 1037502842 1007200690 +./second/cmdline.c 1037502843 1032059589 +./second/crt0.S 1037502838 1000991731 +./second/file.c 1037502842 1032059581 +./second/fs.c 1037502842 1032059574 +./second/fs_ext2.c 1037502843 1032059564 +./second/fs_iso.c 1037502844 1007200690 +./second/fs_of.c 1037502843 1032059553 +./second/fs_reiserfs.c 1037502847 1007200690 +./second/iso_util.c 1037502844 1003656415 +./second/md5.c 1037502846 1032059532 +./second/partition.c 1037502842 1032059525 +./second/prom.c 1037502841 1032059515 +./second/setjmp.S 1037502843 1000991732 +./second/yaboot.c 1037502839 1032059504 +./second 1037575853 1037502852 +./.arch-ids/Config.id 1037502776 1017069133 +./.arch-ids/0arch-timestamps0.id 1037502776 1020516949 +./.arch-ids/ChangeLog.id 1037502776 1017026820 +./.arch-ids/BUGS.id 1037502776 1017027147 +./.arch-ids/COPYING.id 1037502776 1017027147 +./.arch-ids/INSTALL.id 1037502776 1017027147 +./.arch-ids/Makefile.id 1037502776 1017027148 +./.arch-ids/README.id 1037502776 1017027148 +./.arch-ids/README.man.patch.id 1037502776 1017027148 +./.arch-ids/THANKS.id 1037502776 1017027148 +./.arch-ids/TODO.id 1037502776 1017027149 +./.arch-ids/changelog.id 1037502776 1017027149 +./.arch-ids/man.patch.id 1037502776 1017027166 +./.arch-ids 1037575853 1020516949 +./doc/.arch-ids/=id 1037502777 1017027149 +./doc/.arch-ids/README.ofboot.id 1037502777 1017027149 +./doc/.arch-ids/README.ofpath.id 1037502777 1017027149 +./doc/.arch-ids/README.rs6000.id 1037502777 1017027150 +./doc/.arch-ids/Makefile.id 1037502777 1017235762 +./doc/.arch-ids/yaboot-howto.sgml.id 1037502777 1017235765 +./doc/.arch-ids/yaboot-howto.de.sgml.id 1037502777 1017238100 +./doc/.arch-ids 1037575853 1017238100 +./doc/examples/.arch-ids/=id 1037502778 1017027150 +./doc/examples/.arch-ids/README.dualboot.chrp.id 1037502778 1017027150 +./doc/examples/.arch-ids/README.mbicons.id 1037502778 1017027150 +./doc/examples/.arch-ids/README.simpleboot.chrp.id 1037502778 1017027150 +./doc/examples/.arch-ids/dualboot.chrp.id 1037502778 1017027151 +./doc/examples/.arch-ids/large-penguin.mbicon.id 1037502778 1017027151 +./doc/examples/.arch-ids/simpleboot.chrp.id 1037502778 1017027151 +./doc/examples/.arch-ids/yaboot.conf.multi-boot.id 1037502778 1017027151 +./doc/examples/.arch-ids/yaboot.conf.rs6000.id 1037502778 1017027152 +./doc/examples/.arch-ids 1037575853 1017236175 +./doc/examples/README.dualboot.chrp 1037502778 1000991730 +./doc/examples/README.mbicons 1037502778 1000991730 +./doc/examples/README.simpleboot.chrp 1037502778 1000991730 +./doc/examples/dualboot.chrp 1037502778 1000991730 +./doc/examples/large-penguin.mbicon 1037502778 1000991730 +./doc/examples/simpleboot.chrp 1037502778 1006347336 +./doc/examples/yaboot.conf.multi-boot 1037502778 1006348765 +./doc/examples/yaboot.conf.rs6000 1037502778 1006348765 +./doc/examples 1037575853 1007269243 +./doc/README.ofboot 1037502778 1000991730 +./doc/README.ofpath 1037502778 1000991730 +./doc/README.rs6000 1037502778 1007200689 +./doc/Makefile 1037502777 1019310768 +./doc/yaboot-howto.sgml 1037502778 1032059987 +./doc/yaboot-howto.de.sgml 1037502778 1032059970 +./doc 1037575853 1032059987 +./etc/.arch-ids/=id 1037502778 1017027152 +./etc/.arch-ids/yaboot.conf.id 1037502778 1017027152 +./etc/.arch-ids 1037575853 1017027152 +./etc/yaboot.conf 1037502778 1006348765 +./etc 1037575853 1007269243 +./first/.arch-ids/=id 1037502778 1017027152 +./first/.arch-ids/ofboot.id 1037502778 1017027152 +./first/.arch-ids 1037575853 1017027152 +./first/ofboot 1037502778 1032060202 +./first 1037575853 1032060202 +./lib/.arch-ids/=id 1037502781 1017027162 +./lib/.arch-ids/ctype.c.id 1037502781 1017027163 +./lib/.arch-ids/libext2fs.a.id 1037502781 1017027163 +./lib/.arch-ids/malloc.c.id 1037502781 1017027163 +./lib/.arch-ids/nosys.c.id 1037502781 1017027163 +./lib/.arch-ids/string.S.id 1037502781 1017027163 +./lib/.arch-ids/strstr.c.id 1037502781 1017027164 +./lib/.arch-ids/strtol.c.id 1037502781 1017027164 +./lib/.arch-ids/vsprintf.c.id 1037502781 1017027164 +./lib/.arch-ids 1037575853 1017027164 +./lib/ctype.c 1037502845 1000991731 +./lib/libext2fs.a 1037502848 1003927524 +./lib/malloc.c 1037502845 1007200690 +./lib/nosys.c 1037502844 1000991731 +./lib/string.S 1037502844 1007200690 +./lib/strstr.c 1037502846 1000991731 +./lib/strtol.c 1037502844 1000991731 +./lib/vsprintf.c 1037502845 1000991731 +./lib 1037575853 1037502852 +./man/.arch-ids/=id 1037502781 1017027164 +./man/.arch-ids/bootstrap.8.id 1037502781 1017027165 +./man/.arch-ids/mkofboot.8.id 1037502781 1017027165 +./man/.arch-ids/ofpath.8.id 1037502781 1017027165 +./man/.arch-ids/yaboot.8.id 1037502781 1017027165 +./man/.arch-ids/yaboot.conf.5.id 1037502781 1017027166 +./man/.arch-ids/yabootconfig.8.id 1037502781 1017027166 +./man/.arch-ids/ybin.8.id 1037502781 1017027166 +./man/.arch-ids 1037575853 1017027166 +./man/bootstrap.8 1037502782 1000991731 +./man/mkofboot.8 1037502782 1006348765 +./man/ofpath.8 1037502782 1000991731 +./man/yaboot.8 1037502782 1006348765 +./man/yaboot.conf.5 1037502782 1004256691 +./man/yabootconfig.8 1037502782 1027929577 +./man/ybin.8 1037502782 1006348765 +./man 1037575853 1027929577 +./util/.arch-ids/=id 1037502783 1017027171 +./util/.arch-ids/addnote.c.id 1037502783 1017027171 +./util/.arch-ids/elfextract.c.id 1037502783 1017027172 +./util/.arch-ids 1037575853 1017027172 +./util/addnote.c 1037502849 1007200691 +./util/elfextract.c 1037502783 1007303237 +./util 1037575853 1037502852 +./ybin/.arch-ids/=id 1037502783 1017027172 +./ybin/.arch-ids/mkofboot.id 1037502783 1017027172 +./ybin/.arch-ids/ofpath.id 1037502783 1017027172 +./ybin/.arch-ids/yabootconfig.id 1037502783 1017027172 +./ybin/.arch-ids/ybin.id 1037502783 1017027173 +./ybin/.arch-ids 1037575853 1017027173 +./ybin/ofpath 1037575777 1037575740 +./ybin/yabootconfig 1037575742 1037575747 +./ybin/ybin 1037575749 1037575753 +./ybin/mkofboot 1037574967 1037502849 +./ybin 1037575853 1037575753 +./Config 1037532376 1002101497 +./0arch-timestamps0 1037502776 1037575853 +./ChangeLog 1037502793 1037502793 +./BUGS 1037502777 1000991730 +./COPYING 1037502777 1000991730 +./INSTALL 1037502777 1000991730 +./README 1037502777 1033253141 +./README.man.patch 1037502777 1000991730 +./THANKS 1037502777 1006350263 +./TODO 1037502777 1006527567 +./changelog 1037575826 1037575841 +./man.patch 1037502781 1006348761 +./Makefile 1037575756 1037575759 +. 1037575852 1037575841 diff --git a/ChangeLog b/ChangeLog index b4ac0c6..172d957 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,21 @@ # tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3 # +2002-11-17 23:33:17 GMT Ethan Benson patch-40 + + Summary: + Add support for IDE controllers with identity crisis + Revision: + yaboot--devel--1.3--patch-40 + + * ofpath: Add support for IDE controllers that pretend they are scsi. + * Prepare 1.3.8-rc2. + + modified files: + 0arch-timestamps0 ChangeLog Makefile changelog ybin/ofpath + ybin/yabootconfig ybin/ybin + + 2002-11-17 03:13:10 GMT Ethan Benson patch-39 Summary: diff --git a/Makefile b/Makefile index 73f21db..14b3b88 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ include Config -VERSION = 1.3.8-rc1 +VERSION = 1.3.8-rc2 # Debug mode (spam/verbose) DEBUG = 0 # make install vars diff --git a/changelog b/changelog index a9e3453..af2c4af 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,6 @@ -2002-11-16 Ethan Benson +2002-11-17 Ethan Benson - * Version 1.3.8-rc1 + * Version 1.3.8-rc2 * ofpath: Support new Xserve and Windtunnel PowerMacs. diff --git a/ybin/ofpath b/ybin/ofpath index 0f944e2..287cdb1 100755 --- a/ybin/ofpath +++ b/ybin/ofpath @@ -27,7 +27,7 @@ PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" PRG="${0##*/}" -VERSION=1.0.3-rc1 +VERSION=1.0.3-rc2 DEBUG=0 export LC_COLLATE=C @@ -339,16 +339,23 @@ ide_ofpath() return 1 fi + if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then + echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not exist" + return 1 + fi + case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in ata) - local CHANNEL="" + local MASTER="/disk@0" + local SLAVE="/disk@1" ;; pci-ata) - if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then - echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not exist" - return 1 - fi - local CHANNEL="/@$(cat /proc/ide/${IDEBUS}/channel)" + local MASTER="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@0" + local SLAVE="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@1" + ;; + scsi) ## some lame controllers pretend they are scsi, hopefully all kludges are created equal. + local MASTER="/$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 0)),0" + local SLAVE="/$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1)),0" ;; *) echo 2>&1 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\"" @@ -358,11 +365,11 @@ ide_ofpath() case "$DEVNODE" in hda|hdc|hde|hdg|hdi) - echo "${DEVSPEC}${CHANNEL}/disk@0:$PARTITION" + echo "${DEVSPEC}${MASTER}:$PARTITION" return 0 ;; hdb|hdd|hdf|hdh|hdj) - echo "${DEVSPEC}${CHANNEL}/disk@1:$PARTITION" + echo "${DEVSPEC}${SLAVE}:$PARTITION" return 0 ;; *) diff --git a/ybin/yabootconfig b/ybin/yabootconfig index 6bff20f..256978d 100755 --- a/ybin/yabootconfig +++ b/ybin/yabootconfig @@ -27,7 +27,7 @@ if [ -n "$PATH_PREFIX" ] ; then PATH="${PATH}:${PATH_PREFIX}/sbin:${PATH_PREFIX}/bin:${PATH_PREFIX}/usr/sbin:${PATH_PREFIX}/usr/bin:${PATH_PREFIX}/usr/local/sbin:${PATH_PREFIX}/usr/local/bin" fi PRG="${0##*/}" -VERSION=1.0.7-rc1 +VERSION=1.0.7-rc2 CHROOT=/ ## $CONFIG is relative to $CHROOT CONFIG=etc/yaboot.conf diff --git a/ybin/ybin b/ybin/ybin index 812afe2..fa3813a 100755 --- 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.8-rc1 +VERSION=1.3.8-rc2 DEBUG=0 VERBOSE=0 TMP="${TMPDIR:-/tmp}" -- 2.39.2