packages: kernel/kernel-TIOCGDEV.patch, kernel/kernel-inittmpfs.patch, kern...
arekm
arekm at pld-linux.org
Wed Jan 5 20:36:34 CET 2011
Author: arekm Date: Wed Jan 5 19:36:34 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- drop obsolete patches (mostly merged)
---- Files affected:
packages/kernel:
kernel-TIOCGDEV.patch (1.5 -> 1.6) , kernel-inittmpfs.patch (1.4 -> 1.5) , kernel.spec (1.866 -> 1.867) , kernel-ipvs-nfct.patch (1.5 -> NONE) (REMOVED), kernel-scsi-corruption.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/kernel/kernel-TIOCGDEV.patch
diff -u packages/kernel/kernel-TIOCGDEV.patch:1.5 packages/kernel/kernel-TIOCGDEV.patch:1.6
--- packages/kernel/kernel-TIOCGDEV.patch:1.5 Thu Oct 21 09:50:34 2010
+++ packages/kernel/kernel-TIOCGDEV.patch Wed Jan 5 20:36:29 2011
@@ -5,7 +5,6 @@
add tty ioctl to figure physical device of the console.
arch/alpha/include/asm/ioctls.h | 1 +
- arch/arm/include/asm/ioctls.h | 1 +
arch/ia64/include/asm/ioctls.h | 1 +
arch/m68k/include/asm/ioctls.h | 1 +
arch/mips/include/asm/ioctls.h | 1 +
@@ -28,36 +27,6 @@
#define TIOCSERCONFIG 0x5453
#define TIOCSERGWILD 0x5454
---- a/arch/arm/include/asm/ioctls.h
-+++ b/arch/arm/include/asm/ioctls.h
-@@ -52,6 +52,7 @@
- #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
- #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
-+#define TIOCGDEV _IOR('T',0x32, unsigned int) /* Get real dev no below /dev/console */
- #define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */
-
- #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
- #define FIOCLEX 0x5451
---- a/arch/ia64/include/asm/ioctls.h
-+++ b/arch/ia64/include/asm/ioctls.h
-@@ -59,6 +59,7 @@
- #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
- #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
-+#define TIOCGDEV _IOR('T',0x32, unsigned int) /* Get real dev no below /dev/console */
- #define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */
-
- #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
- #define FIOCLEX 0x5451
---- a/arch/m68k/include/asm/ioctls.h
-+++ b/arch/m68k/include/asm/ioctls.h
-@@ -52,6 +52,7 @@
- #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
- #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
-+#define TIOCGDEV _IOR('T',0x32, unsigned int) /* Get real dev no below /dev/console */
- #define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */
-
- #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
- #define FIOCLEX 0x5451
--- a/arch/mips/include/asm/ioctls.h
+++ b/arch/mips/include/asm/ioctls.h
@@ -83,6 +83,7 @@
@@ -78,16 +47,6 @@
#define TIOCSERCONFIG 0x5453
#define TIOCSERGWILD 0x5454
---- a/arch/s390/include/asm/ioctls.h
-+++ b/arch/s390/include/asm/ioctls.h
-@@ -60,6 +60,7 @@
- #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
- #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
-+#define TIOCGDEV _IOR('T',0x32, unsigned int) /* Get real dev no below /dev/console */
- #define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */
-
- #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
- #define FIOCLEX 0x5451
--- a/arch/sh/include/asm/ioctls.h
+++ b/arch/sh/include/asm/ioctls.h
@@ -84,6 +84,7 @@
@@ -118,8 +77,8 @@
#define TCGETX 0x5432 /* SYS5 TCGETX compatibility */
#define TCSETX 0x5433
#define TCSETXF 0x5434
---- a/drivers/char/tty_io.c
-+++ b/drivers/char/tty_io.c
+--- a/drivers/tty/tty_io.c
++++ b/drivers/tty/tty_io.c
@@ -2507,6 +2507,21 @@ long tty_ioctl(struct file *file, unsign
case TIOCSETD:
return tiocsetd(tty, p);
================================================================
Index: packages/kernel/kernel-inittmpfs.patch
diff -u packages/kernel/kernel-inittmpfs.patch:1.4 packages/kernel/kernel-inittmpfs.patch:1.5
--- packages/kernel/kernel-inittmpfs.patch:1.4 Sun Dec 13 19:58:17 2009
+++ packages/kernel/kernel-inittmpfs.patch Wed Jan 5 20:36:29 2011
@@ -6,7 +6,7 @@
If you don't know what Access Control Lists are, say N.
+config TMPFS_ROOT
-+ bool "Use tmpfs instrad of ramfs for initramfs"
++ bool "Use tmpfs instead of ramfs for initramfs"
+ depends on TMPFS && SHMEM
+ default y
+ help
================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.866 packages/kernel/kernel.spec:1.867
--- packages/kernel/kernel.spec:1.866 Wed Jan 5 10:07:16 2011
+++ packages/kernel/kernel.spec Wed Jan 5 20:36:29 2011
@@ -191,14 +191,8 @@
# http://switch.dl.sourceforge.net/sourceforge/l7-filter/netfilter-layer7-v2.20.tar.gz
Patch40: kernel-layer7.patch
-# http://www.ssi.bg/~ja/nfct/ipvs-nfct-2.6.34-1.diff
-Patch41: kernel-ipvs-nfct.patch
-
### End netfilter
-# http://marc.info/?l=dm-devel&m=129073232606808&q=raw
-Patch48: kernel-scsi-corruption.patch
-
# http://zph.bratcheda.org/linux-2.6.26.3-zph.patch
Patch49: kernel-zph.patch
@@ -296,7 +290,7 @@
Patch5000: kernel-apparmor.patch
# for rescuecd
-# based on http://ftp.leg.uct.ac.za/pub/linux/rip/inittmpfs-2.6.14.diff.gz
+# based on ftp://ftp.leg.uct.ac.za/pub/linux/rip/tmpfs_root-2.6.30.diff.gz
Patch7000: kernel-inittmpfs.patch
# based on http://www.grsecurity.net/~spender/grsecurity-2.2.1-2.6.36.2-201012192125.patch
@@ -718,15 +712,9 @@
# kernel-layer7.patch
%patch40 -p1
-# ipvs-nfct
-%patch41 -p1
-
##
# end of netfilter
-# scsi
-%patch48 -p1
-
# zph
%patch49 -p1
@@ -1541,6 +1529,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.867 2011/01/05 19:36:29 arekm
+- drop obsolete patches (mostly merged)
+
Revision 1.866 2011/01/05 09:07:16 arekm
- fetch 2.6.37; .36 is on LINUX_2_6_36
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-TIOCGDEV.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-inittmpfs.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.866&r2=1.867&f=u
More information about the pld-cvs-commit
mailing list