From b8645366fc12baa2cf578182a258febbee59af5f Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 7 Mar 2011 00:15:00 +0000 Subject: [PATCH] Add script to update aufs patches svn path=/dists/trunk/linux-2.6/; revision=17014 --- debian/patches/features/all/aufs2/gen-patch | 17 +++++++++++++++++ debian/patches/series/base | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100755 debian/patches/features/all/aufs2/gen-patch diff --git a/debian/patches/features/all/aufs2/gen-patch b/debian/patches/features/all/aufs2/gen-patch new file mode 100755 index 000000000..5797ec5a6 --- /dev/null +++ b/debian/patches/features/all/aufs2/gen-patch @@ -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 diff --git a/debian/patches/series/base b/debian/patches/series/base index 639acd18a..3477e3f31 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -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