[Glibc-bsd-commits] r3555 - trunk/web/patches

Robert Millan rmh at alioth.debian.org
Sun Jul 10 12:39:14 UTC 2011


Author: rmh
Date: 2011-07-10 12:39:14 +0000 (Sun, 10 Jul 2011)
New Revision: 3555

Added:
   trunk/web/patches/dosfstools.diff
Removed:
   trunk/web/patches/dosfstools.bash
   trunk/web/patches/linux_msdos.bash
Log:
Replace old dosfstools patch with more up-to-date (but still unfinished) version



Deleted: trunk/web/patches/dosfstools.bash
===================================================================
--- trunk/web/patches/dosfstools.bash	2011-07-10 11:52:18 UTC (rev 3554)
+++ trunk/web/patches/dosfstools.bash	2011-07-10 12:39:14 UTC (rev 3555)
@@ -1,163 +0,0 @@
-#!/bin/bash
-set -e
-
-if ! test -e ./linux/msdos_fs.h ; then
-  cat << EOF
-Linux headers need to be obtained from Linux sources, patched with
-linux_msdos.bash, and put in dosfstools-2.11/linux/.  Since this is needed for
-other packages (e.g. ms-sys), it'd be nice if they were in a common place.
-If the Debian Linux maintainers don't want it, we could have a separate package
-for patched headers..
-EOF
-  exit 1
-fi
-
-# these types are defined in Linux sources and shouldn't be used
-find . -type f | \
-  (while read i ; do \
-    sed -i $i -e "s/__u8/unsigned char/g" -e "s/__u16/unsigned short/g" -e "s/__u32/unsigned int/g" ; \
-  done)
-
-patch -p1 < $0
-exit 0
-
-diff -ur dosfstools-2.11.old/debian/rules dosfstools-2.11/debian/rules
---- dosfstools-2.11.old/debian/rules	2005-11-13 10:52:39.000000000 +0100
-+++ dosfstools-2.11/debian/rules	2005-11-13 10:53:20.000000000 +0100
-@@ -19,9 +19,9 @@
- docdir=$(tmpdir)/usr/share/doc/dosfstools
- mandir=$(tmpdir)/usr/share/man
- oldmandir=$(tmpdir)/usr/man
--ARCH = $(shell dpkg --print-gnu-build-architecture)
-+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
- 
--ifeq ($(ARCH),alpha)
-+ifeq ($(DEB_HOST_ARCH_CPU),alpha)
- OPTFLAGS="-fomit-frame-pointer -fno-strict-aliasing $(shell getconf LFS_CFLAGS)"
- else
- OPTFLAGS="-O2 -fomit-frame-pointer $(shell getconf LFS_CFLAGS)"
-diff -ur dosfstools-2.11.old/dosfsck/Makefile dosfstools-2.11/dosfsck/Makefile
---- dosfstools-2.11.old/dosfsck/Makefile	2005-11-13 10:52:39.000000000 +0100
-+++ dosfstools-2.11/dosfsck/Makefile	2005-11-13 10:53:20.000000000 +0100
-@@ -7,7 +7,7 @@
- 	$(CC) -o $@ $(LDFLAGS) $^
- 
- .c.o:
--	$(CC) -c $(CFLAGS) $*.c
-+	$(CC) -c $(CFLAGS) $*.c -I..
- 
- install: dosfsck
- 	mkdir -p $(SBINDIR) $(MANDIR)
-diff -ur dosfstools-2.11.old/dosfsck/common.h dosfstools-2.11/dosfsck/common.h
---- dosfstools-2.11.old/dosfsck/common.h	2005-11-13 10:52:39.000000000 +0100
-+++ dosfstools-2.11/dosfsck/common.h	2005-11-13 10:53:20.000000000 +0100
-@@ -2,12 +2,17 @@
- 
- /* Written 1993 by Werner Almesberger */
- 
-+#ifdef __linux__
- #include <linux/version.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
- # define __KERNEL__
- # include <asm/types.h>
- # undef __KERNEL__
--# define MSDOS_FAT12 4084 /* maximum number of clusters in a 12 bit FAT */
-+#endif
-+#endif /* __linux__ */
-+
-+#ifndef MSDOS_FAT12
-+#define MSDOS_FAT12 4084 /* maximum number of clusters in a 12 bit FAT */
- #endif
- 
- #ifndef _COMMON_H
-diff -ur dosfstools-2.11.old/dosfsck/dosfsck.h dosfstools-2.11/dosfsck/dosfsck.h
---- dosfstools-2.11.old/dosfsck/dosfsck.h	2005-11-13 10:52:39.000000000 +0100
-+++ dosfstools-2.11/dosfsck/dosfsck.h	2005-11-13 10:53:20.000000000 +0100
-@@ -10,6 +10,8 @@
- #define _DOSFSCK_H
- 
- #include <sys/types.h>
-+
-+#ifdef __linux__
- #define _LINUX_STAT_H		/* hack to avoid inclusion of <linux/stat.h> */
- #define _LINUX_STRING_H_	/* hack to avoid inclusion of <linux/string.h>*/
- #define _LINUX_FS_H             /* hack to avoid inclusion of <linux/fs.h> */
-@@ -21,6 +23,7 @@
- # include <asm/byteorder.h>
- # undef __KERNEL__
- #endif
-+#endif /* __linux__ */
- 
- #include <linux/msdos_fs.h>
- 
-diff -ur dosfstools-2.11.old/dosfsck/file.c dosfstools-2.11/dosfsck/file.c
---- dosfstools-2.11.old/dosfsck/file.c	2005-11-13 10:52:39.000000000 +0100
-+++ dosfstools-2.11/dosfsck/file.c	2005-11-13 10:53:20.000000000 +0100
-@@ -12,6 +12,7 @@
- #include <ctype.h>
- #include <unistd.h>
- 
-+#ifdef __linux__
- #define _LINUX_STAT_H		/* hack to avoid inclusion of <linux/stat.h> */
- #define _LINUX_STRING_H_	/* hack to avoid inclusion of <linux/string.h>*/
- #define _LINUX_FS_H             /* hack to avoid inclusion of <linux/fs.h> */
-@@ -22,6 +23,7 @@
- # include <asm/types.h>
- # undef __KERNEL__
- #endif
-+#endif /* __linux__ */
- 
- #include <linux/msdos_fs.h>
- 
-Only in dosfstools-2.11/: linux
-diff -ur dosfstools-2.11.old/mkdosfs/Makefile dosfstools-2.11/mkdosfs/Makefile
---- dosfstools-2.11.old/mkdosfs/Makefile	2005-11-13 10:52:39.000000000 +0100
-+++ dosfstools-2.11/mkdosfs/Makefile	2005-11-13 10:53:20.000000000 +0100
-@@ -7,7 +7,7 @@
- 	$(CC) $(LDFLAGS) $^ -o $@
- 
- .c.o:
--	$(CC) $(CFLAGS) -c $< -o $@
-+	$(CC) $(CFLAGS) -c $< -o $@ -I..
- 
- install: mkdosfs
- 	mkdir -p $(SBINDIR) $(MANDIR)
-diff -ur dosfstools-2.11.old/mkdosfs/mkdosfs.c dosfstools-2.11/mkdosfs/mkdosfs.c
---- dosfstools-2.11.old/mkdosfs/mkdosfs.c	2005-11-13 10:52:39.000000000 +0100
-+++ dosfstools-2.11/mkdosfs/mkdosfs.c	2005-11-13 10:53:20.000000000 +0100
-@@ -66,21 +66,23 @@
- #include <time.h>
- #include <errno.h>
- 
-+#ifdef __linux__
- #include <linux/version.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
- # define __KERNEL__
- # include <asm/types.h>
- # undef __KERNEL__
- #endif
-+#endif
- 
- #if __BYTE_ORDER == __BIG_ENDIAN
- 
- #include <asm/byteorder.h>
--#ifdef __le16_to_cpu
-+#ifdef unsigned short_to_cpu
- /* ++roman: 2.1 kernel headers define these function, they're probably more
-  * efficient then coding the swaps machine-independently. */
--#define CF_LE_W	__le16_to_cpu
--#define CF_LE_L	__le32_to_cpu
-+#define CF_LE_W	unsigned short_to_cpu
-+#define CF_LE_L	unsigned int_to_cpu
- #define CT_LE_W	__cpu_to_le16
- #define CT_LE_L	__cpu_to_le32
- #else
-@@ -89,7 +91,7 @@
-                (((unsigned)(v)<<8)&0xff0000) | ((unsigned)(v)<<24))
- #define CT_LE_W(v) CF_LE_W(v)
- #define CT_LE_L(v) CF_LE_L(v)
--#endif /* defined(__le16_to_cpu) */
-+#endif /* defined(unsigned short_to_cpu) */
-     
- #else
- 

