[kernel] r17014 - in dists/trunk/linux-2.6/debian/patches: features/all/aufs2 series

[Ben Hutchings]

Author: benh
Date: Mon Mar  7 00:15:00 2011
New Revision: 17014

Log:
Add script to update aufs patches

Added:
   dists/trunk/linux-2.6/debian/patches/features/all/aufs2/gen-patch   (contents, props changed)
Modified:
   dists/trunk/linux-2.6/debian/patches/series/base

Added: dists/trunk/linux-2.6/debian/patches/features/all/aufs2/gen-patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/aufs2/gen-patch	Mon Mar  7 00:15:00 2011	(r17014)
@@ -0,0 +1,17 @@
+#!/bin/bash -e
+
+aufs_dir="$1"
+
+for patch in aufs2-{base,kbuild,standalone}.patch; do
+    sed 's/^+.*EXPORT_SYMBOL\b/&_GPL/' < "$aufs_dir"/"$patch" \
+	> debian/patches/features/all/aufs2/"$patch"
+done
+
+{
+    cd "$aufs_dir" &&						\
+	{ find fs -type f; echo include/linux/aufs_type.h; } |	\
+	LC_ALL=C sort |						\
+	while read file; do
+	    diff -uN a/"$file" "$file" | filterdiff --addnewprefix=b/
+	done
+} > debian/patches/features/all/aufs2/aufs2-add.patch

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Sun Mar  6 23:39:03 2011	(r17013)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Mon Mar  7 00:15:00 2011	(r17014)
@@ -6,11 +6,11 @@
 
 + features/all/sound-pci-cs46xx-request_firmware.patch
 
-# patches from aufs2 repository, with s/EXPORT_SYMBOL/&_GPL/
+# Patches and source files from aufs2 repository, imported with
+# debian/patches/features/all/aufs2/gen-patch.
 + features/all/aufs2/aufs2-base.patch
 + features/all/aufs2/aufs2-standalone.patch
 + features/all/aufs2/aufs2-kbuild.patch
-# content of fs/ and include/linux/aufs_types.h from aufs2 repository
 + features/all/aufs2/aufs2-add.patch
 # mark as staging/crap
 + features/all/aufs2/mark-as-staging.patch