[kernel] r19795 - in dists/trunk/linux/debian: . patches patches/features/all/aufs3

[Ben Hutchings]

Author: benh
Date: Thu Feb  7 05:07:26 2013
New Revision: 19795

Log:
aufs: Hide CONFIG_AUFS_PROC_MAP, which requires a patch we don't apply (Closes: #693332)

Added:
   dists/trunk/linux/debian/patches/features/all/aufs3/AUFS_PROC_MAP-is-BROKEN.patch
Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/patches/series

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Thu Feb  7 04:42:39 2013	(r19794)
+++ dists/trunk/linux/debian/changelog	Thu Feb  7 05:07:26 2013	(r19795)
@@ -7,6 +7,8 @@
 
   [ Ben Hutchings ]
   * Add powerpcspe architecture, thanks to Roland Stigge (Closes: #693042)
+  * aufs: Hide CONFIG_AUFS_PROC_MAP, which requires a patch we don't apply
+    (Closes: #693332)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 07 Feb 2013 03:14:30 +0000
 

Added: dists/trunk/linux/debian/patches/features/all/aufs3/AUFS_PROC_MAP-is-BROKEN.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/features/all/aufs3/AUFS_PROC_MAP-is-BROKEN.patch	Thu Feb  7 05:07:26 2013	(r19795)
@@ -0,0 +1,17 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: AUFS_PROC_MAP is BROKEN
+Date: Thu, 07 Feb 2013 05:02:18 +0000
+Bug-Debian: http://bugs.debian.org/693332
+
+This config option depends on aufs3-proc_map.patch, which we don't apply.
+
+--- a/fs/aufs/Kconfig
++++ b/fs/aufs/Kconfig
+@@ -102,6 +102,7 @@ config AUFS_RDU
+ 
+ config AUFS_PROC_MAP
+ 	bool "support for /proc/maps and lsof(1)"
++	depends on BROKEN
+ 	depends on PROC_FS
+ 	help
+ 	When you issue mmap(2) in aufs, it is actually a direct mmap(2)

Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series	Thu Feb  7 04:42:39 2013	(r19794)
+++ dists/trunk/linux/debian/patches/series	Thu Feb  7 05:07:26 2013	(r19795)
@@ -15,6 +15,8 @@
 features/all/aufs3/aufs3-add.patch
 # mark as staging/crap
 features/all/aufs3/mark-as-staging.patch
+# hide broken config option
+features/all/aufs3/AUFS_PROC_MAP-is-BROKEN.patch
 
 bugfix/ia64/hardcode-arch-script-output.patch
 bugfix/mips/disable-advansys.patch
@@ -70,4 +72,3 @@
 bugfix/all/ath6kl-do-not-use-virt_addr_valid.patch
 
 features/all/xen/microcode-api-update.patch
-