Added: trunk/web/patches/dosfstools.diff
===================================================================
--- trunk/web/patches/dosfstools.diff	                        (rev 0)
+++ trunk/web/patches/dosfstools.diff	2011-07-10 12:39:14 UTC (rev 3555)
@@ -0,0 +1,359 @@
+=== modified file 'src/common.h'
+--- src/common.h	2011-07-10 12:13:57 +0000
++++ src/common.h	2011-07-10 12:22:49 +0000
+@@ -19,7 +19,7 @@
+    can be found in /usr/share/common-licenses/GPL-3 file.
+ */
+ 
+-# include <asm/types.h>
++//#include "types.h"
+ 
+ #ifndef _COMMON_H
+ #define _COMMON_H
+
+=== modified file 'src/dosfsck.h'
+--- src/dosfsck.h	2011-07-10 12:13:57 +0000
++++ src/dosfsck.h	2011-07-10 12:18:18 +0000
+@@ -28,14 +28,7 @@
+ #define _DOSFSCK_H
+ 
+ #include <sys/types.h>
+-#define _LINUX_STAT_H		/* hack to avoid inclusion of <linux/stat.h> */
+-#define _LINUX_STRING_H_	/* hack to avoid inclusion of <linux/string.h>*/
+-#define _LINUX_FS_H             /* hack to avoid inclusion of <linux/fs.h> */
+-
+-# include <asm/types.h>
+-# include <asm/byteorder.h>
+-
+-#include <linux/msdos_fs.h>
++#include "msdos_fs.h"
+ 
+ #undef CF_LE_W
+ #undef CF_LE_L
+
+=== modified file 'src/file.c'
+--- src/file.c	2011-07-10 12:13:57 +0000
++++ src/file.c	2011-07-10 12:22:33 +0000
+@@ -30,13 +30,9 @@
+ #include <ctype.h>
+ #include <unistd.h>
+ 
+-#define _LINUX_STAT_H		/* hack to avoid inclusion of <linux/stat.h> */
+-#define _LINUX_STRING_H_	/* hack to avoid inclusion of <linux/string.h>*/
+-#define _LINUX_FS_H             /* hack to avoid inclusion of <linux/fs.h> */
+-
+-# include <asm/types.h>
+-
+-#include <linux/msdos_fs.h>
++//# include "types.h"
++
++#include "msdos_fs.h"
+ 
+ #include "common.h"
+ #include "file.h"
+
+=== modified file 'src/io.c'
+--- src/io.c	2011-07-10 12:13:57 +0000
++++ src/io.c	2011-07-10 12:23:03 +0000
+@@ -39,7 +39,7 @@
+ #include <sys/ioctl.h>
+ #include <errno.h>
+ #include <fcntl.h>
+-#include <linux/fd.h>
++//#include <linux/fd.h>
+ 
+ #include "dosfsck.h"
+ #include "common.h"
+
+=== modified file 'src/mkdosfs.c'
+--- src/mkdosfs.c	2011-07-10 12:13:57 +0000
++++ src/mkdosfs.c	2011-07-10 12:37:56 +0000
+@@ -46,9 +46,9 @@
+ #include "version.h"
+ 
+ #include <fcntl.h>
+-#include <linux/hdreg.h>
++//#include <linux/hdreg.h>
+ #include <sys/mount.h>
+-#include <linux/fd.h>
++//#include <linux/fd.h>
+ #include <endian.h>
+ #include <mntent.h>
+ #include <signal.h>
+@@ -63,11 +63,11 @@
+ #include <time.h>
+ #include <errno.h>
+ 
+-# include <asm/types.h>
++#include "types.h"
+ 
+ #if __BYTE_ORDER == __BIG_ENDIAN
+ 
+-#include <asm/byteorder.h>
++//#include <asm/byteorder.h>
+ #ifdef __le16_to_cpu
+ /* ++roman: 2.1 kernel headers define these function, they're probably more
+  * efficient then coding the swaps machine-independently. */
+@@ -103,6 +103,8 @@
+ 
+ #define TEST_BUFFER_BLOCKS 16
+ #define HARD_SECTOR_SIZE   512
++#define BLOCK_SIZE_BITS    10
++#define BLOCK_SIZE         (1<<BLOCK_SIZE_BITS)
+ #define SECTORS_PER_BLOCK ( BLOCK_SIZE / HARD_SECTOR_SIZE )
+ 
+ 
+@@ -589,11 +591,17 @@
+ static void
+ establish_params (int device_num,int size)
+ {
++#if 0 /* XXX */
+   long loop_size;
++#ifdef HDIO_GETGEO
+   struct hd_geometry geometry;
++#endif
++#ifdef FDGETPRM
+   struct floppy_struct param;
++#endif
+   int def_root_dir_entries = 512;
+ 
++#ifdef FDGETPRM
+   if ((0 == device_num) || ((device_num & 0xff00) == 0x0200))
+     /* file image or floppy disk */
+     {
+@@ -677,10 +685,23 @@
+ 	      goto floppy_default;
+ 	}
+     }
+-  else if ((device_num & 0xff00) == 0x0700) /* This is a loop device */
++  else
++#endif
++  if ((device_num & 0xff00) == 0x0700) /* This is a loop device */
+     {
++#if defined(BLKGETSIZE)
+       if (ioctl (dev, BLKGETSIZE, &loop_size))
+ 	die ("unable to get loop device size");
++#elif defined(DIOCGMEDIASIZE)
++      {
++	unsigned long long bytes;
++        if (ioctl (dev, DIOCGMEDIASIZE, &bytes))
++	  die ("unable to get loop device size");
++	loop_size = bytes;
++      }
++#else
++      die ("unable to get loop device size");
++#endif
+ 
+       switch (loop_size)  /* Assuming the loop device -> floppy later */
+ 	{
+@@ -733,6 +754,7 @@
+ 	  goto def_hd_params;
+ 	}
+     }
++#ifdef HDIO_GETGEO
+   else
+     /* Must be a hard disk then! */
+     {
+@@ -773,9 +795,11 @@
+ 	  bs.cluster_size = (char) 4;
+       }
+     }
++#endif
+ 
+   if (!root_dir_entries)
+     root_dir_entries = def_root_dir_entries;
++#endif
+ }
+ 
+ /*
+
+=== added file 'src/msdos_fs.h'
+--- src/msdos_fs.h	1970-01-01 00:00:00 +0000
++++ src/msdos_fs.h	2011-07-10 12:23:56 +0000
+@@ -0,0 +1,166 @@
++
++/* Stolen from <linux/msdos_fs.h>.  */
++
++#ifndef _MSDOS_FS_H
++#define _MSDOS_FS_H
++
++#include "types.h"
++
++/*
++ * The MS-DOS filesystem constants/structures
++ */
++
++#define SECTOR_SIZE	512		/* sector size (bytes) */
++#define SECTOR_BITS	9		/* log2(SECTOR_SIZE) */
++#define MSDOS_DPB	(MSDOS_DPS)	/* dir entries per block */
++#define MSDOS_DPB_BITS	4		/* log2(MSDOS_DPB) */
++#define MSDOS_DPS	(SECTOR_SIZE / sizeof(struct msdos_dir_entry))
++#define MSDOS_DPS_BITS	4		/* log2(MSDOS_DPS) */
++#define CF_LE_W(v)	le16_to_cpu(v)
++#define CF_LE_L(v)	le32_to_cpu(v)
++#define CT_LE_W(v)	cpu_to_le16(v)
++#define CT_LE_L(v)	cpu_to_le32(v)
++
++
++#define MSDOS_ROOT_INO	1	/* == MINIX_ROOT_INO */
++#define MSDOS_DIR_BITS	5	/* log2(sizeof(struct msdos_dir_entry)) */
++
++/* directory limit */
++#define FAT_MAX_DIR_ENTRIES	(65536)
++#define FAT_MAX_DIR_SIZE	(FAT_MAX_DIR_ENTRIES << MSDOS_DIR_BITS)
++
++#define ATTR_NONE	0	/* no attribute bits */
++#define ATTR_RO		1	/* read-only */
++#define ATTR_HIDDEN	2	/* hidden */
++#define ATTR_SYS	4	/* system */
++#define ATTR_VOLUME	8	/* volume label */
++#define ATTR_DIR	16	/* directory */
++#define ATTR_ARCH	32	/* archived */
++
++/* attribute bits that are copied "as is" */
++#define ATTR_UNUSED	(ATTR_VOLUME | ATTR_ARCH | ATTR_SYS | ATTR_HIDDEN)
++/* bits that are used by the Windows 95/Windows NT extended FAT */
++#define ATTR_EXT	(ATTR_RO | ATTR_HIDDEN | ATTR_SYS | ATTR_VOLUME)
++
++#define CASE_LOWER_BASE	8	/* base is lower case */
++#define CASE_LOWER_EXT	16	/* extension is lower case */
++
++#define DELETED_FLAG	0xe5	/* marks file as deleted when in name[0] */
++#define IS_FREE(n)	(!*(n) || *(n) == DELETED_FLAG)
++
++#define MSDOS_NAME	11	/* maximum name length */
++#define MSDOS_LONGNAME	256	/* maximum name length */
++#define MSDOS_SLOTS	21	/* max # of slots for short and long names */
++#define MSDOS_DOT	".          "	/* ".", padded to MSDOS_NAME chars */
++#define MSDOS_DOTDOT	"..         "	/* "..", padded to MSDOS_NAME chars */
++
++#define FAT_FIRST_ENT(s, x)	((MSDOS_SB(s)->fat_bits == 32 ? 0x0FFFFF00 : \
++	MSDOS_SB(s)->fat_bits == 16 ? 0xFF00 : 0xF00) | (x))
++
++/* start of data cluster's entry (number of reserved clusters) */
++#define FAT_START_ENT	2
++
++/* maximum number of clusters */
++#define MAX_FAT12	0xFF4
++#define MAX_FAT16	0xFFF4
++#define MAX_FAT32	0x0FFFFFF6
++#define MAX_FAT(s)	(MSDOS_SB(s)->fat_bits == 32 ? MAX_FAT32 : \
++	MSDOS_SB(s)->fat_bits == 16 ? MAX_FAT16 : MAX_FAT12)
++
++/* bad cluster mark */
++#define BAD_FAT12	0xFF7
++#define BAD_FAT16	0xFFF7
++#define BAD_FAT32	0x0FFFFFF7
++
++/* standard EOF */
++#define EOF_FAT12	0xFFF
++#define EOF_FAT16	0xFFFF
++#define EOF_FAT32	0x0FFFFFFF
++
++#define FAT_ENT_FREE	(0)
++#define FAT_ENT_BAD	(BAD_FAT32)
++#define FAT_ENT_EOF	(EOF_FAT32)
++
++#define FAT_FSINFO_SIG1	0x41615252
++#define FAT_FSINFO_SIG2	0x61417272
++#define IS_FSINFO(x)	(le32_to_cpu((x)->signature1) == FAT_FSINFO_SIG1 \
++			 && le32_to_cpu((x)->signature2) == FAT_FSINFO_SIG2)
++
++struct __fat_dirent {
++	long		d_ino;
++	off_t		d_off;
++	unsigned short	d_reclen;
++	char		d_name[256]; /* We must not include limits.h! */
++};
++
++/*
++ * ioctl commands
++ */
++#define VFAT_IOCTL_READDIR_BOTH		_IOR('r', 1, struct __fat_dirent[2])
++#define VFAT_IOCTL_READDIR_SHORT	_IOR('r', 2, struct __fat_dirent[2])
++/* <linux/videotext.h> has used 0x72 ('r') in collision, so skip a few */
++#define FAT_IOCTL_GET_ATTRIBUTES	_IOR('r', 0x10, __u32)
++#define FAT_IOCTL_SET_ATTRIBUTES	_IOW('r', 0x11, __u32)
++
++struct fat_boot_sector {
++	__u8	ignored[3];	/* Boot strap short or near jump */
++	__u8	system_id[8];	/* Name - can be used to special case
++				   partition manager volumes */
++	__u8	sector_size[2];	/* bytes per logical sector */
++	__u8	sec_per_clus;	/* sectors/cluster */
++	__le16	reserved;	/* reserved sectors */
++	__u8	fats;		/* number of FATs */
++	__u8	dir_entries[2];	/* root directory entries */
++	__u8	sectors[2];	/* number of sectors */
++	__u8	media;		/* media code */
++	__le16	fat_length;	/* sectors/FAT */
++	__le16	secs_track;	/* sectors per track */
++	__le16	heads;		/* number of heads */
++	__le32	hidden;		/* hidden sectors (unused) */
++	__le32	total_sect;	/* number of sectors (if sectors == 0) */
++
++	/* The following fields are only used by FAT32 */
++	__le32	fat32_length;	/* sectors/FAT */
++	__le16	flags;		/* bit 8: fat mirroring, low 4: active fat */
++	__u8	version[2];	/* major, minor filesystem version */
++	__le32	root_cluster;	/* first cluster in root directory */
++	__le16	info_sector;	/* filesystem info sector */
++	__le16	backup_boot;	/* backup boot sector */
++	__le16	reserved2[6];	/* Unused */
++};
++
++struct fat_boot_fsinfo {
++	__le32   signature1;	/* 0x41615252L */
++	__le32   reserved1[120];	/* Nothing as far as I can tell */
++	__le32   signature2;	/* 0x61417272L */
++	__le32   free_clusters;	/* Free cluster count.  -1 if unknown */
++	__le32   next_cluster;	/* Most recently allocated cluster */
++	__le32   reserved2[4];
++};
++
++struct msdos_dir_entry {
++	__u8	name[MSDOS_NAME];/* name and extension */
++	__u8	attr;		/* attribute bits */
++	__u8    lcase;		/* Case for base and extension */
++	__u8	ctime_cs;	/* Creation time, centiseconds (0-199) */
++	__le16	ctime;		/* Creation time */
++	__le16	cdate;		/* Creation date */
++	__le16	adate;		/* Last access date */
++	__le16	starthi;	/* High 16 bits of cluster in FAT32 */
++	__le16	time,date,start;/* time, date and first cluster */
++	__le32	size;		/* file size (in bytes) */
++};
++
++/* Up to 13 characters of the name */
++struct msdos_dir_slot {
++	__u8    id;		/* sequence number for slot */
++	__u8    name0_4[10];	/* first 5 characters in name */
++	__u8    attr;		/* attribute byte */
++	__u8    reserved;	/* always 0 */
++	__u8    alias_checksum;	/* checksum for 8.3 alias */
++	__u8    name5_10[12];	/* 6 more characters in name */
++	__le16   start;		/* starting cluster number, 0 in long slots */
++	__u8    name11_12[4];	/* last 2 characters in name */
++};
++
++#endif /* !_LINUX_MSDOS_FS_H */
+
+=== added file 'src/types.h'
+--- src/types.h	1970-01-01 00:00:00 +0000
++++ src/types.h	2011-07-10 12:24:14 +0000
+@@ -0,0 +1,14 @@
++#ifndef _TYPES_H
++#define _TYPES_H
++
++#include <stdint.h>
++
++typedef uint8_t		__u8;
++typedef uint16_t	__u16;
++typedef uint32_t	__u32;
++
++typedef uint8_t		__le8;
++typedef uint16_t	__le16;
++typedef uint32_t	__le32;
++
++#endif
+

