]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
UBUNTU: [Debian] aufs: fix update script to allow local mirror
authorAndy Whitcroft <apw@canonical.com>
Thu, 30 Jul 2015 15:46:47 +0000 (16:46 +0100)
committerTim Gardner <tim.gardner@canonical.com>
Fri, 26 Feb 2016 02:44:02 +0000 (19:44 -0700)
Signed-off-by: Andy Whitcroft <apw@canonical.com>
debian/scripts/misc/update-aufs.sh

index 7397fb29c2d68abca7f82d99c97dc4fa48a6ac9e..288b92071e7715537149cc2cf91bd4a301716c84 100755 (executable)
@@ -15,9 +15,15 @@ then
        exit 1
 fi
 
-rm -rf ${AUFS}
-git clone https://github.com/sfjro/aufs4-standalone.git ${AUFS}
-(cd ${AUFS}; git checkout -b aufs4.x-rcN remotes/origin/aufs4.x-rcN)
+clean=0
+if [ "$#" = 1 ]; then
+       AUFS="$1"
+else
+       clean=1
+       rm -rf ${AUFS}
+       git clone https://github.com/sfjro/aufs4-standalone.git ${AUFS}
+       (cd ${AUFS}; git checkout -b aufs4.x-rcN remotes/origin/aufs4.x-rcN)
+fi
 
 cp ${AUFS}/include/uapi/linux/aufs_type.h include/uapi/linux
 rsync -av ${AUFS}/fs/ fs/
@@ -28,7 +34,7 @@ PATCHES="${PATCHES} aufs4-base.patch"
 PATCHES="${PATCHES} aufs4-mmap.patch"
 PATCHES="${PATCHES} aufs4-standalone.patch"
 PATCHES="${PATCHES} aufs4-loopback.patch"
-PATCHES="${PATCHES} vfs-ino.patch"
+#PATCHES="${PATCHES} vfs-ino.patch"
 PATCHES="${PATCHES} tmpfs-idr.patch"
 
 for i in ${PATCHES}
@@ -36,7 +42,7 @@ do
        patch -p1 < ${AUFS}/$i
 done
 
-rm -rf ${AUFS}
+[ "$clean" = 1 ] && rm -rf ${AUFS}
 git add mm/prfile.c
 git add -u
 find . -name "*.orig" | xargs rm