diff options
Diffstat (limited to 'package/util-linux')
| -rw-r--r-- | package/util-linux/util-linux-gcc4.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/package/util-linux/util-linux-gcc4.patch b/package/util-linux/util-linux-gcc4.patch new file mode 100644 index 000000000..6e5b11b76 --- /dev/null +++ b/package/util-linux/util-linux-gcc4.patch @@ -0,0 +1,57 @@ +diff -urN util-linux-2.12/disk-utils/mkfs.minix.c util-linux-2.12-patched/disk-utils/mkfs.minix.c +--- util-linux-2.12/disk-utils/mkfs.minix.c 2005-04-30 21:38:42.924938555 -0500 ++++ util-linux-2.12-patched/disk-utils/mkfs.minix.c 2005-04-30 21:40:36.283237704 -0500 +@@ -124,17 +124,17 @@ + static char super_block_buffer[BLOCK_SIZE]; + static char boot_block_buffer[512]; + #define Super (*(struct minix_super_block *)super_block_buffer) +-#define INODES ((unsigned long)Super.s_ninodes) ++#define INODES (Super.s_ninodes) + #ifdef HAVE_MINIX2 +-#define ZONES ((unsigned long)(version2 ? Super.s_zones : Super.s_nzones)) ++#define ZONES ((version2 ? Super.s_zones : Super.s_nzones)) + #else +-#define ZONES ((unsigned long)(Super.s_nzones)) ++#define ZONES (Super.s_nzones) + #endif +-#define IMAPS ((unsigned long)Super.s_imap_blocks) +-#define ZMAPS ((unsigned long)Super.s_zmap_blocks) +-#define FIRSTZONE ((unsigned long)Super.s_firstdatazone) +-#define ZONESIZE ((unsigned long)Super.s_log_zone_size) +-#define MAXSIZE ((unsigned long)Super.s_max_size) ++#define IMAPS (Super.s_imap_blocks) ++#define ZMAPS (Super.s_zmap_blocks) ++#define FIRSTZONE (Super.s_firstdatazone) ++#define ZONESIZE (Super.s_log_zone_size) ++#define MAXSIZE (Super.s_max_size) + #define MAGIC (Super.s_magic) + #define NORM_FIRSTZONE (2+IMAPS+ZMAPS+INODE_BLOCKS) + +@@ -436,7 +436,10 @@ + MAGIC = magic; + ZONESIZE = 0; + MAXSIZE = version2 ? 0x7fffffff : (7+512+512*512)*1024; +- ZONES = BLOCKS; ++ if (version2) ++ Super.s_zones = BLOCKS; ++ else ++ Super.s_nzones = BLOCKS; + + /* some magic nrs: 1 inode / 3 blocks */ + if ( req_nr_inodes == 0 ) +@@ -478,11 +481,11 @@ + if (!inode_buffer) + die(_("unable to allocate buffer for inodes")); + memset(inode_buffer,0,INODE_BUFFER_SIZE); +- printf(_("%ld inodes\n"),INODES); +- printf(_("%ld blocks\n"),ZONES); +- printf(_("Firstdatazone=%ld (%ld)\n"),FIRSTZONE,NORM_FIRSTZONE); ++ printf(_("%ld inodes\n"),(unsigned long)INODES); ++ printf(_("%ld blocks\n"),(unsigned long)ZONES); ++ printf(_("Firstdatazone=%ld (%ld)\n"),(unsigned long)FIRSTZONE,(unsigned long)NORM_FIRSTZONE); + printf(_("Zonesize=%d\n"),BLOCK_SIZE<<ZONESIZE); +- printf(_("Maxsize=%ld\n\n"),MAXSIZE); ++ printf(_("Maxsize=%ld\n\n"),(unsigned long)MAXSIZE); + } + + /* |