commit d3addd79ee0b71067fc4e522202a2db314b57aa2
Author: Jakub Bogusz <[email protected]>
Date: Wed Dec 12 21:27:49 2012 +0100
- updated to 3.7[.0]
- updated all patches wrt. uapi subdir
linux-libc-headers-atm-vbr.patch | 22 +++++++++-------------
linux-libc-headers-endian.patch | 8 ++++----
linux-libc-headers-esfq.patch | 4 ++--
linux-libc-headers-fbsplash.patch | 12 ++++++------
linux-libc-headers-imq.patch | 16 ++++++++--------
linux-libc-headers-wrr.patch | 5 ++---
linux-libc-headers.spec | 6 +++---
vserver.patch | 4 ++--
8 files changed, 36 insertions(+), 41 deletions(-)
---
diff --git a/linux-libc-headers.spec b/linux-libc-headers.spec
index 6e02b8f..ff04b87 100644
--- a/linux-libc-headers.spec
+++ b/linux-libc-headers.spec
@@ -2,8 +2,8 @@
# Conditional build:
%bcond_without tests # build without tests
-%define basever 3.6
-%define postver 6
+%define basever 3.7
+%define postver 0
Summary: Linux kernel headers for use with C libraries
Summary(pl.UTF-8): Nagłówki jądra Linuksa do użytku z bibliotekami C
Name: linux-libc-headers
@@ -13,7 +13,7 @@ Epoch: 7
License: GPL v2
Group: Development
Source0:
http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
-# Source0-md5: 1a1760420eac802c541a20ab51a093d1
+# Source0-md5: 21223369d682bcf44bcdfe1521095983
%if "%{postver}" > "0"
Source1: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
# Source1-md5: 363e730147333182616cc687345e7fe2
diff --git a/linux-libc-headers-atm-vbr.patch b/linux-libc-headers-atm-vbr.patch
index f2c66e0..83df4d5 100644
--- a/linux-libc-headers-atm-vbr.patch
+++ b/linux-libc-headers-atm-vbr.patch
@@ -1,11 +1,6 @@
-Index: linux/include/linux/atm.h
-===================================================================
-RCS file: /afs/cmf/project/cvsroot/linux/include/linux/atm.h,v
-retrieving revision 1.2
-diff -u -r1.2 atm.h
---- linux/include/linux/atm.h 12 Feb 2003 20:56:33 -0000 1.2
-+++ linux/include/linux/atm.h 9 Apr 2003 12:08:38 -0000
-@@ -72,7 +72,7 @@
+--- linux-3.7/include/uapi/linux/atm.h.orig 2012-12-11 04:30:57.000000000
+0100
++++ linux-3.7/include/uapi/linux/atm.h 2012-12-12 21:23:41.327635859 +0100
+@@ -70,7 +70,7 @@
/* connection identifier range; socket must be
bound or connected */
#define SO_ATMQOS __SO_ENCODE(SOL_ATM,2,struct atm_qos)
@@ -14,7 +9,7 @@ diff -u -r1.2 atm.h
#define SO_ATMSAP __SO_ENCODE(SOL_ATM,3,struct atm_sap)
/* Service Access Point */
#define SO_ATMPVC __SO_ENCODE(SOL_ATM,4,struct sockaddr_atmpvc)
-@@ -127,9 +127,11 @@
+@@ -126,9 +126,11 @@
#define ATM_NONE 0 /* no traffic */
#define ATM_UBR 1
#define ATM_CBR 2
@@ -27,7 +22,7 @@ diff -u -r1.2 atm.h
#define ATM_MAX_PCR -1 /* maximum available PCR */
-@@ -140,6 +142,11 @@
+@@ -139,6 +141,11 @@
int min_pcr; /* minimum PCR in cells per second */
int max_cdv; /* maximum CDV in microseconds */
int max_sdu; /* maximum SDU in bytes */
@@ -39,10 +34,11 @@ diff -u -r1.2 atm.h
/* extra params for ABR */
unsigned int icr; /* Initial Cell Rate (24-bit) */
unsigned int tbe; /* Transient Buffer Exposure (24-bit)
*/
-@@ -243,4 +251,37 @@
- };
+@@ -238,4 +245,38 @@
+
typedef unsigned short atm_backend_t;
++
+struct atm_trafprm_compat {
+ unsigned char traffic_class; /* traffic class (ATM_UBR, ...) */
+ int max_pcr; /* maximum PCR in cells per second */
@@ -76,4 +72,4 @@ diff -u -r1.2 atm.h
+
+#define SO_ATMQOS_COMPAT __SO_ENCODE(SOL_ATM,2,struct atm_qos_compat)
+ /* Quality of Service setting (no vbr support) */
- #endif
+ #endif /* _UAPI_LINUX_ATM_H */
diff --git a/linux-libc-headers-endian.patch b/linux-libc-headers-endian.patch
index 90bdaa5..2e1cac8 100644
--- a/linux-libc-headers-endian.patch
+++ b/linux-libc-headers-endian.patch
@@ -1,5 +1,5 @@
---- linux-2.6.20/include/linux/aio_abi.h.orig 2007-02-04 19:44:54.000000000
+0100
-+++ linux-2.6.20/include/linux/aio_abi.h 2007-04-02 21:27:18.150605175
+0200
+--- linux-3.7/include/uapi/linux/aio_abi.h.orig 2007-02-04
19:44:54.000000000 +0100
++++ linux-3.7/include/uapi/linux/aio_abi.h 2007-04-02 21:27:18.150605175
+0200
@@ -28,7 +28,11 @@
#define __LINUX__AIO_ABI_H
@@ -36,8 +36,8 @@
/*
* we always use a 64bit off_t when communicating
---- linux-2.6.20/include/linux/raid/md_p.h.orig 2007-02-04
19:44:54.000000000 +0100
-+++ linux-2.6.20/include/linux/raid/md_p.h 2007-04-02 21:32:46.657325707
+0200
+--- linux-3.7/include/uapi/linux/raid/md_p.h.orig 2007-02-04
19:44:54.000000000 +0100
++++ linux-3.7/include/uapi/linux/raid/md_p.h 2007-04-02 21:32:46.657325707
+0200
@@ -15,6 +15,10 @@
#ifndef _MD_P_H
#define _MD_P_H
diff --git a/linux-libc-headers-esfq.patch b/linux-libc-headers-esfq.patch
index 050a725..9ba0d98 100644
--- a/linux-libc-headers-esfq.patch
+++ b/linux-libc-headers-esfq.patch
@@ -1,5 +1,5 @@
---- linux-3.3/include/linux/pkt_sched.h.orig 2012-03-19 00:15:34.000000000
+0100
-+++ linux-3.3/include/linux/pkt_sched.h 2012-03-19 17:54:02.813513839
+0100
+--- linux-3.7/include/uapi/linux/pkt_sched.h.orig 2012-03-19
00:15:34.000000000 +0100
++++ linux-3.7/include/uapi/linux/pkt_sched.h 2012-03-19 17:54:02.813513839
+0100
@@ -193,6 +193,31 @@
__s32 allot;
};
diff --git a/linux-libc-headers-fbsplash.patch
b/linux-libc-headers-fbsplash.patch
index 4eb1e05..583ace7 100644
--- a/linux-libc-headers-fbsplash.patch
+++ b/linux-libc-headers-fbsplash.patch
@@ -2,7 +2,7 @@ diff --git a/include/linux/console_splash.h
b/include/linux/console_splash.h
new file mode 100644
index 0000000..c448dd2
--- /dev/null
-+++ b/include/linux/console_splash.h
++++ b/include/uapi/linux/console_splash.h
@@ -0,0 +1,13 @@
+#ifndef _LINUX_CONSOLE_SPLASH_H_
+#define _LINUX_CONSOLE_SPLASH_H_ 1
@@ -17,8 +17,8 @@ index 0000000..c448dd2
+};
+
+#endif
---- linux-2.6.35/include/linux/fb.h.orig 2010-08-02 00:11:14.000000000
+0200
-+++ linux-2.6.35/include/linux/fb.h 2010-08-04 08:51:32.242821619 +0200
+--- linux-3.7/include/uapi/linux/fb.h.orig 2010-08-02 00:11:14.000000000
+0200
++++ linux-3.7/include/uapi/linux/fb.h 2010-08-04 08:51:32.242821619 +0200
@@ -8,6 +8,13 @@
#define FB_MAX 32 /* sufficient for now */
@@ -51,7 +51,7 @@ index 0000000..c448dd2
#define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */
#define FB_TYPE_PLANES 1 /* Non interleaved
planes */
#define FB_TYPE_INTERLEAVED_PLANES 2 /* Interleaved planes */
---- a/include/linux/Kbuild
-+++ b/include/linux/Kbuild
-@@ -342,0 +342,1 @@
+--- a/include/uapi/linux/Kbuild
++++ b/include/uapi/linux/Kbuild
+@@ -418,0 +418,1 @@
+header-y += console_splash.h
diff --git a/linux-libc-headers-imq.patch b/linux-libc-headers-imq.patch
index a832732..771a75e 100644
--- a/linux-libc-headers-imq.patch
+++ b/linux-libc-headers-imq.patch
@@ -1,5 +1,5 @@
---- linux-2.6.17.orig/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01
00:00:00.000000000 +0000
-+++ linux-2.6.17/include/linux/netfilter_ipv4/ipt_IMQ.h 2006-09-06
20:58:51.000000000 +0000
+--- linux-3.7.orig/include/uapi/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01
00:00:00.000000000 +0000
++++ linux-3.7/include/uapi/linux/netfilter_ipv4/ipt_IMQ.h 2006-09-06
20:58:51.000000000 +0000
@@ -0,0 +1,8 @@
+#ifndef _IPT_IMQ_H
+#define _IPT_IMQ_H
@@ -9,12 +9,12 @@
+};
+
+#endif /* _IPT_IMQ_H */
---- linux.orig/include/linux/netfilter_ipv4/Kbuild
-+++ linux/include/linux/netfilter_ipv4/Kbuild
+--- linux.orig/include/uapi/linux/netfilter_ipv4/Kbuild
++++ linux/include/uapi/linux/netfilter_ipv4/Kbuild
@@ -62,0 +62,1 @@
+header-y += ipt_IMQ.h
---- linux-2.6.17.orig/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01
00:00:00.000000000 +0000
-+++ linux-2.6.17/include/linux/netfilter_ipv6/ip6t_IMQ.h 2006-09-06
20:58:51.000000000 +0000
+--- linux-3.7.orig/include/uapi/linux/netfilter_ipv6/ip6t_IMQ.h
1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7/include/uapi/linux/netfilter_ipv6/ip6t_IMQ.h 2006-09-06
20:58:51.000000000 +0000
@@ -0,0 +1,8 @@
+#ifndef _IP6T_IMQ_H
+#define _IP6T_IMQ_H
@@ -24,7 +24,7 @@
+};
+
+#endif /* _IP6T_IMQ_H */
---- linux.orig/include/linux/netfilter_ipv6/Kbuild
-+++ linux/include/linux/netfilter_ipv6/Kbuild
+--- linux.orig/include/uapi/linux/netfilter_ipv6/Kbuild
++++ linux/include/uapi/linux/netfilter_ipv6/Kbuild
@@ -22,0 +22,1 @@
+header-y += ip6t_IMQ.h
diff --git a/linux-libc-headers-wrr.patch b/linux-libc-headers-wrr.patch
index c400942..712246c 100644
--- a/linux-libc-headers-wrr.patch
+++ b/linux-libc-headers-wrr.patch
@@ -1,6 +1,5 @@
-diff -urN linux-2.6.20.orig/include/linux/pkt_sched.h
linux-2.6.20/include/linux/pkt_sched.h
---- linux-2.6.20.orig/include/linux/pkt_sched.h 2007-02-04
19:44:54.000000000 +0100
-+++ linux-2.6.20/include/linux/pkt_sched.h 2007-02-09 09:38:50.000000000
+0100
+--- linux-3.7.orig/include/uapi/linux/pkt_sched.h 2007-02-04
19:44:54.000000000 +0100
++++ linux-3.7/include/uapi/linux/pkt_sched.h 2007-02-09 09:38:50.000000000
+0100
@@ -23,6 +23,11 @@
#define TC_PRIO_MAX 15
diff --git a/vserver.patch b/vserver.patch
index 162386b..2200f01 100644
--- a/vserver.patch
+++ b/vserver.patch
@@ -1,5 +1,5 @@
---- linux-2.6.37/include/linux/capability.h~ 2011-01-19 19:06:36.467207804
+0100
-+++ linux-2.6.37/include/linux/capability.h 2011-01-19 19:07:14.046959978
+0100
+--- linux-3.7/include/uapi/linux/capability.h~ 2011-01-19 19:06:36.467207804
+0100
++++ linux-3.7/include/uapi/linux/capability.h 2011-01-19 19:07:14.046959978
+0100
@@ -356,7 +356,12 @@
#define CAP_LAST_CAP CAP_SYSLOG
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/linux-libc-headers.git/commitdiff/d3addd79ee0b71067fc4e522202a2db314b57aa2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
