Re: [gentoo-amd64] mac-fdisk - anyone using it on AMD64?

> 8    16   80418240 sdb
>    8    27          8 sdb11

it's very possible that the mini creates "extra" partitions for some type
of resource management.

This is how I installed mac-fdisk-0.1-r4:

  $ FEATURES=keepwork ACCEPT_KEYWORDS="~x86" emerge -avt mac-fdisk

Here's the patch, same instructions as before. I also added some other
stuff to fix the warnings that were popping up.

--cut here--
diff -ru mac-fdisk-0.1/errors.c /tmp/mac-fdisk-0.1/errors.c
--- mac-fdisk-0.1/errors.c	1997-01-14 15:29:39.000000000 -0500
+++ /tmp/mac-fdisk-0.1/errors.c	2005-10-19 21:49:03.000000000 -0400
@@ -115,11 +115,7 @@
     va_end(ap);

 #ifdef __linux__
-    if (value > 0 && value < sys_nerr) {
-	fprintf(stderr, "  (%s)\n", sys_errlist[value]);
-    } else {
-	fprintf(stderr, "\n");
-    }
+    fprintf(stderr, "  (%s)\n", strerror(value));
 #else
     fprintf(stderr, "\n");
 #endif
@@ -144,11 +140,7 @@
     va_end(ap);

 #ifdef __linux__
-    if (value > 0 && value < sys_nerr) {
-	fprintf(stderr, "  (%s)\n", sys_errlist[value]);
-    } else {
-	fprintf(stderr, "\n");
-    }
+    fprintf(stderr, "  (%s)\n", strerror(value));
 #else
     fprintf(stderr, "\n");
 #endif
diff -ru mac-fdisk-0.1/fdisk.c /tmp/mac-fdisk-0.1/fdisk.c
--- mac-fdisk-0.1/fdisk.c	2005-10-19 21:51:48.000000000 -0400
+++ /tmp/mac-fdisk-0.1/fdisk.c	2005-10-19 21:44:22.000000000 -0400
@@ -1415,7 +1415,7 @@
 	}
 }

-void main(int argc, char **argv)
+int main(int argc, char **argv)
 {
 	if (argc > 3)
 		fatal(usage);
diff -ru mac-fdisk-0.1/fdisklabel.c /tmp/mac-fdisk-0.1/fdisklabel.c
--- mac-fdisk-0.1/fdisklabel.c	2005-10-19 21:51:48.000000000 -0400
+++ /tmp/mac-fdisk-0.1/fdisklabel.c	2005-10-19 21:40:18.000000000 -0400
@@ -68,7 +68,7 @@
 static int bsd_readlabel  (struct partition *p, struct disklabel *d);
 static int bsd_writelabel (struct partition *p, struct disklabel *d);
 static void sync_disks (void);
-#if defined (i386)
+#if defined (i386) || defined (__x86_64__)
 static int bsd_translate_fstype (int linux_type);
 static void bsd_link_part (void);
 #endif
@@ -78,7 +78,7 @@

 static struct disklabel bsd_dlabel;
 static char buffer[BSD_BBSIZE];
-#if defined (i386)
+#if defined (i386) || defined (__x86_64__)
 static struct partition *bsd_part;
 static int bsd_part_index;
 #endif
@@ -95,13 +95,13 @@
 	"   n   add a new BSD partition\n"
 	"   p   print BSD partition table\n"
 	"   q   quit without saving changes\n"
-#if defined (i386)
+#if defined (i386) || defined (__x86_64__)
 	"   r   return to main menu\n"
 #endif
 	"   s   show complete disklabel\n"
 	"   t   change a partition's filesystem id\n"
 	"   w   write disklabel to disk\n"
-#if defined (i386)
+#if defined (i386) || defined (__x86_64__)
 	"   x   link BSD partition to non-BSD partition"
 #endif
 	);
