From 6545748379363891478d3a2419ae2d510af77761 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 19 Nov 2013 12:54:21 +0100 Subject: [PATCH] kernel-module-redpine: force short SHA1 revision length So it matches what the bitbake recipe expects. https://jira.digi.com/browse/DEL-870 Signed-off-by: Javier Viguera --- .../kernel-module-redpine/kernel-module-redpine/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine/Makefile b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine/Makefile index f5c300627..9d40142a9 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine/Makefile +++ b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine/Makefile @@ -60,7 +60,8 @@ tarball: install -m 0644 $${i} $(TAR_DIR)/$$(dirname $${i})/; \ done cp -r RS.GENR.LNX.SD_GPL/include $(TAR_DIR)/RS.GENR.LNX.SD_GPL/ - REV="$$(git rev-parse --short --verify HEAD)"; \ + # The SHA1 length must match SRCREV_SHORT in bitbake recipe + REV="$$(git rev-parse --short=7 --verify HEAD)"; \ rm -f redpine-$(DEL_PLATFORM)-$${REV}.tar.gz && \ tar cz --transform 's,\(^[^/]\+/\),\1$(DEL_PLATFORM)/,' \ --numeric-owner --owner 0 --group 0 -f redpine-$(DEL_PLATFORM)-$${REV}.tar.gz -C $(TAR_DIR) .