[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-63-g26a5a42

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  26a5a427520259cbccb2fbb0c719431bc2e7ad00 (commit)
      from  c4a5b0b1a0db0bcf298a47a273a853a33126522d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 26a5a427520259cbccb2fbb0c719431bc2e7ad00
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Dec 17 16:26:46 2009 +0100

    [BUILDROOT] mtd-utils GIT archive format has changed: handle the new one.

-----------------------------------------------------------------------

Summary of changes:
 buildroot/package/mtd/mtd-utils20090824.git/mtd.mk |    4 ++-
 .../094-mtd-git_archive_format_has_changed.patch   |   22 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletions(-)
 create mode 100644 patches/buildroot/094-mtd-git_archive_format_has_changed.patch

diff --git a/buildroot/package/mtd/mtd-utils20090824.git/mtd.mk b/buildroot/package/mtd/mtd-utils20090824.git/mtd.mk
index 7e95223..5acdfae 100644
--- a/buildroot/package/mtd/mtd-utils20090824.git/mtd.mk
+++ b/buildroot/package/mtd/mtd-utils20090824.git/mtd.mk
@@ -4,12 +4,14 @@
 #
 #############################################################
 MTD_VERSION:=a8ce7c2668ef0781326f629eef02cef6c3962b8a
+# gitweb >= 1.6.6-rc1 uses first 7 chars of git SHA1 as dir suffix
+MTD_SHORT_VERSION=$(shell echo $(MTD_VERSION)|cut -c -7)
 MTD_SOURCE:=mtd-utils-$(MTD_VERSION).tar.gz
 MTD_URL:=http://git.infradead.org/mtd-utils.git?a=snapshot;h=$(MTD_VERSION);sf=tgz
 MTD_HOST_DIR:= $(TOOL_BUILD_DIR)/mtd-utils-$(MTD_VERSION)
 MTD_DIR:=$(BUILD_DIR)/mtd-utils-$(MTD_VERSION)
 MTD_CAT:=$(ZCAT)
-MTD_NAME:=mtd-utils
+MTD_NAME:=mtd-utils-$(MTD_SHORT_VERSION)
 
 #############################################################
 #
diff --git a/patches/buildroot/094-mtd-git_archive_format_has_changed.patch b/patches/buildroot/094-mtd-git_archive_format_has_changed.patch
new file mode 100644
index 0000000..8269131
--- /dev/null
+++ b/patches/buildroot/094-mtd-git_archive_format_has_changed.patch
@@ -0,0 +1,22 @@
+To be removed when updating to latest Buildroot.
+
+Index: buildroot/package/mtd/mtd-utils.git/mtd.mk
+===================================================================
+--- buildroot.orig/package/mtd/mtd-utils.git/mtd.mk	2009-12-17 15:54:31.000000000 +0100
++++ buildroot/package/mtd/mtd-utils.git/mtd.mk	2009-12-17 15:55:40.000000000 +0100
+@@ -4,12 +4,14 @@
+ #
+ #############################################################
+ MTD_VERSION:=fcb52ccc99679460640386c297023f852b108f68
++# gitweb >= 1.6.6-rc1 uses first 7 chars of git SHA1 as dir suffix
++MTD_SHORT_VERSION=$(shell echo $(MTD_VERSION)|cut -c -7)
+ MTD_SOURCE:=mtd-utils-$(MTD_VERSION).tar.gz
+ MTD_URL:=http://git.infradead.org/mtd-utils.git?a=snapshot;h=$(MTD_VERSION);sf=tgz
+ MTD_HOST_DIR:= $(TOOL_BUILD_DIR)/mtd-utils-$(MTD_VERSION)
+ MTD_DIR:=$(BUILD_DIR)/mtd-utils-$(MTD_VERSION)
+ MTD_CAT:=$(ZCAT)
+-MTD_NAME:=mtd-utils
++MTD_NAME:=mtd-utils-$(MTD_SHORT_VERSION)
+ 
+ #############################################################
+ #


hooks/post-receive
-- 
armadeus