Fix ofpath on early iMacs

* ofpath: Apple apparently can't decide whether its called `ata'
  or `ide'; fix support for early iMac models.

* Prep 1.3.10.
git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-50

diff --git a/0arch-timestamps0 b/0arch-timestamps0
index 67c212a757e06c2272997f756dbbe1b784d13532..21e98049dfc1ea0fddb357beda9d182e9702e384 100644 (file)
--- a/0arch-timestamps0
+++ b/0arch-timestamps0
@@ -1,256 +1,256 @@
-./include/xfs/.arch-ids/=id    1045039992      1017069090
-./include/xfs/.arch-ids/xfs.h.id       1045039992      1017069096
-./include/xfs/.arch-ids        1045040038      1017069096
-./include/xfs/xfs.h    1045039992      1002101334
-./include/xfs  1045040038      1007269244
-./include/.arch-ids/errors.h.id        1045039990      1017069108
-./include/.arch-ids/=id        1045039990      1017027153
-./include/.arch-ids/bootinfo.h.id      1045039990      1017027154
-./include/.arch-ids/byteorder.h.id     1045039990      1017027154
-./include/.arch-ids/cfg.h.id   1045039990      1017027154
-./include/.arch-ids/cmdline.h.id       1045039990      1017027154
-./include/.arch-ids/ctype.h.id 1045039990      1017027155
-./include/.arch-ids/fdisk-part.h.id    1045039990      1017027157
-./include/.arch-ids/file.h.id  1045039990      1017027157
-./include/.arch-ids/fs.h.id    1045039990      1017027157
-./include/.arch-ids/mac-part.h.id      1045039990      1017027159
-./include/.arch-ids/md5.h.id   1045039990      1017027159
-./include/.arch-ids/partition.h.id     1045039990      1017027159
-./include/.arch-ids/prom.h.id  1045039990      1017027159
-./include/.arch-ids/setjm2.h.id        1045039990      1017027160
-./include/.arch-ids/setjmp.h.id        1045039990      1017027160
-./include/.arch-ids/stdlib.h.id        1045039990      1017027161
-./include/.arch-ids/string.h.id        1045039990      1017027161
-./include/.arch-ids/swab.h.id  1045039990      1017027161
-./include/.arch-ids/types.h.id 1045039990      1017027162
-./include/.arch-ids/yaboot.h.id        1045039990      1017027162
-./include/.arch-ids/debug.h.id 1045039990      1017154770
-./include/.arch-ids    1045040038      1017154770
-./include/asm/.arch-ids/=id    1045039990      1017027153
-./include/asm/.arch-ids/elf.h.id       1045039990      1017027153
-./include/asm/.arch-ids/ppc_asm.tmpl.id        1045039990      1017027153
-./include/asm/.arch-ids/processor.h.id 1045039990      1017027154
-./include/asm/.arch-ids        1045040038      1017027154
-./include/asm/elf.h    1045039991      1000991730
-./include/asm/ppc_asm.tmpl     1045039991      1000991730
-./include/asm/processor.h      1045039991      1000991730
-./include/asm  1045040038      1007269243
-./include/et/.arch-ids/=id     1045039991      1017027155
-./include/et/.arch-ids/com_err.h.id    1045039991      1017027155
-./include/et/.arch-ids 1045040038      1017155400
-./include/et/com_err.h 1045039991      1000991731
-./include/et   1045040038      1007269243
-./include/ext2fs/.arch-ids/=id 1045039991      1017027156
-./include/ext2fs/.arch-ids/bitops.h.id 1045039991      1017027156
-./include/ext2fs/.arch-ids/ext2_err.h.id       1045039991      1017027156
-./include/ext2fs/.arch-ids/ext2_io.h.id        1045039991      1017027156
-./include/ext2fs/.arch-ids/ext2fs.h.id 1045039991      1017027156
-./include/ext2fs/.arch-ids     1045040038      1017027156
-./include/ext2fs/bitops.h      1045039991      1003927524
-./include/ext2fs/ext2_err.h    1045039991      1003927524
-./include/ext2fs/ext2_io.h     1045039991      1003927524
-./include/ext2fs/ext2fs.h      1045039991      1003927524
-./include/ext2fs       1045040038      1007269243
-./include/linux/.arch-ids/=id  1045039991      1017027157
-./include/linux/.arch-ids/elf.h.id     1045039991      1017027158
-./include/linux/.arch-ids/ext2_fs.h.id 1045039991      1017027158
-./include/linux/.arch-ids/iso_fs.h.id  1045039991      1017027158
-./include/linux/.arch-ids/stat.h.id    1045039991      1017027158
-./include/linux/.arch-ids/types.h.id   1045039991      1017027159
-./include/linux/.arch-ids      1045040038      1017027159
-./include/linux/elf.h  1045039991      1000991731
-./include/linux/ext2_fs.h      1045039991      1000991731
-./include/linux/iso_fs.h       1045039991      1000991731
-./include/linux/stat.h 1045039991      1000991731
-./include/linux/types.h        1045039991      1000991731
-./include/linux        1045040038      1007269243
-./include/reiserfs/.arch-ids/=id       1045039992      1017027160
-./include/reiserfs/.arch-ids/reiserfs.h.id     1045039992      1017027160
-./include/reiserfs/.arch-ids   1045040038      1017027160
-./include/reiserfs/reiserfs.h  1045039992      1025684115
-./include/reiserfs     1045040038      1025684115
-./include/errors.h     1045039991      1007200690
-./include/bootinfo.h   1045039991      1007200690
-./include/byteorder.h  1045039991      1000991730
-./include/cfg.h        1045039991      1007200690
-./include/cmdline.h    1045039991      1007200690
-./include/ctype.h      1045039991      1003656411
-./include/fdisk-part.h 1045039991      1007200690
-./include/file.h       1045039991      1007200690
-./include/fs.h 1045039991      1007200690
-./include/mac-part.h   1045039991      1007200690
-./include/md5.h        1045039992      1000991730
-./include/partition.h  1045039992      1007200690
-./include/prom.h       1045039992      1007200690
-./include/setjm2.h     1045039992      1000991730
-./include/setjmp.h     1045039992      1000991730
-./include/stdlib.h     1045039992      1000991730
-./include/string.h     1045039992      1002620217
-./include/swab.h       1045039992      1000991730
-./include/types.h      1045039992      1000991730
-./include/yaboot.h     1045039992      1007200690
-./include/debug.h      1045039991      1007200690
-./include      1045040038      1007269244
-./second/.arch-ids/fs_xfs.c.id 1045039993      1017069120
-./second/.arch-ids/=id 1045039993      1017027166
-./second/.arch-ids/cache.S.id  1045039993      1017027167
-./second/.arch-ids/cfg.c.id    1045039993      1017027167
-./second/.arch-ids/cmdline.c.id        1045039993      1017027167
-./second/.arch-ids/crt0.S.id   1045039993      1017027167
-./second/.arch-ids/file.c.id   1045039993      1017027167
-./second/.arch-ids/fs.c.id     1045039993      1017027168
-./second/.arch-ids/fs_ext2.c.id        1045039993      1017027168
-./second/.arch-ids/fs_iso.c.id 1045039993      1017027168
-./second/.arch-ids/fs_of.c.id  1045039993      1017027168
-./second/.arch-ids/fs_reiserfs.c.id    1045039993      1017027169
-./second/.arch-ids/iso_util.c.id       1045039993      1017027170
-./second/.arch-ids/md5.c.id    1045039993      1017027170
-./second/.arch-ids/partition.c.id      1045039993      1017027170
-./second/.arch-ids/prom.c.id   1045039993      1017027170
-./second/.arch-ids/setjmp.S.id 1045039993      1017027171
-./second/.arch-ids/yaboot.c.id 1045039993      1017027171
-./second/.arch-ids     1045040038      1017069120
-./second/fs_xfs.c      1045039994      1032059541
-./second/cache.S       1045039993      1007200690
-./second/cfg.c 1045039993      1007200690
-./second/cmdline.c     1045039993      1032059589
-./second/crt0.S        1045039993      1000991731
-./second/fs.c  1045039993      1032059574
-./second/fs_ext2.c     1045039994      1032059564
-./second/fs_iso.c      1045039994      1007200690
-./second/fs_of.c       1045039994      1032059553
-./second/fs_reiserfs.c 1045039994      1007200690
-./second/iso_util.c    1045039994      1003656415
-./second/md5.c 1045039994      1032059532
-./second/partition.c   1045039994      1032059525
-./second/prom.c        1045039994      1032059515
-./second/setjmp.S      1045039994      1000991732
-./second/yaboot.c      1045039994      1032059504
-./second/file.c        1045039993      1044868693
-./second       1045040038      1044870683
-./.arch-ids/Config.id  1045039988      1017069133
-./.arch-ids/0arch-timestamps0.id       1045039988      1020516949
-./.arch-ids/ChangeLog.id       1045039988      1017026820
-./.arch-ids/BUGS.id    1045039988      1017027147
-./.arch-ids/COPYING.id 1045039988      1017027147
-./.arch-ids/INSTALL.id 1045039988      1017027147
-./.arch-ids/Makefile.id        1045039988      1017027148
-./.arch-ids/README.id  1045039988      1017027148
-./.arch-ids/README.man.patch.id        1045039988      1017027148
-./.arch-ids/THANKS.id  1045039988      1017027148
-./.arch-ids/TODO.id    1045039988      1017027149
-./.arch-ids/changelog.id       1045039988      1017027149
-./.arch-ids/man.patch.id       1045039988      1017027166
-./.arch-ids    1045040038      1020516949
-./doc/.arch-ids/=id    1045039989      1017027149
-./doc/.arch-ids/README.ofboot.id       1045039989      1017027149
-./doc/.arch-ids/README.ofpath.id       1045039989      1017027149
-./doc/.arch-ids/README.rs6000.id       1045039989      1017027150
-./doc/.arch-ids/Makefile.id    1045039989      1017235762
-./doc/.arch-ids/yaboot-howto.sgml.id   1045039989      1017235765
-./doc/.arch-ids/yaboot-howto.de.sgml.id        1045039989      1017238100
-./doc/.arch-ids        1045040038      1017238100
-./doc/examples/.arch-ids/=id   1045039989      1017027150
-./doc/examples/.arch-ids/README.dualboot.chrp.id       1045039989      1017027150
-./doc/examples/.arch-ids/README.mbicons.id     1045039989      1017027150
-./doc/examples/.arch-ids/README.simpleboot.chrp.id     1045039989      1017027150
-./doc/examples/.arch-ids/dualboot.chrp.id      1045039989      1017027151
-./doc/examples/.arch-ids/large-penguin.mbicon.id       1045039989      1017027151
-./doc/examples/.arch-ids/simpleboot.chrp.id    1045039989      1017027151
-./doc/examples/.arch-ids/yaboot.conf.multi-boot.id     1045039989      1017027151
-./doc/examples/.arch-ids/yaboot.conf.rs6000.id 1045039989      1017027152
-./doc/examples/.arch-ids       1045040038      1017236175
-./doc/examples/README.dualboot.chrp    1045039989      1000991730
-./doc/examples/README.mbicons  1045039989      1000991730
-./doc/examples/README.simpleboot.chrp  1045039989      1000991730
-./doc/examples/dualboot.chrp   1045039989      1044766918
-./doc/examples/large-penguin.mbicon    1045039990      1000991730
-./doc/examples/simpleboot.chrp 1045039990      1044766860
-./doc/examples/yaboot.conf.multi-boot  1045039990      1006348765
-./doc/examples/yaboot.conf.rs6000      1045039990      1006348765
-./doc/examples 1045040038      1044766918
-./doc/README.ofboot    1045039989      1000991730
-./doc/README.ofpath    1045039989      1000991730
-./doc/README.rs6000    1045039989      1007200689
-./doc/Makefile 1045039989      1019310768
-./doc/yaboot-howto.sgml        1045039990      1032059987
-./doc/yaboot-howto.de.sgml     1045039990      1032059970
-./doc  1045040038      1032059987
-./etc/.arch-ids/=id    1045039990      1017027152
-./etc/.arch-ids/yaboot.conf.id 1045039990      1017027152
-./etc/.arch-ids        1045040038      1017027152
-./etc/yaboot.conf      1045039990      1006348765
-./etc  1045040038      1007269243
-./first/.arch-ids/=id  1045039990      1017027152
-./first/.arch-ids/ofboot.id    1045039990      1017027152
-./first/.arch-ids      1045040038      1017027152
-./first/ofboot 1045039990      1044766440
-./first        1045040038      1044766440
-./lib/.arch-ids/=id    1045039992      1017027162
-./lib/.arch-ids/ctype.c.id     1045039992      1017027163
-./lib/.arch-ids/libext2fs.a.id 1045039992      1017027163
-./lib/.arch-ids/malloc.c.id    1045039992      1017027163
-./lib/.arch-ids/nosys.c.id     1045039992      1017027163
-./lib/.arch-ids/string.S.id    1045039992      1017027163
-./lib/.arch-ids/strstr.c.id    1045039992      1017027164
-./lib/.arch-ids/strtol.c.id    1045039992      1017027164
-./lib/.arch-ids/vsprintf.c.id  1045039992      1017027164
-./lib/.arch-ids        1045040038      1017027164
-./lib/ctype.c  1045039992      1000991731
-./lib/libext2fs.a      1045039992      1003927524
-./lib/malloc.c 1045039992      1007200690
-./lib/nosys.c  1045039992      1000991731
-./lib/string.S 1045039992      1007200690
-./lib/strstr.c 1045039992      1000991731
-./lib/strtol.c 1045039992      1000991731
-./lib/vsprintf.c       1045039992      1000991731
-./lib  1045040038      1044870683
-./man/.arch-ids/=id    1045039992      1017027164
-./man/.arch-ids/bootstrap.8.id 1045039992      1017027165
-./man/.arch-ids/mkofboot.8.id  1045039993      1017027165
-./man/.arch-ids/ofpath.8.id    1045039993      1017027165
-./man/.arch-ids/yaboot.8.id    1045039993      1017027165
-./man/.arch-ids/yaboot.conf.5.id       1045039993      1017027166
-./man/.arch-ids/yabootconfig.8.id      1045039993      1017027166
-./man/.arch-ids/ybin.8.id      1045039993      1017027166
-./man/.arch-ids        1045040038      1017027166
-./man/bootstrap.8      1045039993      1000991731
-./man/mkofboot.8       1045039993      1006348765
-./man/ofpath.8 1045039993      1000991731
-./man/yaboot.8 1045039993      1006348765
-./man/yaboot.conf.5    1045039993      1004256691
-./man/yabootconfig.8   1045039993      1027929577
-./man/ybin.8   1045039993      1006348765
-./man  1045040038      1027929577
-./util/.arch-ids/=id   1045039994      1017027171
-./util/.arch-ids/addnote.c.id  1045039994      1017027171
-./util/.arch-ids/elfextract.c.id       1045039994      1017027172
-./util/.arch-ids       1045040038      1017027172
-./util/addnote.c       1045039994      1007200691
-./util/elfextract.c    1045039994      1007303237
-./util 1045040038      1044870683
-./ybin/.arch-ids/=id   1045039994      1017027172
-./ybin/.arch-ids/mkofboot.id   1045039994      1017027172
-./ybin/.arch-ids/ofpath.id     1045039994      1017027172
-./ybin/.arch-ids/yabootconfig.id       1045039994      1017027172
-./ybin/.arch-ids/ybin.id       1045039994      1017027173
-./ybin/.arch-ids       1045040038      1017027173
-./ybin/ofpath  1045039994      1044766402
-./ybin/yabootconfig    1045039994      1044766426
-./ybin/ybin    1045039994      1045039025
-./ybin/mkofboot        1045039994      1044870737
-./ybin 1045040038      1045039025
-./Config       1045040035      1002101497
-./0arch-timestamps0    1045039988      1045040038
-./ChangeLog    1045039989      1044870907
-./BUGS 1045039988      1000991730
-./COPYING      1045039989      1000991730
-./INSTALL      1045039989      1000991730
-./README       1045039989      1044766458
-./README.man.patch     1045039989      1000991730
-./THANKS       1045039989      1006350263
-./TODO 1045039989      1044766566
-./changelog    1045039989      1045039237
-./man.patch    1045039992      1006348761
-./Makefile     1045040035      1045039017
-.      1045040038      1045040035
+./include/xfs/.arch-ids/=id    1046075668      1017069090
+./include/xfs/.arch-ids/xfs.h.id       1046075668      1017069096
+./include/xfs/.arch-ids        1046258742      1017069096
+./include/xfs/xfs.h    1046075668      1002101334
+./include/xfs  1046258742      1007269244
+./include/.arch-ids/errors.h.id        1046075668      1017069108
+./include/.arch-ids/=id        1046075668      1017027153
+./include/.arch-ids/bootinfo.h.id      1046075668      1017027154
+./include/.arch-ids/byteorder.h.id     1046075668      1017027154
+./include/.arch-ids/cfg.h.id   1046075668      1017027154
+./include/.arch-ids/cmdline.h.id       1046075668      1017027154
+./include/.arch-ids/ctype.h.id 1046075668      1017027155
+./include/.arch-ids/fdisk-part.h.id    1046075668      1017027157
+./include/.arch-ids/file.h.id  1046075668      1017027157
+./include/.arch-ids/fs.h.id    1046075668      1017027157
+./include/.arch-ids/mac-part.h.id      1046075668      1017027159
+./include/.arch-ids/md5.h.id   1046075668      1017027159
+./include/.arch-ids/partition.h.id     1046075668      1017027159
+./include/.arch-ids/prom.h.id  1046075668      1017027159
+./include/.arch-ids/setjm2.h.id        1046075668      1017027160
+./include/.arch-ids/setjmp.h.id        1046075668      1017027160
+./include/.arch-ids/stdlib.h.id        1046075668      1017027161
+./include/.arch-ids/string.h.id        1046075668      1017027161
+./include/.arch-ids/swab.h.id  1046075668      1017027161
+./include/.arch-ids/types.h.id 1046075668      1017027162
+./include/.arch-ids/yaboot.h.id        1046075668      1017027162
+./include/.arch-ids/debug.h.id 1046075668      1017154770
+./include/.arch-ids    1046258742      1017154770
+./include/asm/.arch-ids/=id    1046075668      1017027153
+./include/asm/.arch-ids/elf.h.id       1046075668      1017027153
+./include/asm/.arch-ids/ppc_asm.tmpl.id        1046075668      1017027153
+./include/asm/.arch-ids/processor.h.id 1046075668      1017027154
+./include/asm/.arch-ids        1046258742      1017027154
+./include/asm/elf.h    1046075668      1000991730
+./include/asm/ppc_asm.tmpl     1046075668      1000991730
+./include/asm/processor.h      1046075668      1000991730
+./include/asm  1046258742      1007269243
+./include/et/.arch-ids/=id     1046075669      1017027155
+./include/et/.arch-ids/com_err.h.id    1046075669      1017027155
+./include/et/.arch-ids 1046258742      1017155400
+./include/et/com_err.h 1046075669      1000991731
+./include/et   1046258742      1007269243
+./include/ext2fs/.arch-ids/=id 1046075669      1017027156
+./include/ext2fs/.arch-ids/bitops.h.id 1046075669      1017027156
+./include/ext2fs/.arch-ids/ext2_err.h.id       1046075669      1017027156
+./include/ext2fs/.arch-ids/ext2_io.h.id        1046075669      1017027156
+./include/ext2fs/.arch-ids/ext2fs.h.id 1046075669      1017027156
+./include/ext2fs/.arch-ids     1046258742      1017027156
+./include/ext2fs/bitops.h      1046075669      1003927524
+./include/ext2fs/ext2_err.h    1046075669      1003927524
+./include/ext2fs/ext2_io.h     1046075669      1003927524
+./include/ext2fs/ext2fs.h      1046075669      1003927524
+./include/ext2fs       1046258742      1007269243
+./include/linux/.arch-ids/=id  1046075669      1017027157
+./include/linux/.arch-ids/elf.h.id     1046075669      1017027158
+./include/linux/.arch-ids/ext2_fs.h.id 1046075669      1017027158
+./include/linux/.arch-ids/iso_fs.h.id  1046075669      1017027158
+./include/linux/.arch-ids/stat.h.id    1046075669      1017027158
+./include/linux/.arch-ids/types.h.id   1046075669      1017027159
+./include/linux/.arch-ids      1046258742      1017027159
+./include/linux/elf.h  1046075669      1000991731
+./include/linux/ext2_fs.h      1046075669      1000991731
+./include/linux/iso_fs.h       1046075669      1000991731
+./include/linux/stat.h 1046075669      1000991731
+./include/linux/types.h        1046075669      1000991731
+./include/linux        1046258742      1007269243
+./include/reiserfs/.arch-ids/=id       1046075669      1017027160
+./include/reiserfs/.arch-ids/reiserfs.h.id     1046075669      1017027160
+./include/reiserfs/.arch-ids   1046258742      1017027160
+./include/reiserfs/reiserfs.h  1046075669      1025684115
+./include/reiserfs     1046258742      1025684115
+./include/errors.h     1046075669      1007200690
+./include/bootinfo.h   1046075669      1007200690
+./include/byteorder.h  1046075669      1000991730
+./include/cfg.h        1046075669      1007200690
+./include/cmdline.h    1046075669      1007200690
+./include/ctype.h      1046075669      1003656411
+./include/fdisk-part.h 1046075669      1007200690
+./include/file.h       1046075669      1007200690
+./include/fs.h 1046075669      1007200690
+./include/mac-part.h   1046075669      1007200690
+./include/md5.h        1046075669      1000991730
+./include/partition.h  1046075669      1007200690
+./include/prom.h       1046075669      1007200690
+./include/setjm2.h     1046075669      1000991730
+./include/setjmp.h     1046075669      1000991730
+./include/stdlib.h     1046075669      1000991730
+./include/string.h     1046075669      1002620217
+./include/swab.h       1046075669      1000991730
+./include/types.h      1046075669      1000991730
+./include/yaboot.h     1046075669      1007200690
+./include/debug.h      1046075669      1007200690
+./include      1046258742      1007269244
+./second/.arch-ids/fs_xfs.c.id 1046075669      1017069120
+./second/.arch-ids/=id 1046075669      1017027166
+./second/.arch-ids/cache.S.id  1046075669      1017027167
+./second/.arch-ids/cfg.c.id    1046075669      1017027167
+./second/.arch-ids/cmdline.c.id        1046075669      1017027167
+./second/.arch-ids/crt0.S.id   1046075669      1017027167
+./second/.arch-ids/file.c.id   1046075669      1017027167
+./second/.arch-ids/fs.c.id     1046075669      1017027168
+./second/.arch-ids/fs_ext2.c.id        1046075669      1017027168
+./second/.arch-ids/fs_iso.c.id 1046075669      1017027168
+./second/.arch-ids/fs_of.c.id  1046075669      1017027168
+./second/.arch-ids/fs_reiserfs.c.id    1046075669      1017027169
+./second/.arch-ids/iso_util.c.id       1046075669      1017027170
+./second/.arch-ids/md5.c.id    1046075669      1017027170
+./second/.arch-ids/partition.c.id      1046075669      1017027170
+./second/.arch-ids/prom.c.id   1046075669      1017027170
+./second/.arch-ids/setjmp.S.id 1046075669      1017027171
+./second/.arch-ids/yaboot.c.id 1046075669      1017027171
+./second/.arch-ids     1046258742      1017069120
+./second/fs_xfs.c      1046075669      1032059541
+./second/cache.S       1046075669      1007200690
+./second/cfg.c 1046075669      1007200690
+./second/cmdline.c     1046075669      1032059589
+./second/crt0.S        1046075669      1000991731
+./second/fs.c  1046075669      1032059574
+./second/fs_ext2.c     1046075669      1032059564
+./second/fs_iso.c      1046075669      1007200690
+./second/fs_of.c       1046075792      1032059553
+./second/fs_reiserfs.c 1046075669      1007200690
+./second/iso_util.c    1046075669      1003656415
+./second/md5.c 1046075669      1032059532
+./second/partition.c   1046075669      1032059525
+./second/prom.c        1046075756      1032059515
+./second/setjmp.S      1046075669      1000991732
+./second/yaboot.c      1046075669      1032059504
+./second/file.c        1046075669      1044868693
+./second       1046258742      1044870683
+./.arch-ids/Config.id  1046075669      1017069133
+./.arch-ids/0arch-timestamps0.id       1046075669      1020516949
+./.arch-ids/ChangeLog.id       1046075669      1017026820
+./.arch-ids/BUGS.id    1046075669      1017027147
+./.arch-ids/COPYING.id 1046075669      1017027147
+./.arch-ids/INSTALL.id 1046075669      1017027147
+./.arch-ids/Makefile.id        1046075669      1017027148
+./.arch-ids/README.id  1046075669      1017027148
+./.arch-ids/README.man.patch.id        1046075669      1017027148
+./.arch-ids/THANKS.id  1046075669      1017027148
+./.arch-ids/TODO.id    1046075669      1017027149
+./.arch-ids/changelog.id       1046075669      1017027149
+./.arch-ids/man.patch.id       1046075669      1017027166
+./.arch-ids    1046258742      1020516949
+./doc/.arch-ids/=id    1046075669      1017027149
+./doc/.arch-ids/README.ofboot.id       1046075669      1017027149
+./doc/.arch-ids/README.ofpath.id       1046075669      1017027149
+./doc/.arch-ids/README.rs6000.id       1046075669      1017027150
+./doc/.arch-ids/Makefile.id    1046075669      1017235762
+./doc/.arch-ids/yaboot-howto.sgml.id   1046075669      1017235765
+./doc/.arch-ids/yaboot-howto.de.sgml.id        1046075669      1017238100
+./doc/.arch-ids        1046258742      1017238100
+./doc/examples/.arch-ids/=id   1046075669      1017027150
+./doc/examples/.arch-ids/README.dualboot.chrp.id       1046075669      1017027150
+./doc/examples/.arch-ids/README.mbicons.id     1046075669      1017027150
+./doc/examples/.arch-ids/README.simpleboot.chrp.id     1046075669      1017027150
+./doc/examples/.arch-ids/dualboot.chrp.id      1046075669      1017027151
+./doc/examples/.arch-ids/large-penguin.mbicon.id       1046075669      1017027151
+./doc/examples/.arch-ids/simpleboot.chrp.id    1046075669      1017027151
+./doc/examples/.arch-ids/yaboot.conf.multi-boot.id     1046075669      1017027151
+./doc/examples/.arch-ids/yaboot.conf.rs6000.id 1046075669      1017027152
+./doc/examples/.arch-ids       1046258742      1017236175
+./doc/examples/README.dualboot.chrp    1046075669      1000991730
+./doc/examples/README.mbicons  1046075669      1000991730
+./doc/examples/README.simpleboot.chrp  1046075669      1000991730
+./doc/examples/dualboot.chrp   1046075669      1044766918
+./doc/examples/large-penguin.mbicon    1046075669      1000991730
+./doc/examples/simpleboot.chrp 1046075669      1044766860
+./doc/examples/yaboot.conf.multi-boot  1046075669      1006348765
+./doc/examples/yaboot.conf.rs6000      1046075669      1006348765
+./doc/examples 1046258742      1044766918
+./doc/README.ofboot    1046075669      1000991730
+./doc/README.ofpath    1046075669      1000991730
+./doc/README.rs6000    1046075669      1007200689
+./doc/Makefile 1046075669      1019310768
+./doc/yaboot-howto.sgml        1046075669      1032059987
+./doc/yaboot-howto.de.sgml     1046075669      1032059970
+./doc  1046258742      1032059987
+./etc/.arch-ids/=id    1046075669      1017027152
+./etc/.arch-ids/yaboot.conf.id 1046075669      1017027152
+./etc/.arch-ids        1046258742      1017027152
+./etc/yaboot.conf      1046075669      1006348765
+./etc  1046258742      1007269243
+./first/.arch-ids/=id  1046075669      1017027152
+./first/.arch-ids/ofboot.id    1046075669      1017027152
+./first/.arch-ids      1046258742      1017027152
+./first/ofboot 1046075669      1044766440
+./first        1046258742      1044766440
+./lib/.arch-ids/=id    1046075669      1017027162
+./lib/.arch-ids/ctype.c.id     1046075669      1017027163
+./lib/.arch-ids/libext2fs.a.id 1046075669      1017027163
+./lib/.arch-ids/malloc.c.id    1046075669      1017027163
+./lib/.arch-ids/nosys.c.id     1046075669      1017027163
+./lib/.arch-ids/string.S.id    1046075669      1017027163
+./lib/.arch-ids/strstr.c.id    1046075669      1017027164
+./lib/.arch-ids/strtol.c.id    1046075669      1017027164
+./lib/.arch-ids/vsprintf.c.id  1046075669      1017027164
+./lib/.arch-ids        1046258742      1017027164
+./lib/ctype.c  1046075669      1000991731
+./lib/libext2fs.a      1046075669      1003927524
+./lib/malloc.c 1046075669      1007200690
+./lib/nosys.c  1046075669      1000991731
+./lib/string.S 1046075669      1007200690
+./lib/strstr.c 1046075669      1000991731
+./lib/strtol.c 1046075669      1000991731
+./lib/vsprintf.c       1046075669      1000991731
+./lib  1046258742      1044870683
+./man/.arch-ids/=id    1046075669      1017027164
+./man/.arch-ids/bootstrap.8.id 1046075669      1017027165
+./man/.arch-ids/mkofboot.8.id  1046075669      1017027165
+./man/.arch-ids/ofpath.8.id    1046075669      1017027165
+./man/.arch-ids/yaboot.8.id    1046075669      1017027165
+./man/.arch-ids/yaboot.conf.5.id       1046075669      1017027166
+./man/.arch-ids/yabootconfig.8.id      1046075669      1017027166
+./man/.arch-ids/ybin.8.id      1046075669      1017027166
+./man/.arch-ids        1046258742      1017027166
+./man/bootstrap.8      1046075669      1000991731
+./man/mkofboot.8       1046075669      1006348765
+./man/ofpath.8 1046075669      1000991731
+./man/yaboot.8 1046075669      1006348765
+./man/yaboot.conf.5    1046075669      1004256691
+./man/yabootconfig.8   1046075669      1027929577
+./man/ybin.8   1046075669      1006348765
+./man  1046258742      1027929577
+./util/.arch-ids/=id   1046075669      1017027171
+./util/.arch-ids/addnote.c.id  1046075669      1017027171
+./util/.arch-ids/elfextract.c.id       1046075669      1017027172
+./util/.arch-ids       1046258742      1017027172
+./util/addnote.c       1046075669      1007200691
+./util/elfextract.c    1046075669      1007303237
+./util 1046258742      1044870683
+./ybin/.arch-ids/=id   1046075669      1017027172
+./ybin/.arch-ids/mkofboot.id   1046075669      1017027172
+./ybin/.arch-ids/ofpath.id     1046075669      1017027172
+./ybin/.arch-ids/yabootconfig.id       1046075669      1017027172
+./ybin/.arch-ids/ybin.id       1046075669      1017027173
+./ybin/.arch-ids       1046258742      1017027173
+./ybin/ofpath  1046258633      1046258628
+./ybin/yabootconfig    1046075669      1044766426
+./ybin/ybin    1046258640      1046258646
+./ybin/mkofboot        1046075669      1044870737
+./ybin 1046258742      1046258646
+./Config       1046075669      1002101497
+./0arch-timestamps0    1046075669      1046258742
+./ChangeLog    1046075669      1045040147
+./BUGS 1046075669      1000991730
+./COPYING      1046075669      1000991730
+./INSTALL      1046075669      1000991730
+./README       1046075669      1044766458
+./README.man.patch     1046075669      1000991730
+./THANKS       1046075669      1006350263
+./TODO 1046075669      1044766566
+./changelog    1046258655      1046258737
+./man.patch    1046075669      1006348761
+./Makefile     1046258648      1046258652
+.      1046258742      1046258737

diff --git a/ChangeLog b/ChangeLog
index b2784172368654d712aa32227f2b21931d0d8bb9..8211903177210fca3e898d5cad730b6da67cb51e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,23 @@
 # tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3
 #
 
+2003-02-26 11:27:33 GMT        Ethan Benson <erbenson@alaska.net>      patch-50
+
+    Summary:
+      Fix ofpath on early iMacs
+    Revision:
+      yaboot--devel--1.3--patch-50
+
+    * ofpath: Apple apparently can't decide whether its called `ata'
+      or `ide'; fix support for early iMac models.
+    
+    * Prep 1.3.10.
+
+    modified files:
+     0arch-timestamps0 ChangeLog Makefile changelog
+     ybin/ofpath ybin/ybin
+
+
 2003-02-12 08:55:45 GMT        Ethan Benson <erbenson@alaska.net>      patch-49
 
     Summary:

diff --git a/Makefile b/Makefile
index 733fb39f240216cc8c6f773f37b8afe88049c782..65ef0ab72315e4a0c863b9e56b8efff08396baaa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 include Config
 
-VERSION = 1.3.9
+VERSION = 1.3.10
 # Debug mode (spam/verbose)
 DEBUG = 0
 # make install vars

diff --git a/changelog b/changelog
index 64ce6ead81c3c7890291adb1a8f6c16b2782e758..92d312884567c2f89f1997e3db863cdc8837440b 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+2003-02-26  Ethan Benson  <erbenson@alaska.net>
+
+       * Version 1.3.10
+
+       * ofpath: Apple apparently can't decide whether its called `ata'
+         or `ide'; fix support for early iMac models.
+
 2003-02-12  Ethan Benson  <erbenson@alaska.net>
 
        * Version 1.3.9

diff --git a/ybin/ofpath b/ybin/ofpath
index 46bd7345bd1989c34fd70f8563485c7982a36b13..387bf900659cd9570d271f5eeff84285223fe904 100755 (executable)
--- 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
+VERSION=1.0.4
 DEBUG=0
 export LC_COLLATE=C
 
@@ -346,7 +346,7 @@ ide_ofpath()
        fi
 
        case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in
-           ata)
+           ide|ata)
                local MASTER="/disk@0"
                local SLAVE="/disk@1"
                ;;

diff --git a/ybin/ybin b/ybin/ybin
index e61c6ea037dda526e539c814156fc2d480e130a8..db252d297eb579e9feefeadb45cc82e75a1d6de3 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.9
+VERSION=1.3.10
 DEBUG=0
 VERBOSE=0
 TMP="${TMPDIR:-/tmp}"