rpms/yaboot/devel yaboot-1.3.13-amigaparts.patch, 1.1, 1.2 yaboot-1.3.13-gcc34.patch, 1.1, 1.2 yaboot-1.3.13-nobootx.patch, 1.1, 1.2 yaboot-1.3.13-swraid1.patch, 1.1, 1.2 yaboot-1.3.13-swraid2.patch, 1.1, 1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jul 25 20:09:48 UTC 2005
Author: pnasrat
Update of /cvs/dist/rpms/yaboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4268
Modified Files:
yaboot-1.3.13-amigaparts.patch yaboot-1.3.13-gcc34.patch
yaboot-1.3.13-nobootx.patch yaboot-1.3.13-swraid1.patch
yaboot-1.3.13-swraid2.patch
Log Message:
fixup patches
yaboot-1.3.13-amigaparts.patch:
partition.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 110 insertions(+)
Index: yaboot-1.3.13-amigaparts.patch
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot-1.3.13-amigaparts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yaboot-1.3.13-amigaparts.patch 25 Jul 2005 15:50:54 -0000 1.1
+++ yaboot-1.3.13-amigaparts.patch 25 Jul 2005 20:09:44 -0000 1.2
@@ -1,42 +1,5 @@
-* added files
-
- include/.arch-ids/amiga-part.h.id
- include/amiga-part.h
- {arch}/yaboot/yaboot--devel/yaboot--devel--1.3/erbenson at alaska.net--public/patch-log/patch-80
-
-* modified files
-
-
-
---- orig/ChangeLog
-+++ mod/ChangeLog
-@@ -2,6 +2,22 @@
- # arch-tag: automatic-ChangeLog--erbenson at alaska.net--public/yaboot--devel--1.3
- #
-
-+2005-05-20 03:10:03 GMT Ethan Benson <erbenson at alaska.net> patch-80
-+
-+ Summary:
-+ amiga partition table support.
-+ Revision:
-+ yaboot--devel--1.3--patch-80
-+
-+ * Support for amiga partition tables. (Sven Luther)
-+
-+ new files:
-+ include/.arch-ids/amiga-part.h.id include/amiga-part.h
-+
-+ modified files:
-+ 0arch-timestamps0 ChangeLog second/partition.c
-+
-+
- 2005-05-19 04:26:37 GMT Ethan Benson <erbenson at alaska.net> patch-79
-
- Summary:
-
-
---- orig/second/partition.c
-+++ mod/second/partition.c
+--- yaboot-1.3.13/second/partition.c.amigaparts 2002-09-14 23:12:05.000000000 -0400
++++ yaboot-1.3.13/second/partition.c 2005-07-25 16:03:32.000000000 -0400
@@ -1,6 +1,8 @@
/*
* partition.c - partition table support
@@ -175,6 +138,3 @@
} else {
prom_printf("No supported partition table detected\n");
goto bail;
-
-
-
yaboot-1.3.13-gcc34.patch:
strstr.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
Index: yaboot-1.3.13-gcc34.patch
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot-1.3.13-gcc34.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yaboot-1.3.13-gcc34.patch 25 Jul 2005 15:50:54 -0000 1.1
+++ yaboot-1.3.13-gcc34.patch 25 Jul 2005 20:09:44 -0000 1.2
@@ -1,37 +1,5 @@
-* added files
-
- {arch}/yaboot/yaboot--devel/yaboot--devel--1.3/erbenson at alaska.net--public/patch-log/patch-79
-
-* modified files
-
-
-
---- orig/ChangeLog
-+++ mod/ChangeLog
-@@ -2,6 +2,19 @@
- # arch-tag: automatic-ChangeLog--erbenson at alaska.net--public/yaboot--devel--1.3
- #
-
-+2005-05-19 04:26:37 GMT Ethan Benson <erbenson at alaska.net> patch-79
-+
-+ Summary:
-+ gcc-3.4 fix
-+ Revision:
-+ yaboot--devel--1.3--patch-79
-+
-+ * GCC 3.4 compilation fix. (Paul Nasrat)
-+
-+ modified files:
-+ 0arch-timestamps0 ChangeLog lib/strstr.c
-+
-+
- 2005-02-02 05:26:31 GMT Ethan Benson <erbenson at alaska.net> patch-78
-
- Summary:
-
-
---- orig/lib/strstr.c
-+++ mod/lib/strstr.c
+--- yaboot-1.3.13/lib/strstr.c.gcc34 2001-09-20 09:15:31.000000000 -0400
++++ yaboot-1.3.13/lib/strstr.c 2005-07-25 16:02:23.000000000 -0400
@@ -76,7 +76,8 @@
a = *++haystack;
if (a == '\0')
@@ -42,6 +10,3 @@
while (a != b);
jin: a = *++haystack;
-
-
-
yaboot-1.3.13-nobootx.patch:
ofpath | 8 --------
1 files changed, 8 deletions(-)
Index: yaboot-1.3.13-nobootx.patch
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot-1.3.13-nobootx.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yaboot-1.3.13-nobootx.patch 25 Jul 2005 15:50:54 -0000 1.1
+++ yaboot-1.3.13-nobootx.patch 25 Jul 2005 20:09:44 -0000 1.2
@@ -1,39 +1,5 @@
-* added files
-
- {arch}/yaboot/yaboot--devel/yaboot--devel--1.3/erbenson at alaska.net--public/patch-log/patch-82
-
-* modified files
-
-
-
---- orig/ChangeLog
-+++ mod/ChangeLog
-@@ -2,6 +2,21 @@
- # arch-tag: automatic-ChangeLog--erbenson at alaska.net--public/yaboot--devel--1.3
- #
-
-+2005-07-04 03:42:18 GMT Ethan Benson <erbenson at alaska.net> patch-82
-+
-+ Summary:
-+ Remove check for BootX broken device-trees
-+ Revision:
-+ yaboot--devel--1.3--patch-82
-+
-+ * ybin/ofpath: Remove check for broken-by-BootX device-tree, it no
-+ longer works under current 2.6 kernels and nobody attempts to use
-+ BootX anymore.
-+
-+ modified files:
-+ 0arch-timestamps0 ChangeLog ybin/ofpath
-+
-+
- 2005-07-04 03:34:00 GMT Ethan Benson <erbenson at alaska.net> patch-81
-
- Summary:
-
-
---- orig/ybin/ofpath
-+++ mod/ybin/ofpath
+--- yaboot-1.3.13/ybin/ofpath.nobootx 2004-07-11 16:12:42.000000000 -0400
++++ yaboot-1.3.13/ybin/ofpath 2005-07-25 16:05:57.000000000 -0400
@@ -425,14 +425,6 @@
{
case "$DEVNODE" in
@@ -49,6 +15,3 @@
## use common scsiinfo function to get info we need.
scsiinfo || return 1
-
-
-
yaboot-1.3.13-swraid1.patch:
ybin | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletion(-)
Index: yaboot-1.3.13-swraid1.patch
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot-1.3.13-swraid1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yaboot-1.3.13-swraid1.patch 25 Jul 2005 15:50:54 -0000 1.1
+++ yaboot-1.3.13-swraid1.patch 25 Jul 2005 20:09:44 -0000 1.2
@@ -1,38 +1,5 @@
-* added files
-
- {arch}/yaboot/yaboot--devel/yaboot--devel--1.3/erbenson at alaska.net--public/patch-log/patch-81
-
-* modified files
-
-
-
---- orig/ChangeLog
-+++ mod/ChangeLog
-@@ -2,6 +2,20 @@
- # arch-tag: automatic-ChangeLog--erbenson at alaska.net--public/yaboot--devel--1.3
- #
-
-+2005-07-04 03:34:00 GMT Ethan Benson <erbenson at alaska.net> patch-81
-+
-+ Summary:
-+ Merge Dustin's RAID patch
-+ Revision:
-+ yaboot--devel--1.3--patch-81
-+
-+ * ybin/ybin: Allow for multiple bootstrap partitions. Patch by Dustin
-+ Kirkland. May not fully work on PMAC hardware.
-+
-+ modified files:
-+ 0arch-timestamps0 ChangeLog ybin/ybin
-+
-+
- 2005-05-20 03:10:03 GMT Ethan Benson <erbenson at alaska.net> patch-80
-
- Summary:
-
-
---- orig/ybin/ybin
-+++ mod/ybin/ybin
+--- yaboot-1.3.13/ybin/ybin.swraid1 2004-07-11 16:12:12.000000000 -0400
++++ yaboot-1.3.13/ybin/ybin 2005-07-25 16:05:01.000000000 -0400
@@ -27,6 +27,7 @@
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
@@ -210,6 +177,3 @@
## ffs!! rtfm! foad!
if [ "$boot" = unconfigured ] ; then
echo 1>&2 "$PRG: You must specify the device for the bootstrap partition. (ie: boot=/dev/hdaX)"
-
-
-
yaboot-1.3.13-swraid2.patch:
include/fdisk-part.h | 1 +
include/partition.h | 1 +
second/fs_of.c | 8 ++++++++
second/partition.c | 17 +++++++++++------
4 files changed, 21 insertions(+), 6 deletions(-)
Index: yaboot-1.3.13-swraid2.patch
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot-1.3.13-swraid2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yaboot-1.3.13-swraid2.patch 25 Jul 2005 15:50:54 -0000 1.1
+++ yaboot-1.3.13-swraid2.patch 25 Jul 2005 20:09:44 -0000 1.2
@@ -1,90 +1,5 @@
-* added files
-
- {arch}/yaboot/yaboot--devel/yaboot--devel--1.3/erbenson at alaska.net--public/patch-log/patch-83
-
-* modified files
-
-
-
---- orig/ChangeLog
-+++ mod/ChangeLog
-@@ -2,6 +2,22 @@
- # arch-tag: automatic-ChangeLog--erbenson at alaska.net--public/yaboot--devel--1.3
- #
-
-+2005-07-09 23:51:20 GMT Ethan Benson <erbenson at alaska.net> patch-83
-+
-+ Summary:
-+ handle RAID partitions on x86 partition tables
-+ Revision:
-+ yaboot--devel--1.3--patch-83
-+
-+ * Support reading of type RAID partitions, except from fs_of.
-+ This only works on x86 partition tables, Pmac partition tables will
-+ need alternate methods. (Patch from Dustin Kirkland).
-+
-+ modified files:
-+ 0arch-timestamps0 ChangeLog include/fdisk-part.h
-+ include/partition.h second/fs_of.c second/partition.c
-+
-+
- 2005-07-04 03:42:18 GMT Ethan Benson <erbenson at alaska.net> patch-82
-
- Summary:
-
-
---- orig/include/fdisk-part.h
-+++ mod/include/fdisk-part.h
-@@ -27,6 +27,7 @@
- #define LINUX_SWAP 0x82
- #define LINUX_NATIVE 0x83
- #define LINUX_EXTENDED 0x85
-+#define LINUX_RAID 0xfd
-
- struct fdisk_partition {
- unsigned char boot_ind; /* 0x80 - active */
-
-
---- orig/include/partition.h
-+++ mod/include/partition.h
-@@ -40,6 +40,7 @@
- unsigned long part_start; /* In blocks */
- unsigned long part_size; /* In blocks */
- unsigned short blocksize;
-+ int sys_ind; /* fs type */
- };
-
- extern struct partition_t* partitions_lookup(const char *device);
-
-
---- orig/second/fs_of.c
-+++ mod/second/fs_of.c
-@@ -39,6 +39,7 @@
- #include "prom.h"
- #include "string.h"
- #include "partition.h"
-+#include "fdisk-part.h"
- #include "fs.h"
- #include "errors.h"
- #include "debug.h"
-@@ -89,6 +90,13 @@
- DEBUG_ENTER;
- DEBUG_OPEN;
-
-+ if (part->sys_ind == LINUX_RAID)
-+ {
-+ DEBUG_F("skipping because partition is marked LINUX_RAID\n");
-+ DEBUG_LEAVE(FILE_ERR_BAD_FSYS);
-+ return FILE_ERR_BAD_FSYS;
-+ }
-+
- strncpy(buffer, dev_name, 768);
- strcat(buffer, ":");
- if (part) {
-
-
---- orig/second/partition.c
-+++ mod/second/partition.c
+--- yaboot-1.3.13/second/partition.c.swraid2 2005-07-25 16:09:39.000000000 -0400
++++ yaboot-1.3.13/second/partition.c 2005-07-25 16:09:39.000000000 -0400
@@ -67,7 +67,7 @@
static void
add_new_partition(struct partition_t** list, int part_number, const char *part_type,
@@ -150,6 +65,47 @@
prom_printf("ISO9660 disk\n");
} else if (_amiga_find_rdb(device, disk, prom_blksize) != -1) {
/* amiga partition format */
-
-
-
+--- yaboot-1.3.13/second/fs_of.c.swraid2 2004-07-11 15:54:53.000000000 -0400
++++ yaboot-1.3.13/second/fs_of.c 2005-07-25 16:09:39.000000000 -0400
+@@ -39,6 +39,7 @@
+ #include "prom.h"
+ #include "string.h"
+ #include "partition.h"
++#include "fdisk-part.h"
+ #include "fs.h"
+ #include "errors.h"
+ #include "debug.h"
+@@ -89,6 +90,13 @@
+ DEBUG_ENTER;
+ DEBUG_OPEN;
+
++ if (part->sys_ind == LINUX_RAID)
++ {
++ DEBUG_F("skipping because partition is marked LINUX_RAID\n");
++ DEBUG_LEAVE(FILE_ERR_BAD_FSYS);
++ return FILE_ERR_BAD_FSYS;
++ }
++
+ strncpy(buffer, dev_name, 768);
+ strcat(buffer, ":");
+ if (part) {
+--- yaboot-1.3.13/include/partition.h.swraid2 2001-12-01 04:58:10.000000000 -0500
++++ yaboot-1.3.13/include/partition.h 2005-07-25 16:09:39.000000000 -0400
+@@ -40,6 +40,7 @@
+ unsigned long part_start; /* In blocks */
+ unsigned long part_size; /* In blocks */
+ unsigned short blocksize;
++ int sys_ind; /* fs type */
+ };
+
+ extern struct partition_t* partitions_lookup(const char *device);
+--- yaboot-1.3.13/include/fdisk-part.h.swraid2 2001-12-01 04:58:10.000000000 -0500
++++ yaboot-1.3.13/include/fdisk-part.h 2005-07-25 16:09:39.000000000 -0400
+@@ -27,6 +27,7 @@
+ #define LINUX_SWAP 0x82
+ #define LINUX_NATIVE 0x83
+ #define LINUX_EXTENDED 0x85
++#define LINUX_RAID 0xfd
+
+ struct fdisk_partition {
+ unsigned char boot_ind; /* 0x80 - active */
More information about the fedora-cvs-commits
mailing list