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

[Billy Holmes]

Mark Knecht wrote:
> Hi,
>    Probably no one has tried his but so far I cannot get it to build.
> It does build on one of my 32-bit Intel machines:

this is a major hack. It compiles, but I don't guarantee that it won't eat
your harddrive. It reads my scsi drive OK, but it has the size wrong.
However, the same thing happens when compiled in a 32-bit chroot.

Also note, that mac-fdisk isn't even marked ~amd64...

If this gets you up and running, I might submit it to b.g.o .. but I'm
feeling lazy tonight ;-)

Kludge Steps without making an overlay ebuild (someone else is free to
accomplish that):

0. save everything below "cut here" into the file /tmp/mac_fdisk.patch
1. emerge with FEATURES=keepwork
   $ FEATURES=keepwork emerge mac-fdisk
2. when it fails, go into the work dir:
   $ cd /var/tmp/portage/mac-fdisk*/work/mac-fdisk-0.1
3. apply the patch:
   $ patch -p1 < /tmp/mac_fdisk.patch
4. redo the emerge:
   $ FEATURES=keepwork emerge mac-fdisk
5. Use the new possibly broken mac-fdisk.
   $ mac-fdisk
   $ pmac-fdisk

--cut here--
diff -ru mac-fdisk-0.1/fdisklabel.c /tmp/mac-fdisk-0.1/fdisklabel.c
--- mac-fdisk-0.1/fdisklabel.c	2005-10-19 18:21:03.000000000 -0400
+++ /tmp/mac-fdisk-0.1/fdisklabel.c	2005-10-19 18:15:37.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)
@@ -380,9 +380,7 @@
        {
          bsd_print_disklabel (1);
  	return 1;
-      }
-      else
-	return 0;
+      } else {return(0);}
      }
      else if (c == 'n')
        return 0;
@@ -503,7 +501,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 +515,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 +619,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 +642,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 +668,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 +702,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 +743,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 18:21:03.000000000 -0400
+++ /tmp/mac-fdisk-0.1/fdisklabel.h	2005-10-19 18:10:31.000000000 -0400
@@ -58,6 +58,11 @@
  #define BSD_LABELOFFSET   0
  #define	BSD_BBSIZE        0
  #define	BSD_SBSIZE        0
+#elif defined (__x86_64__)
+#define BSD_LABELSECTOR   1
+#define BSD_LABELOFFSET   0
+#define	BSD_BBSIZE        8192		/* size of boot area, with label */
+#define	BSD_SBSIZE        8192		/* max size of fs superblock */
  #else
  #error unknown architecture
  #endif
-- 
gentoo-amd64@g.o mailing list