[Buildroot] [PATCH] mtd-utils: bump version number

[Buildroot] [PATCH] mtd-utils: bump version number

[Daniel Mack]

The upstream git commit used by mtd.mk is not valid anymore, for unclear
reasons. Use the current HEAD as new anchor.

Also, the name inside the generated tarball now contains a shortened
version of the commit ID. Follow that change as well.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
---
 package/mtd/mtd-utils.git/mtd.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/mtd/mtd-utils.git/mtd.mk b/package/mtd/mtd-utils.git/mtd.mk
index 3c17c21..c4a2b28 100644
--- a/package/mtd/mtd-utils.git/mtd.mk
+++ b/package/mtd/mtd-utils.git/mtd.mk
@@ -3,13 +3,13 @@
 # mtd provides jffs2 utilities
 #
 #############################################################
-MTD_VERSION:=e783e75e09b4a0a519665afd7bdeaf2985e7a09c
+MTD_VERSION:=a4e502d99129da8ebba6d40b373a4422a175e9af
 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-a4e502d
 
 #############################################################
 #
-- 
1.6.3.3

[Buildroot] [PATCH] mtd-utils: bump version number

[Daniel Mack]

The upstream git commit used by mtd.mk is not valid anymore, for unclear
reasons. Use the current HEAD as new anchor.

Also, the name inside the generated tarball now contains a shortened
version of the commit ID. Follow that change as well.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
---
 Sorry, my previous patch was based on an outdated tree. This is a rebased
 version that applies to the current HEAD.

 package/mtd/mtd-utils.git/mtd.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/mtd/mtd-utils.git/mtd.mk b/package/mtd/mtd-utils.git/mtd.mk
index b7e584e..51b0077 100644
--- a/package/mtd/mtd-utils.git/mtd.mk
+++ b/package/mtd/mtd-utils.git/mtd.mk
@@ -3,13 +3,13 @@
 # mtd provides jffs2 utilities
 #
 #############################################################
-MTD_VERSION:=fcb52ccc99679460640386c297023f852b108f68
+MTD_VERSION:=a4e502d99129da8ebba6d40b373a4422a175e9af
 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:= $(TOOLCHAIN_DIR)/mtd-utils-$(MTD_VERSION)
 MTD_DIR:=$(BUILD_DIR)/mtd-utils-$(MTD_VERSION)
 MTD_CAT:=$(ZCAT)
-MTD_NAME:=mtd-utils
+MTD_NAME:=mtd-utils-a4e502d
 
 #############################################################
 #
-- 
1.6.3.3

[Buildroot] [PATCH] mtd-utils: bump version number

[Peter Korsgaard]

>>>>> "Daniel" == Daniel Mack <daniel@caiaq.de> writes:

 Daniel> The upstream git commit used by mtd.mk is not valid anymore,
 Daniel> for unclear reasons. Use the current HEAD as new anchor.

Hmm, it works here:

wget --passive-ftp -nd   -O /var/lib/downloads/mtd-utils-fcb52ccc99679460640386c297023f852b108f68.tar.gz "http://git.infradead.org/mtd-utils.git?a=snapshot;h=fcb52ccc99679460640386c297023f852b108f68;sf=tgz"
--2009-12-14 10:35:29--  http://git.infradead.org/mtd-utils.git?a=snapshot;h=fcb52ccc99679460640386c297023f852b108f68;sf=tgz
Resolving git.infradead.org... 18.85.46.34, 2001:4830:2446:ff00:214:51ff:fe65:c65c

ls -lah mtd-utils-fcb52ccc99679460640386c297023f852b108f68.tar.gz
-rw-r--r-- 1 peko peko 323K 2009-12-14 10:35 mtd-utils-fcb52ccc99679460640386c297023f852b108f68.tar.gz

But the directory name has indeed changed.

 Daniel>  #############################################################
 Daniel> -MTD_VERSION:=fcb52ccc99679460640386c297023f852b108f68
 Daniel> +MTD_VERSION:=a4e502d99129da8ebba6d40b373a4422a175e9af
 Daniel>  MTD_SOURCE:=mtd-utils-$(MTD_VERSION).tar.gz
 Daniel>  MTD_URL:=http://git.infradead.org/mtd-utils.git?a=snapshot;h=$(MTD_VERSION);sf=tgz
 Daniel>  MTD_HOST_DIR:= $(TOOLCHAIN_DIR)/mtd-utils-$(MTD_VERSION)
 Daniel>  MTD_DIR:=$(BUILD_DIR)/mtd-utils-$(MTD_VERSION)
 Daniel>  MTD_CAT:=$(ZCAT)
 Daniel> -MTD_NAME:=mtd-utils
 Daniel> +MTD_NAME:=mtd-utils-a4e502d

