aboutsummaryrefslogtreecommitdiff
path: root/ubuntu
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@canonical.com>2011-01-06 16:12:34 +0000
committerJohn Rigby <john.rigby@linaro.org>2011-09-23 08:47:54 -0600
commitb4054c5bfbe8a36cda456fdd260b12210fc94a64 (patch)
tree5e9efd9bda7861129806663bb6addfc5f2516f89 /ubuntu
parentca5e44a8d90f138b2e702a9374938829355dae3f (diff)
UBUNTU: ubuntu: AUFS -- update aufs-update to track new locations of headers
Track the new location of the headers as per the commit below: commit de699ab60a2f8a55b9c8313a04c7863897fb88bd Author: Andy Whitcroft <apw@canonical.com> Date: Fri Dec 3 11:12:17 2010 +0000 UBUNTU: ubuntu: AUFS -- include the aufs_types.h file in linux-libc-headers Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/aufs-update7
1 files changed, 4 insertions, 3 deletions
diff --git a/ubuntu/aufs-update b/ubuntu/aufs-update
index 869e9d663ca..d1ac0f97ca0 100644
--- a/ubuntu/aufs-update
+++ b/ubuntu/aufs-update
@@ -15,18 +15,19 @@ aufs="$1"
# Update aufs to the latest.
git rm -rf aufs
cp -rp "$aufs/fs/aufs" aufs
-cp -rp "$aufs/include" aufs
+#cp -rp "$aufs/include" aufs
+cp -rp "$aufs/include/linux"/*.h include/linux
git checkout -f HEAD -- aufs/BOM
# Reinsert the include update.
-sed -i -e '1iEXTRA_CFLAGS += -I$(src)/include' aufs/Makefile
+#sed -i -e '1iEXTRA_CFLAGS += -I$(src)/include' aufs/Makefile
# Find the latest commit.
read x nsha1 <"$aufs/ChangeLog"
# Insert the new commit ID and commit the result.
sed -i -e "s/^COMMIT: .*/COMMIT: $nsha1/" aufs/BOM
-git add aufs
+git add aufs include/linux
{
echo "UBUNTU: ubuntu: AUFS -- update to $nsha1"
echo ""