aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@canonical.com>2012-02-16 20:07:29 +0000
committerJohn Rigby <john.rigby@linaro.org>2012-06-21 17:21:59 -0600
commitd0aa7708f081e71a2c2ef8b9d807690b801185bb (patch)
tree8b6525faa21d507b556bbde1dd03b2a27610151d
parentd6b1d8b2fda457719da07bbdca79a5771f28d7b2 (diff)
UBUNTU: ubuntu: AUFS -- sort out the relative header paths
Signed-off-by: Andy Whitcroft <apw@canonical.com>
-rwxr-xr-xubuntu/aufs-update4
1 files changed, 4 insertions, 0 deletions
diff --git a/ubuntu/aufs-update b/ubuntu/aufs-update
index 796ae1d471a..a31cf944d7f 100755
--- a/ubuntu/aufs-update
+++ b/ubuntu/aufs-update
@@ -29,12 +29,16 @@ git checkout -f HEAD -- aufs/BOM aufs/BOM.UPDATING
# Reinsert the include update.
#sed -i -e '1iEXTRA_CFLAGS += -I$(src)/include' aufs/Makefile
+# 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"