It would be nice if the shortname could be computed from MTD_VERSION so
things don't break when someone goes and changes the git id. GNU make
unfortunately doesn't have a substring function, so the easiest solution
is probably cut, E.G.:

 diff --git a/package/mtd/mtd-utils.git/mtd.mk b/package/mtd/mtd-utils.git/mtd.mk
index b7e584e..db40f54 100644
--- a/package/mtd/mtd-utils.git/mtd.mk
+++ b/package/mtd/mtd-utils.git/mtd.mk
@@ -4,12 +4,13 @@
 #
 #############################################################
 MTD_VERSION:=fcb52ccc99679460640386c297023f852b108f68
+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=
 MTD_HOST_DIR:= $(TOOLCHAIN_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)
 
 #############################################################
 #

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH] mtd-utils: bump version number

[Daniel Mack]

On Mon, Dec 14, 2009 at 10:49:20AM +0100, Peter Korsgaard wrote:
> >>>>> "Daniel" == Daniel Mack <daniel@caiaq.de> writes:
> 
>  Daniel> The upstream git commit used by mtd.mk is not valid anymore,
>  Daniel> for unclear reasons. Use the current HEAD as new anchor.
> 
> Hmm, it works here:
> 
> wget --passive-ftp -nd   -O /var/lib/downloads/mtd-utils-fcb52ccc99679460640386c297023f852b108f68.tar.gz "http://git.infradead.org/mtd-utils.git?a=snapshot;h=fcb52ccc99679460640386c297023f852b108f68;sf=tgz"
> --2009-12-14 10:35:29--  http://git.infradead.org/mtd-utils.git?a=snapshot;h=fcb52ccc99679460640386c297023f852b108f68;sf=tgz
> Resolving git.infradead.org... 18.85.46.34, 2001:4830:2446:ff00:214:51ff:fe65:c65c
> 
> ls -lah mtd-utils-fcb52ccc99679460640386c297023f852b108f68.tar.gz
> -rw-r--r-- 1 peko peko 323K 2009-12-14 10:35 mtd-utils-fcb52ccc99679460640386c297023f852b108f68.tar.gz

Ok, the master branch moved forward and I recognized that too late,
hence the two patches.

> But the directory name has indeed changed.
> 
>  Daniel>  #############################################################
>  Daniel> -MTD_VERSION:=fcb52ccc99679460640386c297023f852b108f68
>  Daniel> +MTD_VERSION:=a4e502d99129da8ebba6d40b373a4422a175e9af
>  Daniel>  MTD_SOURCE:=mtd-utils-$(MTD_VERSION).tar.gz
>  Daniel>  MTD_URL:=http://git.infradead.org/mtd-utils.git?a=snapshot;h=$(MTD_VERSION);sf=tgz
>  Daniel>  MTD_HOST_DIR:= $(TOOLCHAIN_DIR)/mtd-utils-$(MTD_VERSION)
>  Daniel>  MTD_DIR:=$(BUILD_DIR)/mtd-utils-$(MTD_VERSION)
>  Daniel>  MTD_CAT:=$(ZCAT)
>  Daniel> -MTD_NAME:=mtd-utils
>  Daniel> +MTD_NAME:=mtd-utils-a4e502d
> 
> It would be nice if the shortname could be computed from MTD_VERSION so
> things don't break when someone goes and changes the git id. GNU make
> unfortunately doesn't have a substring function, so the easiest solution
> is probably cut, E.G.:

I though about that too, but I wasn't sure whether the substring of the
SHA1 ID would always be 7 characters long. I fear that is choses to be
as short as possible but as long as necessary to be unique. Which would
then mean that it changes again at an aribitrary point.

Best thing woulod be if the mtd people would just tag a commit with a
new release number. I'll write them and see if I can make them do that
:)

Daniel

[Buildroot] [PATCH] mtd-utils: bump version number

[Peter Korsgaard]

>>>>> "Daniel" == Daniel Mack <daniel@caiaq.de> writes:

Hi,

 Daniel> Ok, the master branch moved forward and I recognized that too late,
 Daniel> hence the two patches.

Ok.

 >> It would be nice if the shortname could be computed from MTD_VERSION so
 >> things don't break when someone goes and changes the git id. GNU make
 >> unfortunately doesn't have a substring function, so the easiest solution
 >> is probably cut, E.G.:

 Daniel> I though about that too, but I wasn't sure whether the substring of the
 Daniel> SHA1 ID would always be 7 characters long. I fear that is choses to be
 Daniel> as short as possible but as long as necessary to be unique. Which would
 Daniel> then mean that it changes again at an aribitrary point.

Currently it is (gitweb calls git rev-parse --short-7), but I get your
point. This gitweb change is also very recent (since 1.6.6-rc1, released
December 2nd). I'll add a comment about it.

 Daniel> Best thing woulod be if the mtd people would just tag a commit with a
 Daniel> new release number. I'll write them and see if I can make them do that
 Daniel> :)

Yes, please - It has been 17 months since the last release, so it's
about time.

-- 
Bye, Peter Korsgaard