@@ -110,7 +110,7 @@
 void
 bselect (void)
 {
-#if defined (i386)
+#if defined (i386) || defined (__x86_64__)
   int t;

   for (t=0; t<4; t++)
@@ -181,7 +181,7 @@
       case 'w':
 	bsd_write_disklabel ();
 	break;
-#if defined (i386)
+#if defined (i386) || defined (__x86_64__)
       case 'r':
 	return;
       case 'x':
@@ -219,7 +219,7 @@
   if (!bsd_check_new_partition (&i))
     return;

-#if defined (i386)
+#if defined (i386) || defined (__x86_64__)
   begin = bsd_part -> start_sect;
   end = begin + bsd_part -> nr_sects - 1;
 #elif defined (__alpha__) || defined (__powerpc__)
@@ -253,7 +253,7 @@

   if (show_all)
   {
-#if defined (i386)
+#if defined (i386) || defined (__x86_64__)
     fprintf(f, "# %s%d:\n", disk_device, bsd_part_index+1);
 #elif defined (__alpha__) || defined (__powerpc__)
     fprintf(f, "# %s:\n", disk_device);
@@ -348,7 +348,7 @@
 static void
 bsd_write_disklabel (void)
 {
-#if defined (i386)
+#if defined (i386) || defined (__x86_64__)
   printf ("Writing disklabel to %s%d.\n", disk_device, bsd_part_index+1);
   bsd_writelabel (bsd_part, &bsd_dlabel);
 #elif defined (__alpha__) || defined (__powerpc__)
@@ -362,7 +362,7 @@
 {
   char c;

-#if defined (i386)
+#if defined (i386) || defined (__x86_64__)
   fprintf (stderr, "%s%d contains no disklabel.\n",
 	   disk_device, bsd_part_index+1);
 #elif defined (__alpha__) || defined (__powerpc__)
@@ -372,7 +372,7 @@
   while (1)
     if ((c = tolower (read_char ("Do you want to create a disklabel? (y/n) "))) == 'y')
     {
-#if defined (i386)
+#if defined (i386) || defined (__x86_64__)
       if (bsd_initlabel (bsd_part, &bsd_dlabel, bsd_part_index) == 1)
 #elif defined (__alpha__) || defined (__powerpc__) || defined (__mc68000__)
       if (bsd_initlabel (NULL, &bsd_dlabel, 0) == 1)
@@ -503,7 +503,7 @@

   bcopy (&dl, d, sizeof (struct disklabel));

-#if defined (i386)
+#if defined (i386) || defined (__x86_64__)
   sector = bsd_part -> start_sect;
 #elif defined (__powerpc__)
   sector = 0;
@@ -517,7 +517,7 @@
   if (BSD_BBSIZE != write (fd, buffer, BSD_BBSIZE))
     fatal (unable_to_write);

-#if defined (i386)
+#if defined (i386) || defined (__x86_64__)
   printf ("Bootstrap installed on %s%d.\n", disk_device, bsd_part_index+1);
 #elif defined (__alpha__) || defined (__powerpc__)
   printf ("Bootstrap installed on %s.\n", disk_device);
@@ -621,7 +621,7 @@
   d -> d_subtype = BSD_DSTYPE_INDOSPART & pindex;
 #endif

-#if defined (i386)
+#if defined (i386) || defined (__x86_64__)
   d -> d_flags = BSD_D_DOSPART;
 #else
   d -> d_flags = 0;
@@ -644,7 +644,7 @@
   d -> d_bbsize = BSD_BBSIZE;
   d -> d_sbsize = BSD_SBSIZE;

-#if defined (i386)
+#if defined (i386) || defined (__x86_64__)
   d -> d_npartitions = 4;
   pp = &d -> d_partitions[2]; /* Partition C should be the NetBSD partition */
   pp -> p_offset = p -> start_sect;
@@ -670,7 +670,7 @@
 {
   int t, sector;

-#if defined (i386)
+#if defined (i386) || defined (__x86_64__)
   sector = p -> start_sect;
 #elif defined (__alpha__) || defined (__powerpc__)
   sector = 0;
@@ -704,7 +704,7 @@
 {
   int sector;

-#if defined (i386)
+#if defined (i386) || defined (__x86_64__)
   sector = p -> start_sect + BSD_LABELSECTOR;
 #elif defined (__alpha__) || defined (__powerpc__)
   sector = BSD_LABELSECTOR;
@@ -745,7 +745,7 @@
   sleep (4);
 }

-#if defined (i386)
+#if defined (i386) || defined (__x86_64__)
 static int
 bsd_translate_fstype (int linux_type)
 {
diff -ru mac-fdisk-0.1/fdisklabel.h /tmp/mac-fdisk-0.1/fdisklabel.h
--- mac-fdisk-0.1/fdisklabel.h	2005-10-19 21:51:48.000000000 -0400
+++ /tmp/mac-fdisk-0.1/fdisklabel.h	2005-10-19 21:39:20.000000000 -0400
@@ -35,7 +35,7 @@
 #define	BSD_MAXPARTITIONS 8
 #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"

-#if defined (i386)
+#if defined (i386) || defined (__x86_64__)
 #define BSD_LABELSECTOR   1
 #define BSD_LABELOFFSET   0
 #define	BSD_BBSIZE        8192		/* size of boot area, with label */
diff -ru mac-fdisk-0.1/kernel-defs.h /tmp/mac-fdisk-0.1/kernel-defs.h
--- mac-fdisk-0.1/kernel-defs.h	2005-10-19 21:51:48.000000000 -0400
+++ /tmp/mac-fdisk-0.1/kernel-defs.h	2005-10-19 21:42:25.000000000 -0400
@@ -15,8 +15,8 @@
 /* from asm/ioctl.h */
 #define _IOC_NRBITS	8
 #define _IOC_TYPEBITS	8
-#define _IOC_SIZEBITS	13
-#define _IOC_DIRBITS	3
+// #define _IOC_SIZEBITS	13
+// #define _IOC_DIRBITS	3

 #define _IOC_NRMASK	((1 << _IOC_NRBITS)-1)
 #define _IOC_TYPEMASK	((1 << _IOC_TYPEBITS)-1)

-- 
gentoo-amd64@g.o mailing list