[Glibc-bsd-commits] r1643 - in
trunk/kfreebsd-kernel-headers/debian: . patches
Petr Salinger
ps-guest at costa.debian.org
Fri Aug 25 07:23:19 UTC 2006
Author: ps-guest
Date: 2006-08-25 07:23:16 +0000 (Fri, 25 Aug 2006)
New Revision: 1643
Modified:
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/control
trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff
trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff
trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
trunk/kfreebsd-kernel-headers/debian/rules
Log:
* kfreebsd-kernel-headers based on kfreebsd-source-6.1
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2006-08-24 12:51:57 UTC (rev 1642)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2006-08-25 07:23:16 UTC (rev 1643)
@@ -1,3 +1,10 @@
+kfreebsd-kernel-headers (0.20) UNRELEASED; urgency=low
+
+ [ Petr Salinger ]
+ * based on kfreebsd-source-6.1
+
+ -- Aurelien Jarno <aurel32 at debian.org> Fri, 25 Aug 2006 09:46:47 +0200
+
kfreebsd-kernel-headers (0.19) UNRELEASED; urgency=low
[ Petr Salinger ]
Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control 2006-08-24 12:51:57 UTC (rev 1642)
+++ trunk/kfreebsd-kernel-headers/debian/control 2006-08-25 07:23:16 UTC (rev 1643)
@@ -3,7 +3,7 @@
Priority: standard
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: debhelper (>= 4.1.0), kfreebsd-source-5.4 (>= 5.4-1)
+Build-Depends: debhelper (>= 4.1.0), kfreebsd-source-6.1
Standards-Version: 3.6.2
Package: kfreebsd-kernel-headers
Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2006-08-24 12:51:57 UTC (rev 1642)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2006-08-25 07:23:16 UTC (rev 1643)
@@ -98,14 +98,16 @@
diff -ur sys.orig/i386/include/pcb.h sys/i386/include/pcb.h
--- sys.orig/i386/include/pcb.h 2004-12-07 23:50:18.000000000 +0100
+++ sys/i386/include/pcb.h 2004-12-07 23:48:32.000000000 +0100
-@@ -39,6 +39,7 @@
+@@ -36,6 +36,8 @@
+ #ifndef _I386_PCB_H_
+ #define _I386_PCB_H_
+
++#include <sys/types.h>
++
/*
* Intel 386 process control block
*/
-+#include <sys/types.h>
- #include <machine/npx.h>
-
- struct pcb {
+
diff -ur sys.orig/i386/include/pmap.h sys/i386/include/pmap.h
--- sys.orig/i386/include/pmap.h 2004-12-07 23:50:18.000000000 +0100
+++ sys/i386/include/pmap.h 2004-12-07 23:48:32.000000000 +0100
Modified: trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff 2006-08-24 12:51:57 UTC (rev 1642)
+++ trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff 2006-08-25 07:23:16 UTC (rev 1643)
@@ -1,12 +1,15 @@
diff -ur sys.orig/sys/syslimits.h sys/sys/syslimits.h
--- sys.orig/sys/syslimits.h 2004-11-30 01:05:19.000000000 +0100
+++ sys/sys/syslimits.h 2004-11-30 01:23:49.000000000 +0100
-@@ -33,12 +33,6 @@
+@@ -33,15 +33,6 @@
#ifndef _SYS_SYSLIMITS_H_
#define _SYS_SYSLIMITS_H_
-#if !defined(_KERNEL) && !defined(_LIMITS_H_) && !defined(_SYS_PARAM_H_)
--#if defined(__GNUC__) || defined(__INTEL_COMPILER)
+-#ifndef _SYS_CDEFS_H_
+-#error this file needs sys/cdefs.h as a prerequisite
+-#endif
+-#ifdef __CC_SUPPORTS_WARNING
-#warning "No user-serviceable parts inside."
-#endif
-#endif
Modified: trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff 2006-08-24 12:51:57 UTC (rev 1642)
+++ trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff 2006-08-25 07:23:16 UTC (rev 1643)
@@ -1,5 +1,7 @@
---- sys/i386/include/segments.h.old 2004-12-01 03:21:53.000000000 +0100
-+++ sys/i386/include/segments.h 2004-12-01 03:23:54.000000000 +0100
+Index: sys/i386/include/segments.h
+===================================================================
+--- sys/i386/include/segments.h.orig 2006-08-25 10:54:25.882289000 +0200
++++ sys/i386/include/segments.h 2006-08-25 10:56:35.000000000 +0200
@@ -60,7 +60,7 @@
*/
struct segment_descriptor {
@@ -18,20 +20,28 @@
};
/*
---- sys/sys/elf32.h~ 2002-05-30 10:32:18.000000000 +0200
-+++ sys/sys/elf32.h 2004-12-01 03:48:05.000000000 +0100
-@@ -30,6 +30,7 @@
- #define _SYS_ELF32_H_ 1
+Index: sys/sys/elf32.h
+===================================================================
+--- sys/sys/elf32.h.orig 2006-08-25 10:54:25.903945000 +0200
++++ sys/sys/elf32.h 2006-08-25 11:05:18.000000000 +0200
+@@ -35,11 +35,8 @@
+ * ELF definitions common to all 32-bit architectures.
+ */
- #include <sys/elf_common.h>
+-typedef uint32_t Elf32_Addr;
+-typedef uint16_t Elf32_Half;
+-typedef uint32_t Elf32_Off;
+-typedef int32_t Elf32_Sword;
+-typedef uint32_t Elf32_Word;
+#include <elf.h>
++
- /*
- * ELF definitions common to all 32-bit architectures.
-@@ -43,89 +44,6 @@
- typedef u_int32_t Elf32_Size;
- typedef Elf32_Off Elf32_Hashelt;
+ typedef Elf32_Word Elf32_Hashelt;
+@@ -47,117 +44,4 @@
+ typedef Elf32_Word Elf32_Size;
+ typedef Elf32_Sword Elf32_Ssize;
+
-/*
- * ELF header.
- */
@@ -64,11 +74,11 @@
- Elf32_Word sh_flags; /* Section flags. */
- Elf32_Addr sh_addr; /* Address in memory image. */
- Elf32_Off sh_offset; /* Offset in file. */
-- Elf32_Size sh_size; /* Size in bytes. */
+- Elf32_Word sh_size; /* Size in bytes. */
- Elf32_Word sh_link; /* Index of a related section. */
- Elf32_Word sh_info; /* Depends on section type. */
-- Elf32_Size sh_addralign; /* Alignment in bytes. */
-- Elf32_Size sh_entsize; /* Size of each entry in section. */
+- Elf32_Word sh_addralign; /* Alignment in bytes. */
+- Elf32_Word sh_entsize; /* Size of each entry in section. */
-} Elf32_Shdr;
-
-/*
@@ -80,10 +90,10 @@
- Elf32_Off p_offset; /* File offset of contents. */
- Elf32_Addr p_vaddr; /* Virtual address in memory image. */
- Elf32_Addr p_paddr; /* Physical address (not used). */
-- Elf32_Size p_filesz; /* Size of contents in file. */
-- Elf32_Size p_memsz; /* Size of contents in memory. */
+- Elf32_Word p_filesz; /* Size of contents in file. */
+- Elf32_Word p_memsz; /* Size of contents in memory. */
- Elf32_Word p_flags; /* Access permission flags. */
-- Elf32_Size p_align; /* Alignment in memory and file. */
+- Elf32_Word p_align; /* Alignment in memory and file. */
-} Elf32_Phdr;
-
-/*
@@ -93,7 +103,7 @@
-typedef struct {
- Elf32_Sword d_tag; /* Entry type. */
- union {
-- Elf32_Size d_val; /* Integer value. */
+- Elf32_Word d_val; /* Integer value. */
- Elf32_Addr d_ptr; /* Address value. */
- } d_un;
-} Elf32_Dyn;
@@ -115,13 +125,13 @@
- Elf32_Sword r_addend; /* Addend. */
-} Elf32_Rela;
-
- /* Macros for accessing the fields of r_info. */
- #define ELF32_R_SYM(info) ((info) >> 8)
- #define ELF32_R_TYPE(info) ((unsigned char)(info))
-@@ -133,19 +51,6 @@
- /* Macro for constructing r_info from field values. */
- #define ELF32_R_INFO(sym, type) (((sym) << 8) + (unsigned char)(type))
-
+-/* Macros for accessing the fields of r_info. */
+-#define ELF32_R_SYM(info) ((info) >> 8)
+-#define ELF32_R_TYPE(info) ((unsigned char)(info))
+-
+-/* Macro for constructing r_info from field values. */
+-#define ELF32_R_INFO(sym, type) (((sym) << 8) + (unsigned char)(type))
+-
-/*
- * Symbol table entries.
- */
@@ -129,28 +139,45 @@
-typedef struct {
- Elf32_Word st_name; /* String table index of name. */
- Elf32_Addr st_value; /* Symbol value. */
-- Elf32_Size st_size; /* Size of associated object. */
+- Elf32_Word st_size; /* Size of associated object. */
- unsigned char st_info; /* Type and binding information. */
- unsigned char st_other; /* Reserved (not used). */
- Elf32_Half st_shndx; /* Section index of symbol. */
-} Elf32_Sym;
-
- /* Macros for accessing the fields of st_info. */
- #define ELF32_ST_BIND(info) ((info) >> 4)
- #define ELF32_ST_TYPE(info) ((info) & 0xf)
---- sys/sys/elf64.h~ 2006-03-01 20:28:58.000000000 +0100
-+++ sys/sys/elf64.h 2006-03-04 20:43:36.000000000 +0100
-@@ -30,6 +30,7 @@
- #define _SYS_ELF64_H_ 1
+-/* Macros for accessing the fields of st_info. */
+-#define ELF32_ST_BIND(info) ((info) >> 4)
+-#define ELF32_ST_TYPE(info) ((info) & 0xf)
+-
+-/* Macro for constructing st_info from field values. */
+-#define ELF32_ST_INFO(bind, type) (((bind) << 4) + ((type) & 0xf))
+-
+-/* Macro for accessing the fields of st_other. */
+-#define ELF32_ST_VISIBILITY(oth) ((oth) & 0x3)
+-
+ #endif /* !_SYS_ELF32_H_ */
+Index: sys/sys/elf64.h
+===================================================================
+--- sys/sys/elf64.h.orig 2006-08-25 10:54:25.925997000 +0200
++++ sys/sys/elf64.h 2006-08-25 11:09:37.000000000 +0200
+@@ -35,13 +35,7 @@
+ * ELF definitions common to all 64-bit architectures.
+ */
- #include <sys/elf_common.h>
+-typedef uint64_t Elf64_Addr;
+-typedef uint16_t Elf64_Half;
+-typedef uint64_t Elf64_Off;
+-typedef int32_t Elf64_Sword;
+-typedef int64_t Elf64_Sxword;
+-typedef uint32_t Elf64_Word;
+-typedef uint64_t Elf64_Xword;
+#include <elf.h>
/*
- * ELF definitions common to all 64-bit architectures.
-@@ -56,89 +57,6 @@
- typedef Elf64_Half Elf64_Hashelt;
- #endif
+ * Types of dynamic symbol hash table bucket and chain elements.
+@@ -60,117 +54,4 @@
+ typedef Elf64_Xword Elf64_Size;
+ typedef Elf64_Sxword Elf64_Ssize;
-/*
- * ELF header.
@@ -158,19 +185,19 @@
-
-typedef struct {
- unsigned char e_ident[EI_NIDENT]; /* File identification. */
-- Elf64_Quarter e_type; /* File type. */
-- Elf64_Quarter e_machine; /* Machine architecture. */
-- Elf64_Half e_version; /* ELF format version. */
+- Elf64_Half e_type; /* File type. */
+- Elf64_Half e_machine; /* Machine architecture. */
+- Elf64_Word e_version; /* ELF format version. */
- Elf64_Addr e_entry; /* Entry point. */
- Elf64_Off e_phoff; /* Program header file offset. */
- Elf64_Off e_shoff; /* Section header file offset. */
-- Elf64_Half e_flags; /* Architecture-specific flags. */
-- Elf64_Quarter e_ehsize; /* Size of ELF header in bytes. */
-- Elf64_Quarter e_phentsize; /* Size of program header entry. */
-- Elf64_Quarter e_phnum; /* Number of program header entries. */
-- Elf64_Quarter e_shentsize; /* Size of section header entry. */
-- Elf64_Quarter e_shnum; /* Number of section header entries. */
-- Elf64_Quarter e_shstrndx; /* Section name strings section. */
+- Elf64_Word e_flags; /* Architecture-specific flags. */
+- Elf64_Half e_ehsize; /* Size of ELF header in bytes. */
+- Elf64_Half e_phentsize; /* Size of program header entry. */
+- Elf64_Half e_phnum; /* Number of program header entries. */
+- Elf64_Half e_shentsize; /* Size of section header entry. */
+- Elf64_Half e_shnum; /* Number of section header entries. */
+- Elf64_Half e_shstrndx; /* Section name strings section. */
-} Elf64_Ehdr;
-
-/*
@@ -178,17 +205,17 @@
- */
-
-typedef struct {
-- Elf64_Half sh_name; /* Section name (index into the
+- Elf64_Word sh_name; /* Section name (index into the
- section header string table). */
-- Elf64_Half sh_type; /* Section type. */
-- Elf64_Size sh_flags; /* Section flags. */
+- Elf64_Word sh_type; /* Section type. */
+- Elf64_Xword sh_flags; /* Section flags. */
- Elf64_Addr sh_addr; /* Address in memory image. */
- Elf64_Off sh_offset; /* Offset in file. */
-- Elf64_Size sh_size; /* Size in bytes. */
-- Elf64_Half sh_link; /* Index of a related section. */
-- Elf64_Half sh_info; /* Depends on section type. */
-- Elf64_Size sh_addralign; /* Alignment in bytes. */
-- Elf64_Size sh_entsize; /* Size of each entry in section. */
+- Elf64_Xword sh_size; /* Size in bytes. */
+- Elf64_Word sh_link; /* Index of a related section. */
+- Elf64_Word sh_info; /* Depends on section type. */
+- Elf64_Xword sh_addralign; /* Alignment in bytes. */
+- Elf64_Xword sh_entsize; /* Size of each entry in section. */
-} Elf64_Shdr;
-
-/*
@@ -196,14 +223,14 @@
- */
-
-typedef struct {
-- Elf64_Half p_type; /* Entry type. */
-- Elf64_Half p_flags; /* Access permission flags. */
+- Elf64_Word p_type; /* Entry type. */
+- Elf64_Word p_flags; /* Access permission flags. */
- Elf64_Off p_offset; /* File offset of contents. */
- Elf64_Addr p_vaddr; /* Virtual address in memory image. */
- Elf64_Addr p_paddr; /* Physical address (not used). */
-- Elf64_Size p_filesz; /* Size of contents in file. */
-- Elf64_Size p_memsz; /* Size of contents in memory. */
-- Elf64_Size p_align; /* Alignment in memory and file. */
+- Elf64_Xword p_filesz; /* Size of contents in file. */
+- Elf64_Xword p_memsz; /* Size of contents in memory. */
+- Elf64_Xword p_align; /* Alignment in memory and file. */
-} Elf64_Phdr;
-
-/*
@@ -211,9 +238,9 @@
- */
-
-typedef struct {
-- Elf64_Size d_tag; /* Entry type. */
+- Elf64_Sxword d_tag; /* Entry type. */
- union {
-- Elf64_Size d_val; /* Integer value. */
+- Elf64_Xword d_val; /* Integer value. */
- Elf64_Addr d_ptr; /* Address value. */
- } d_un;
-} Elf64_Dyn;
@@ -225,54 +252,51 @@
-/* Relocations that don't need an addend field. */
-typedef struct {
- Elf64_Addr r_offset; /* Location to be relocated. */
-- Elf64_Size r_info; /* Relocation type and symbol index. */
+- Elf64_Xword r_info; /* Relocation type and symbol index. */
-} Elf64_Rel;
-
-/* Relocations that need an addend field. */
-typedef struct {
- Elf64_Addr r_offset; /* Location to be relocated. */
-- Elf64_Size r_info; /* Relocation type and symbol index. */
-- Elf64_Off r_addend; /* Addend. */
+- Elf64_Xword r_info; /* Relocation type and symbol index. */
+- Elf64_Sxword r_addend; /* Addend. */
-} Elf64_Rela;
-
- /* Macros for accessing the fields of r_info. */
- #define ELF64_R_SYM(info) ((info) >> 32)
- #define ELF64_R_TYPE(info) ((unsigned char)(info))
-@@ -146,19 +64,6 @@
- /* Macro for constructing r_info from field values. */
- #define ELF64_R_INFO(sym, type) (((sym) << 32) + (unsigned char)(type))
-
+-/* Macros for accessing the fields of r_info. */
+-#define ELF64_R_SYM(info) ((info) >> 32)
+-#define ELF64_R_TYPE(info) ((info) & 0xffffffffL)
+-
+-/* Macro for constructing r_info from field values. */
+-#define ELF64_R_INFO(sym, type) (((sym) << 32) + ((type) & 0xffffffffL))
+-
-/*
- * Symbol table entries.
- */
-
-typedef struct {
-- Elf64_Half st_name; /* String table index of name. */
+- Elf64_Word st_name; /* String table index of name. */
- unsigned char st_info; /* Type and binding information. */
- unsigned char st_other; /* Reserved (not used). */
-- Elf64_Quarter st_shndx; /* Section index of symbol. */
+- Elf64_Half st_shndx; /* Section index of symbol. */
- Elf64_Addr st_value; /* Symbol value. */
-- Elf64_Size st_size; /* Size of associated object. */
+- Elf64_Xword st_size; /* Size of associated object. */
-} Elf64_Sym;
-
- /* Macros for accessing the fields of st_info. */
- #define ELF64_ST_BIND(info) ((info) >> 4)
- #define ELF64_ST_TYPE(info) ((info) & 0xf)
---- sys/sys/elf64.h~ 2006-03-04 20:44:39.000000000 +0100
-+++ sys/sys/elf64.h 2006-03-04 20:46:46.000000000 +0100
-@@ -37,10 +37,7 @@
- */
-
- typedef u_int64_t Elf64_Addr;
--typedef u_int32_t Elf64_Half;
- typedef u_int64_t Elf64_Off;
--typedef int64_t Elf64_Sword;
--typedef u_int64_t Elf64_Word;
- typedef u_int64_t Elf64_Size;
- typedef u_int16_t Elf64_Quarter;
-
---- sys/sys/elf_common.h~ 2006-03-01 20:28:58.000000000 +0100
-+++ sys/sys/elf_common.h 2006-03-04 21:01:38.000000000 +0100
+-/* Macros for accessing the fields of st_info. */
+-#define ELF64_ST_BIND(info) ((info) >> 4)
+-#define ELF64_ST_TYPE(info) ((info) & 0xf)
+-
+-/* Macro for constructing st_info from field values. */
+-#define ELF64_ST_INFO(bind, type) (((bind) << 4) + ((type) & 0xf))
+-
+-/* Macro for accessing the fields of st_other. */
+-#define ELF64_ST_VISIBILITY(oth) ((oth) & 0x3)
+-
+ #endif /* !_SYS_ELF64_H_ */
+Index: sys/sys/elf_common.h
+===================================================================
+--- sys/sys/elf_common.h.orig 2006-08-25 10:54:25.958082000 +0200
++++ sys/sys/elf_common.h 2006-08-25 10:56:35.000000000 +0200
@@ -29,6 +29,8 @@
#ifndef _SYS_ELF_COMMON_H_
#define _SYS_ELF_COMMON_H_ 1
@@ -295,52 +319,3 @@
} Elf_Note;
/* Indexes into the e_ident array. Keep synced with
---- sys/sys/elf64.h~ 2006-03-04 20:47:50.000000000 +0100
-+++ sys/sys/elf64.h 2006-03-04 21:01:55.000000000 +0100
-@@ -31,15 +31,16 @@
-
- #include <sys/elf_common.h>
- #include <elf.h>
-+#include <stdint.h>
-
- /*
- * ELF definitions common to all 64-bit architectures.
- */
-
--typedef u_int64_t Elf64_Addr;
--typedef u_int64_t Elf64_Off;
--typedef u_int64_t Elf64_Size;
--typedef u_int16_t Elf64_Quarter;
-+typedef uint64_t Elf64_Addr;
-+typedef uint64_t Elf64_Off;
-+typedef uint64_t Elf64_Size;
-+typedef uint16_t Elf64_Quarter;
-
- /*
- * Types of dynamic symbol hash table bucket and chain elements.
---- sys/sys/elf32.h~ 2006-03-04 20:47:50.000000000 +0100
-+++ sys/sys/elf32.h 2006-03-04 21:02:14.000000000 +0100
-@@ -31,17 +31,18 @@
-
- #include <sys/elf_common.h>
- #include <elf.h>
-+#include <stdint.h>
-
- /*
- * ELF definitions common to all 32-bit architectures.
- */
-
--typedef u_int32_t Elf32_Addr;
--typedef u_int16_t Elf32_Half;
--typedef u_int32_t Elf32_Off;
-+typedef uint32_t Elf32_Addr;
-+typedef uint16_t Elf32_Half;
-+typedef uint32_t Elf32_Off;
- typedef int32_t Elf32_Sword;
--typedef u_int32_t Elf32_Word;
--typedef u_int32_t Elf32_Size;
-+typedef uint32_t Elf32_Word;
-+typedef uint32_t Elf32_Size;
- typedef Elf32_Off Elf32_Hashelt;
-
- /* Macros for accessing the fields of r_info. */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2006-08-24 12:51:57 UTC (rev 1642)
+++ trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2006-08-25 07:23:16 UTC (rev 1643)
@@ -35,9 +35,9 @@
typedef __uint64_t __size_t; /* sizeof() */
typedef __int64_t __ssize_t; /* byte count or error */
+#endif
- typedef __int64_t __time_t; /* time()... */
typedef __uint64_t __uintfptr_t;
typedef __uint64_t __uintmax_t;
+ typedef __uint64_t __uintptr_t;
diff -ur sys.orig/i386/include/_types.h sys/i386/include/_types.h
--- sys.orig/i386/include/_types.h 2004-03-20 21:41:40.000000000 +0100
+++ sys/i386/include/_types.h 2005-01-13 05:38:54.000000000 +0100
@@ -75,8 +75,8 @@
typedef __int32_t __segsz_t; /* segment size (in pages) */
-typedef __uint32_t __size_t; /* sizeof() */
typedef __int32_t __ssize_t; /* byte count or error */
- typedef __int32_t __time_t; /* time()... */
typedef __uint32_t __uintfptr_t;
+ typedef __uint64_t __uintmax_t;
diff -ur sys.orig/dev/usb/usb.h sys/dev/usb/usb.h
--- sys.orig/dev/usb/usb.h 2005-03-02 21:21:45.000000000 +0100
+++ sys/dev/usb/usb.h 2005-03-02 21:26:56.000000000 +0100
@@ -230,7 +230,7 @@
diff -ur sys.orig/sys/_types.h sys/sys/_types.h
--- sys.orig/sys/_types.h 2004-06-19 19:58:32.000000000 +0200
+++ sys/sys/_types.h 2005-03-02 21:27:37.000000000 +0100
-@@ -31,16 +31,14 @@
+@@ -31,6 +31,7 @@
#include <sys/cdefs.h>
#include <machine/_types.h>
@@ -238,13 +238,18 @@
/*
* Standard type definitions.
- */
+@@ -39,10 +40,14 @@
+ typedef __int64_t __blkcnt_t; /* file block count */
typedef __int32_t __clockid_t; /* clock_gettime()... */
typedef __uint32_t __fflags_t; /* file flags */
--typedef __uint64_t __fsblkcnt_t;
--typedef __uint64_t __fsfilcnt_t;
++#ifndef __GLIBC__
+ typedef __uint64_t __fsblkcnt_t;
+ typedef __uint64_t __fsfilcnt_t;
++#endif
typedef __uint32_t __gid_t;
--typedef __int64_t __id_t; /* can hold a gid_t, pid_t, or uid_t */
++#ifndef __GLIBC__
+ typedef __int64_t __id_t; /* can hold a gid_t, pid_t, or uid_t */
++#endif
typedef __uint32_t __ino_t; /* inode number */
typedef long __key_t; /* IPC key (for Sys V IPC) */
typedef __int32_t __lwpid_t; /* Thread ID (a.k.a. LWP) */
Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules 2006-08-24 12:51:57 UTC (rev 1642)
+++ trunk/kfreebsd-kernel-headers/debian/rules 2006-08-25 07:23:16 UTC (rev 1643)
@@ -8,8 +8,8 @@
kfreebsd_cpu := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
HEADERS_PACKAGE := $(CURDIR)/debian/kfreebsd-kernel-headers
-SRC_TAR := /usr/src/kfreebsd-source-5.4.tar.bz2
-SRC_DIR := kfreebsd-source-5.4
+SRC_TAR := /usr/src/kfreebsd-source-6.1.tar.bz2
+SRC_DIR := kfreebsd-source-6.1
clean:
dh_testdir
More information about the Glibc-bsd-commits
mailing list