From e1dc799f848d0177f615d34e4840649cb2b0982c Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 7 Feb 2013 05:07:26 +0000 Subject: [PATCH] aufs: Hide CONFIG_AUFS_PROC_MAP, which requires a patch we don't apply (Closes: #693332) svn path=/dists/trunk/linux/; revision=19795 --- debian/changelog | 2 ++ .../all/aufs3/AUFS_PROC_MAP-is-BROKEN.patch | 17 +++++++++++++++++ debian/patches/series | 3 ++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 debian/patches/features/all/aufs3/AUFS_PROC_MAP-is-BROKEN.patch diff --git a/debian/changelog b/debian/changelog index 7ef23ca65..c4fc2d8f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ linux (3.7.6-1~experimental.1) UNRELEASED; urgency=low [ 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 Thu, 07 Feb 2013 03:14:30 +0000 diff --git a/debian/patches/features/all/aufs3/AUFS_PROC_MAP-is-BROKEN.patch b/debian/patches/features/all/aufs3/AUFS_PROC_MAP-is-BROKEN.patch new file mode 100644 index 000000000..2cfce5b94 --- /dev/null +++ b/debian/patches/features/all/aufs3/AUFS_PROC_MAP-is-BROKEN.patch @@ -0,0 +1,17 @@ +From: Ben Hutchings +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) diff --git a/debian/patches/series b/debian/patches/series index ffd88ab6d..1f35b18aa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,6 +15,8 @@ features/all/aufs3/aufs3-kbuild.patch 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 @@ debian/mgag200-disable-autoload.patch bugfix/all/ath6kl-do-not-use-virt_addr_valid.patch features/all/xen/microcode-api-update.patch -