diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-05-16 14:50:42 +0100 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-10-17 09:49:06 -0600 |
| commit | 6549dbeffff206be49c490c279c008be3c4c7159 (patch) | |
| tree | a630b6dfa0f1d6ba7efb0a805a6c96f084527a53 | |
| parent | 9ae1275fd08346ebfb7e52682f11e40ce631c659 (diff) | |
UBUNTU: ubuntu: AUFS -- clean up the aufs updater and BOM
Clean up the updater to record and use the real sha1 of the tip of the
standalone tree as well as recording and tracking the nominal tip in the
changelog for commit generation.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
| -rw-r--r-- | ubuntu/aufs-update | 19 | ||||
| -rw-r--r-- | ubuntu/aufs/BOM | 3 |
2 files changed, 14 insertions, 8 deletions
diff --git a/ubuntu/aufs-update b/ubuntu/aufs-update index d1ac0f97ca0..f50b1c806ce 100644 --- a/ubuntu/aufs-update +++ b/ubuntu/aufs-update @@ -9,9 +9,13 @@ aufs="$1" # Get the current tip name { read x url - read x osha1 + read x o_tip_sha1 + read x o_log_sha1 } <aufs/BOM +# Identify the tip of the standalone tree for reporting +n_tip_sha1=`( cd "$aufs" && git log --format=%H HEAD^..HEAD )` + # Update aufs to the latest. git rm -rf aufs cp -rp "$aufs/fs/aufs" aufs @@ -22,17 +26,18 @@ git checkout -f HEAD -- aufs/BOM # Reinsert the include update. #sed -i -e '1iEXTRA_CFLAGS += -I$(src)/include' aufs/Makefile -# Find the latest commit. -read x nsha1 <"$aufs/ChangeLog" +# 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: $nsha1/" aufs/BOM +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 $nsha1" + echo "UBUNTU: ubuntu: AUFS -- update to $n_tip_sha1" echo "" awk <"$aufs/ChangeLog" ' - /^commit '"$osha1"'/ { exit } - { print " " $0 } + /^commit '"$o_log_sha1"'/ { exit } + { print " " $0 } ' } | git commit -s -F - diff --git a/ubuntu/aufs/BOM b/ubuntu/aufs/BOM index 069c9f19c99..7e00c74bd46 100644 --- a/ubuntu/aufs/BOM +++ b/ubuntu/aufs/BOM @@ -1,2 +1,3 @@ URL: http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git -COMMIT: c6b76974311efc5bf3eddf921cd015b6aae46935 +COMMIT: e96367386e93fff556a6396f6a4fd540303f608e +CHANGELOG: c6b76974311efc5bf3eddf921cd015b6aae46935 |