rpms/yaboot/devel yaboot-1.3.13-amigaparts.patch,1.3,1.4

[fedora-cvs-commits redhat com]

Author: pnasrat

Update of /cvs/dist/rpms/yaboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4345

Modified Files:
	yaboot-1.3.13-amigaparts.patch 
Log Message:
fixup

yaboot-1.3.13-amigaparts.patch:
 include/amiga-part.h |   42 +++++++++++++++++++
 second/partition.c   |  110 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 152 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yaboot-1.3.13-amigaparts.patch	25 Jul 2005 20:46:57 -0000	1.3
+++ yaboot-1.3.13-amigaparts.patch	25 Jul 2005 20:56:35 -0000	1.4
@@ -1,5 +1,5 @@
 --- 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:31:32.000000000 -0400
++++ yaboot-1.3.13/second/partition.c	2005-07-25 16:54:22.000000000 -0400
 @@ -1,6 +1,8 @@
  /*
   *  partition.c - partition table support
@@ -17,52 +17,7 @@
  #include "partition.h"
  #include "prom.h"
  #include "string.h"
-@@ -64,7 +67,7 @@
- static void
- add_new_partition(struct partition_t**	list, int part_number, const char *part_type,
- 		  const char *part_name, unsigned long part_start, unsigned long part_size,
--		  unsigned short part_blocksize)
-+		  unsigned short part_blocksize, int sys_ind)
- {
-      struct partition_t*	part;
-      part = (struct partition_t*)malloc(sizeof(struct partition_t));
-@@ -75,6 +78,7 @@
-      part->part_start = part_start;
-      part->part_size = part_size;
-      part->blocksize = part_blocksize;
-+     part->sys_ind = sys_ind;
- 
-      /* Tack this entry onto the list */
-      part->next = *list;
-@@ -146,7 +150,8 @@
- 		    part->name, /* name */
- 		    part->start_block + part->data_start, /* start */
- 		    part->data_count, /* size */
--		    ptable_block_size );
-+		    ptable_block_size,
-+		    0);
-      }
- }
- 
-@@ -167,14 +172,15 @@
- 	  (struct fdisk_partition *) (block_buffer + 0x1be);
- 
-      for (partition=1; partition <= 4 ;partition++, part++) {
--	  if (part->sys_ind == LINUX_NATIVE) {
-+	  if (part->sys_ind == LINUX_NATIVE || part->sys_ind == LINUX_RAID) {
- 	       add_new_partition(  list,
- 				   partition,
- 				   "Linux", /* type */
- 				   '\0', /* name */
- 				   swab32(*(unsigned int *)(part->start4)),
- 				   swab32(*(unsigned int *)(part->size4)),
--				   512 /*blksize*/ );
-+				   512 /*blksize*/,
-+				   part->sys_ind /* partition type */ );
- 	  }
-      }
- }
-@@ -213,6 +219,111 @@
+@@ -213,6 +216,110 @@
       return 0;
  }
  
@@ -166,21 +121,16 @@
 +		    '\0', /* name */
 +		    blockspercyl * amiga_block[AMIGA_PART_LOWCYL], /* start */
 +		    blockspercyl * (amiga_block[AMIGA_PART_HIGHCYL] - amiga_block[AMIGA_PART_LOWCYL] + 1), /* size */
-+		    prom_blksize,
-+		    0 );
++		    prom_blksize );
 +	}
 +}
 +
  struct partition_t*
  partitions_lookup(const char *device)
  {
-@@ -258,8 +369,12 @@
- 			    '\0',
- 			    iso_root_block,
+@@ -260,6 +367,9 @@
  			    0,
--			    prom_blksize);
-+			    prom_blksize,
-+			    0);
+ 			    prom_blksize);
  	  prom_printf("ISO9660 disk\n");
 +     } else if (_amiga_find_rdb(device, disk, prom_blksize) != -1) {
 +	  /* amiga partition format */
@@ -188,8 +138,8 @@
       } else {
  	  prom_printf("No supported partition table detected\n");
  	  goto bail;
---- yaboot-1.3.13/include/amiga-part.h.amigaparts	2005-07-25 16:46:13.000000000 -0400
-+++ yaboot-1.3.13/include/amiga-part.h	2005-07-25 16:45:48.000000000 -0400
+--- yaboot-1.3.13/include/amiga-part.h.amigaparts	2005-07-25 16:55:05.000000000 -0400
++++ yaboot-1.3.13/include/amiga-part.h	2005-07-25 16:54:59.000000000 -0400
 @@ -0,0 +1,42 @@
 +/*
 + *  amiga-part.h - Structure of amiga partition table