summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-05-31 11:09:14 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-10 16:45:49 +0100
commit7e78b41667c6003d2e36f8b90af1089b44fab43c (patch)
tree15cc9789b8c5a8981edcf3b0cab4d31cde2639d3 /meta
parent46253f7418cd802d38e1f26ed395e9aae7c71767 (diff)
downloadpoky-7e78b41667c6003d2e36f8b90af1089b44fab43c.tar.gz
classes/buildhistory: record removals in buildhistory directory
"git add ." does not record files that were removed in the buildhistory directory. Specify the -A flag to also record removals. This was discovered by the following warning added in Git 1.8.3: warning: You ran 'git add' with neither '-A (--all)' or '--ignore-removal', whose behaviour will change in Git 2.0 with respect to paths you removed. (From OE-Core master rev: a45a247e2cfa58892a0c9eb050d603a38cd839db) (From OE-Core rev: a27f04ac89b8e58931b7792fbd1adeabef21f7b0) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/buildhistory.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 1ac1a8b202..ecff637807 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -500,7 +500,7 @@ END
500 repostatus=`git status --porcelain | grep -v " metadata-revs$"` 500 repostatus=`git status --porcelain | grep -v " metadata-revs$"`
501 HOSTNAME=`hostname 2>/dev/null || echo unknown` 501 HOSTNAME=`hostname 2>/dev/null || echo unknown`
502 if [ "$repostatus" != "" ] ; then 502 if [ "$repostatus" != "" ] ; then
503 git add . 503 git add -A .
504 # porcelain output looks like "?? packages/foo/bar" 504 # porcelain output looks like "?? packages/foo/bar"
505 # Ensure we commit metadata-revs with the first commit 505 # Ensure we commit metadata-revs with the first commit
506 for entry in `echo "$repostatus" | awk '{print $2}' | awk -F/ '{print $1}' | sort | uniq` ; do 506 for entry in `echo "$repostatus" | awk '{print $2}' | awk -F/ '{print $1}' | sort | uniq` ; do