Deleted: trunk/web/patches/linux_msdos.bash
===================================================================
--- trunk/web/patches/linux_msdos.bash	2011-07-10 11:52:18 UTC (rev 3554)
+++ trunk/web/patches/linux_msdos.bash	2011-07-10 12:39:14 UTC (rev 3555)
@@ -1,32 +0,0 @@
-#!/bin/bash
-set -e
-
-# Diffed from linux-source-2.6.12 package, version 2.6.12-1.
-
-# these types are defined in Linux sources and shouldn't be used
-find . -type f | \
-  (while read i ; do \
-    sed -i $i -e "s/__u8/unsigned char/g" -e "s/__u16/unsigned short/g" -e "s/__u32/unsigned int/g" ; \
-  done)
-  # WARNING: this breaks big-endian
-find . -type f | \
-  (while read i ; do \
-    sed -i $i -e "s/__le8/unsigned char/g" -e "s/__le16/unsigned short/g" -e "s/__le32/unsigned int/g" ; \
-  done)
-
-patch -p1 < $0
-exit 0
-
-diff -ur /usr/src/linux-source-2.6.12/include/linux/msdos_fs.h ./linux/msdos_fs.h
---- /usr/src/linux-source-2.6.12/include/linux/msdos_fs.h	2005-06-17 21:48:29.000000000 +0200
-+++ ./linux/msdos_fs.h	2005-08-03 12:55:41.000000000 +0200
-@@ -4,7 +4,9 @@
- /*
-  * The MS-DOS filesystem constants/structures
-  */
-+#ifdef __linux__
- #include <asm/byteorder.h>
-+#endif
- 
- #define SECTOR_SIZE	512		/* sector size (bytes) */
- #define SECTOR_BITS	9		/* log2(SECTOR_SIZE) */




More information about the Glibc-bsd-commits mailing list