Shortened git hashes causing pain

[Gary Thomas <gary@mlbassoc.com>]

[-- Attachment #1: Type: text/plain, Size: 1521 bytes --]

The shortening of the git hashes in this commit
   commit 77fc40a0f843e2488b356d90b64ef436c11c9973
   Author: Richard Purdie <richard.purdie@linuxfoundation.org>
   Date:   Sun May 19 13:21:55 2013 +0300
     bitbake: fetch2: Shorten long srcrevs
is causing some problems.

I have a simple .bbappend for gtk-sato-engine (attached) which
just applies a one-line patch.  When I build this recipe, I
get two different work trees (this is from scratch):
$ ls -l tmp/work/cobra4430p82-amltd-linux-gnueabi/gtk-sato-engine
total 8
drwxrwxr-x  3 gthomas gthomas 4096 May 23 09:12 0.3.3+gitAUTOINC+4740ad8d53aba4368ce3e03b06cfdc69eb86dcdc-r0
drwxrwxr-x 11 gthomas gthomas 4096 May 23 09:13 0.3.3+gitAUTOINC+4740ad8d53-r0

Note: it doesn't seem to happen for the virgin gtk-sato-engine
recipe, only when my patch is applied.

I discovered this when I tried building in an existing tree which
had been built before the mentioned change to the fetch code.  There
were sstate files that used the long hash that the build seemed to
want to use but got terribly confused and ended up creating empty
packages, breaking my build.  Trying to run 'cleansstate' on the
failing packages did nothing as the code only cleans up based on
the new hash and left the old files still there...

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------

[-- Attachment #2: gtk-sato-engine_git.bbappend --]
[-- Type: text/plain, Size: 212 bytes --]

#
# Just tell BitBake where to find my component files
#
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

SRC_URI_append = " file://adjust-sato-theme.patch \
"

PACKAGE_ARCH = "${MACHINE_ARCH}"






[-- Attachment #3: adjust-sato-theme.patch --]
[-- Type: text/x-patch, Size: 432 bytes --]

Index: git/data/gtkrc-vga
===================================================================
--- git.orig/data/gtkrc-vga
+++ git/data/gtkrc-vga
@@ -5,7 +5,7 @@
 #   dark gray: cbccc9
 #   light gray: eeeeec
 
-gtk_button_images = 0
+gtk_button_images = 1
 gtk_menu_images = 0
 
 gtk_color_scheme = "bg_color:#eeeeec;fg_color:#555753;text_color:#555753;base_color:#fff;selected_bg_color:#6c3;selected_fg_color:#555753"