ARM: 7384/1: ThumbEE: Disable userspace TEEHBR access for !CONFIG_ARM_THUMBEE

[linux-flexiantxendom0.git] / ubuntu / aufs-update

diff --git a/ubuntu/aufs-update b/ubuntu/aufs-update
old mode 100644 (file)
new mode 100755 (executable)
index 5b4b5a6..a31cf94
--- a/ubuntu/aufs-update
+++ b/ubuntu/aufs-update
@@ -12,8 +12,8 @@ aufs="$1"
 # Get the current tip name
 {
        read x url
-       read x o_tip_sha1
        read x o_log_sha1
+       read x o_tip_sha1
 } <aufs/BOM
 
 # Identify the tip of the standalone tree for reporting
@@ -29,18 +29,23 @@ git checkout -f HEAD -- aufs/BOM aufs/BOM.UPDATING
 # Reinsert the include update.
 #sed -i -e '1iEXTRA_CFLAGS += -I$(src)/include' aufs/Makefile
 
-# Find the latest commit in the ChangeLog.
-read x n_log_sha1 <"$aufs/ChangeLog"
+# Fix the relative patch references ...
+sed -i -e 's@/include/@/ubuntu/include/@g;' aufs/Makefile
+
+## # Find the latest commit in the ChangeLog.
+## read x n_log_sha1 <"$aufs/ChangeLog"
 
 # Insert the new commit ID and commit the result.
 sed -i -e "s/^COMMIT: .*/COMMIT: $n_tip_sha1/" aufs/BOM
 sed -i -e "s/^CHANGELOG: .*/CHANGELOG: $n_log_sha1/" aufs/BOM
+
 git add aufs include/linux
 {
        echo "UBUNTU: ubuntu: AUFS -- update to $n_tip_sha1"
        echo ""
-       awk <"$aufs/ChangeLog" '
-               /^commit '"$o_log_sha1"'/       { exit }
-                                               { print "    " $0 }
-       '
+       (cd "$aufs" && git log --no-merges "$o_tip_sha1..$n_tip_sha1" | git shortlog)
+##     awk <"$aufs/ChangeLog" '
+##             /^commit '"$o_log_sha1"'/       { exit }
+##                                             { print "    " $0 }
+##     '
 } | git commit -s -F -