[Astlinux-commits] SF.net SVN: astlinux: [1227] trunk

[<kr...@us...>]

Revision: 1227
          http://astlinux.svn.sourceforge.net/astlinux/?rev=1227&view=rev
Author:   krisk84
Date:     2007-09-06 13:47:38 -0700 (Thu, 06 Sep 2007)

Log Message:
-----------
improve astrelease versioning

Modified Paths:
--------------
    trunk/target/generic/target_skeleton/etc/astlinux-release
    trunk/toolchain/astrelease/astrelease.mk

Modified: trunk/target/generic/target_skeleton/etc/astlinux-release
===================================================================
--- trunk/target/generic/target_skeleton/etc/astlinux-release	2007-09-05 18:59:42 UTC (rev 1226)
+++ trunk/target/generic/target_skeleton/etc/astlinux-release	2007-09-06 20:47:38 UTC (rev 1227)
@@ -1 +1 @@
-trunk
+svn

Modified: trunk/toolchain/astrelease/astrelease.mk
===================================================================
--- trunk/toolchain/astrelease/astrelease.mk	2007-09-05 18:59:42 UTC (rev 1226)
+++ trunk/toolchain/astrelease/astrelease.mk	2007-09-06 20:47:38 UTC (rev 1227)
@@ -4,15 +4,16 @@
 #
 ######################################################################
 
-# ASTVERTEST=$(shell cat target/generic/target_skeleton/etc/astlinux-release)
+ASTURL= $(shell svn info | grep URL | cut -d" " -f2)
+ASTBASE= $(shell basename $(ASTURL))
+ASTREV= $(shell svn info | grep 'Revision' | cut -d" " -f2)
 
-ifeq ($(shell cat target/generic/target_skeleton/etc/astlinux-release),trunk)
-	ASTVER = SVN-$(shell svn info | grep 'Last Changed Rev' | cut -d\  -f4)
+ifeq ($(shell cat target/generic/target_skeleton/etc/astlinux-release),svn)
+	ASTVER = astlinux-$(ASTBASE)-$(ASTREV)
 else
 	ASTVER = $(shell cat target/generic/target_skeleton/etc/astlinux-release)
 endif
 
-
 $(ASTVER).tar.gz: ext2initrd squashfsroot
 	mkdir -p $(ASTVER)
 	cp $(SQUASHFS_TARGET) $(ASTVER)/$(ASTVER).run
@@ -32,8 +33,11 @@
 	sha1sum $(ASTVER).tar.gz > $(ASTVER).tar.gz.sha1
 	touch -c $(ASTVER).tar.gz.sha1
 
-astrelease: ext2initrd squashfsroot $(ASTVER).tar.gz.sha1
+astver:
+	echo $(ASTVER) > $(TARGET_DIR)/etc/astlinux-release
 
+astrelease: astver ext2initrd squashfsroot $(ASTVER).tar.gz.sha1
+
 astrelease-clean:
 	-rm -f $(ASTVER).tar.gz
 	-rm -f $(ASTVER).tar.gz.sha1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.