[Glibc-bsd-commits] r3981 - in trunk/kfreebsd-kernel-headers/debian: . patches
Robert Millan
rmh at alioth.debian.org
Wed Jan 18 18:36:58 UTC 2012
Author: rmh
Date: 2012-01-18 18:36:58 +0000 (Wed, 18 Jan 2012)
New Revision: 3981
Removed:
trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff
trunk/kfreebsd-kernel-headers/debian/patches/025_iconv.diff
trunk/kfreebsd-kernel-headers/debian/patches/040_internal_types.patch
Modified:
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff
trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff
trunk/kfreebsd-kernel-headers/debian/patches/series
trunk/kfreebsd-kernel-headers/debian/rules
Log:
Fixup __aligned and u_(char|short|int|long) with sed rules instead of patches. (Closes: #637715)
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2012-01-18 18:20:14 UTC (rev 3980)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2012-01-18 18:36:58 UTC (rev 3981)
@@ -1,8 +1,10 @@
kfreebsd-kernel-headers (0.64) UNRELEASED; urgency=low
* Install x86 directory on i386/amd64.
+ * Fixup __aligned and u_(char|short|int|long) with sed rules instead
+ of patches. (Closes: #637715)
- -- Robert Millan <rmh at debian.org> Wed, 18 Jan 2012 19:20:01 +0100
+ -- Robert Millan <rmh at debian.org> Wed, 18 Jan 2012 19:36:52 +0100
kfreebsd-kernel-headers (0.63) unstable; urgency=low
Modified: trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff 2012-01-18 18:20:14 UTC (rev 3980)
+++ trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff 2012-01-18 18:36:58 UTC (rev 3981)
@@ -1,8 +1,3 @@
----
- sys/vm/swap_pager.h | 3 +++
- sys/vm/vm_param.h | 3 ++-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
--- a/sys/vm/vm_param.h
+++ b/sys/vm/vm_param.h
@@ -67,6 +67,7 @@
@@ -13,15 +8,6 @@
#include <machine/vmparam.h>
/*
-@@ -106,7 +107,7 @@
- */
- #define XSWDEV_VERSION 1
- struct xswdev {
-- u_int xsw_version;
-+ unsigned int xsw_version;
- dev_t xsw_dev;
- int xsw_flags;
- int xsw_nblks;
--- a/sys/vm/swap_pager.h
+++ b/sys/vm/swap_pager.h
@@ -38,6 +38,9 @@
Modified: trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2012-01-18 18:20:14 UTC (rev 3980)
+++ trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2012-01-18 18:36:58 UTC (rev 3981)
@@ -1,13 +1,3 @@
----
- sys/net/if_dl.h | 14 +++++++-------
- sys/net/if_var.h | 20 +++++++++++++++++---
- sys/net/route.h | 2 ++
- sys/netinet/in_var.h | 2 ++
- sys/netinet/ip_var.h | 2 ++
- sys/netinet6/in6_var.h | 3 +++
- sys/sys/fnv_hash.h | 4 +++-
- 7 files changed, 36 insertions(+), 11 deletions(-)
-
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -33,6 +33,8 @@
@@ -19,29 +9,6 @@
/*
* Kernel resident routing tables.
*
---- a/sys/net/if_dl.h
-+++ b/sys/net/if_dl.h
-@@ -59,13 +59,13 @@
- * Structure of a Link-Level sockaddr:
- */
- struct sockaddr_dl {
-- u_char sdl_len; /* Total length of sockaddr */
-- u_char sdl_family; /* AF_LINK */
-- u_short sdl_index; /* if != 0, system given index for interface */
-- u_char sdl_type; /* interface type */
-- u_char sdl_nlen; /* interface name length, no trailing 0 reqd. */
-- u_char sdl_alen; /* link level address length */
-- u_char sdl_slen; /* link layer selector length */
-+ unsigned char sdl_len; /* Total length of sockaddr */
-+ unsigned char sdl_family; /* AF_LINK */
-+ unsigned short sdl_index; /* if != 0, system given index for interface */
-+ unsigned char sdl_type; /* interface type */
-+ unsigned char sdl_nlen; /* interface name length, no trailing 0 reqd. */
-+ unsigned char sdl_alen; /* link level address length */
-+ unsigned char sdl_slen; /* link layer selector length */
- char sdl_data[46]; /* minimum work area, can be larger;
- contains both if name and ll address */
- };
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -33,6 +33,9 @@
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff 2012-01-18 18:20:14 UTC (rev 3980)
+++ trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff 2012-01-18 18:36:58 UTC (rev 3981)
@@ -1,27 +0,0 @@
----
- sys/amd64/include/fpu.h | 2 +-
- sys/i386/include/npx.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/sys/i386/include/npx.h
-+++ b/sys/i386/include/npx.h
-@@ -111,7 +111,7 @@
- } sv_fp[8];
- struct xmmacc sv_xmm[8];
- u_char sv_pad[224];
--} __aligned(16);
-+} __attribute__((aligned(16)));
-
- union savefpu {
- struct save87 sv_87;
---- a/sys/amd64/include/fpu.h
-+++ b/sys/amd64/include/fpu.h
-@@ -71,7 +71,7 @@
- } sv_fp[8];
- struct xmmacc sv_xmm[16];
- u_char sv_pad[96];
--} __aligned(16);
-+} __attribute__((aligned(16)));
-
- #ifdef _KERNEL
- struct fpu_kern_ctx {
Modified: trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2012-01-18 18:20:14 UTC (rev 3980)
+++ trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2012-01-18 18:36:58 UTC (rev 3981)
@@ -13,27 +13,27 @@
void enable_intr(void);
void halt(void);
void ia32_pause(void);
--u_char inb(u_int port);
--u_int inl(u_int port);
--void insb(u_int port, void *addr, size_t count);
--void insl(u_int port, void *addr, size_t count);
--void insw(u_int port, void *addr, size_t count);
+-unsigned char inb(unsigned int port);
+-unsigned int inl(unsigned int port);
+-void insb(unsigned int port, void *addr, size_t count);
+-void insl(unsigned int port, void *addr, size_t count);
+-void insw(unsigned int port, void *addr, size_t count);
register_t intr_disable(void);
void intr_restore(register_t ef);
void invd(void);
@@ -724,12 +721,6 @@
- void load_fs(u_short sel);
- void load_gs(u_short sel);
- void ltr(u_short sel);
--void outb(u_int port, u_char data);
--void outl(u_int port, u_int data);
--void outsb(u_int port, const void *addr, size_t count);
--void outsl(u_int port, const void *addr, size_t count);
--void outsw(u_int port, const void *addr, size_t count);
--void outw(u_int port, u_short data);
- u_int rcr0(void);
- u_int rcr2(void);
- u_int rcr3(void);
+ void load_fs(unsigned short sel);
+ void load_gs(unsigned short sel);
+ void ltr(unsigned short sel);
+-void outb(unsigned int port, unsigned char data);
+-void outl(unsigned int port, unsigned int data);
+-void outsb(unsigned int port, const void *addr, size_t count);
+-void outsl(unsigned int port, const void *addr, size_t count);
+-void outsw(unsigned int port, const void *addr, size_t count);
+-void outw(unsigned int port, unsigned short data);
+ unsigned int rcr0(void);
+ unsigned int rcr2(void);
+ unsigned int rcr3(void);
--- a/sys/sys/_types.h
+++ b/sys/sys/_types.h
@@ -31,6 +31,7 @@
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/025_iconv.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/025_iconv.diff 2012-01-18 18:20:14 UTC (rev 3980)
+++ trunk/kfreebsd-kernel-headers/debian/patches/025_iconv.diff 2012-01-18 18:36:58 UTC (rev 3981)
@@ -1,15 +0,0 @@
----
- sys/sys/iconv.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/sys/sys/iconv.h
-+++ b/sys/sys/iconv.h
-@@ -88,7 +88,7 @@
- #define ENCODING_UNICODE "UTF-16BE"
- #define KICONV_VENDOR_MICSFT 1 /* Microsoft Vendor Code for quirk */
-
--int kiconv_add_xlat_table(const char *, const char *, const u_char *);
-+int kiconv_add_xlat_table(const char *, const char *, const unsigned char *);
- int kiconv_add_xlat16_cspair(const char *, const char *, int);
- int kiconv_add_xlat16_cspairs(const char *, const char *);
- int kiconv_add_xlat16_table(const char *, const char *, const void *, int);
Modified: trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff 2012-01-18 18:20:14 UTC (rev 3980)
+++ trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff 2012-01-18 18:36:58 UTC (rev 3981)
@@ -20,5 +20,5 @@
- uint64_t pc_switchtime; /* cpu_ticks() at last csw */
+ u_int64_t pc_switchtime; /* cpu_ticks() at last csw */
int pc_switchticks; /* `ticks' at last csw */
- u_int pc_cpuid; /* This cpu number */
+ unsigned int pc_cpuid; /* This cpu number */
STAILQ_ENTRY(pcpu) pc_allcpu;
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/040_internal_types.patch
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/040_internal_types.patch 2012-01-18 18:20:14 UTC (rev 3980)
+++ trunk/kfreebsd-kernel-headers/debian/patches/040_internal_types.patch 2012-01-18 18:36:58 UTC (rev 3981)
@@ -1,33 +0,0 @@
----
- sys/sys/ucred.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/sys/sys/ucred.h
-+++ b/sys/sys/ucred.h
-@@ -48,7 +48,7 @@
- */
- #if defined(_KERNEL) || defined(_WANT_UCRED)
- struct ucred {
-- u_int cr_ref; /* reference count */
-+ __u_int cr_ref; /* reference count */
- #define cr_startcopy cr_uid
- uid_t cr_uid; /* effective user id */
- uid_t cr_ruid; /* real user id */
-@@ -60,7 +60,7 @@
- struct uidinfo *cr_ruidinfo; /* per ruid resource consumption */
- struct prison *cr_prison; /* jail(2) */
- struct loginclass *cr_loginclass; /* login class */
-- u_int cr_flags; /* credential flags */
-+ __u_int cr_flags; /* credential flags */
- void *cr_pspare2[2]; /* general use 2 */
- #define cr_endcopy cr_label
- struct label *cr_label; /* MAC label */
-@@ -83,7 +83,7 @@
- * This is the external representation of struct ucred.
- */
- struct xucred {
-- u_int cr_version; /* structure layout version */
-+ __u_int cr_version; /* structure layout version */
- uid_t cr_uid; /* effective user id */
- short cr_ngroups; /* number of groups */
- gid_t cr_groups[XU_NGROUPS]; /* groups */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series 2012-01-18 18:20:14 UTC (rev 3980)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series 2012-01-18 18:36:58 UTC (rev 3981)
@@ -14,7 +14,6 @@
009_inetutils.diff
010_glibc.diff
011_wine.diff
-012_strace.diff
013_mips.diff
014_misc.diff
015_cam.diff
@@ -24,7 +23,6 @@
021_machine__types.diff
022_sys_buf_h.diff
024_ioccom.diff
-025_iconv.diff
026_acpiio.diff
027_ktrace.diff
028_fbio.diff
@@ -36,5 +34,4 @@
034_usb.diff
035_devfs_int.diff
039_mips_misc.diff
-040_internal_types.patch
042_syscall_stubs.diff
Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules 2012-01-18 18:20:14 UTC (rev 3980)
+++ trunk/kfreebsd-kernel-headers/debian/rules 2012-01-18 18:36:58 UTC (rev 3981)
@@ -53,6 +53,8 @@
-e 's/#\s*ifndef\s*__GNUCLIKE_[A-Z_]\+\(\s\|$$\)/#if 0/g' \
\
-e 's/__packed\(\s\|;\)/ __attribute__((__packed__))\1/g' \
+ -e 's/__aligned(\([0-9]*\))/ __attribute__((aligned(\1)))/g' \
+ -e 's/\(\s\|^\|(\)u_\(char\|int\|short\|long\)\(\s\)/\1unsigned \2\3/g' \
; done)
QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a || test $$? = 2
More information about the Glibc-bsd-commits
mailing list