[Runnix-commits] SF.net SVN: runnix:[141] trunk

[<abe...@us...>]

Revision: 141
          http://runnix.svn.sourceforge.net/runnix/?rev=141&view=rev
Author:   abelbeck
Date:     2010-12-18 20:48:06 +0000 (Sat, 18 Dec 2010)

Log Message:
-----------
Merge from 0.3 branch, add revision to runrelease

Modified Paths:
--------------
    trunk/target/generic/target_skeleton/etc/runnix-release
    trunk/toolchain/runrelease/runrelease.mk

Modified: trunk/target/generic/target_skeleton/etc/runnix-release
===================================================================
--- trunk/target/generic/target_skeleton/etc/runnix-release	2010-12-18 19:36:26 UTC (rev 140)
+++ trunk/target/generic/target_skeleton/etc/runnix-release	2010-12-18 20:48:06 UTC (rev 141)
@@ -1 +1 @@
-trunk
+runnix-trunk-svn

Modified: trunk/toolchain/runrelease/runrelease.mk
===================================================================
--- trunk/toolchain/runrelease/runrelease.mk	2010-12-18 19:36:26 UTC (rev 140)
+++ trunk/toolchain/runrelease/runrelease.mk	2010-12-18 20:48:06 UTC (rev 141)
@@ -3,9 +3,18 @@
 # Make a release for Runnix
 #
 ######################################################################
-RUNVER=$(shell cat target/generic/target_skeleton/etc/runnix-release)
+RUNURL= $(shell LANG=C svn info | awk -F': ' '/^URL:/ { print $$2 }')
+RUNBASE= $(shell basename $(RUNURL))
+RUNREV= $(shell LANG=C svn info | awk -F': ' '/^Last Changed Rev:/ { print $$2 }')
+RUNEXTRA=
 
-$(RUNVER): syslinux ext2root
+ifeq ($(shell cat target/generic/target_skeleton/etc/runnix-release),runnix-trunk-svn)
+        RUNVER = runnix-$(RUNBASE)-$(RUNREV)$(RUNEXTRA)
+else
+        RUNVER = $(shell cat target/generic/target_skeleton/etc/runnix-release)$(RUNEXTRA)
+endif
+
+$(RUNVER).tar.gz: syslinux ext2root
 	mkdir -p $(RUNVER)
 	cp -a toolchain/runrelease/files/* $(RUNVER)/
 	-find $(RUNVER) -type d -name .svn | xargs rm -rf
@@ -17,7 +26,7 @@
 	tar czf $(RUNVER).tar.gz $(RUNVER)
 	sha1sum $(RUNVER).tar.gz > $(RUNVER).tar.gz.sha1
 
-runrelease: $(RUNVER)
+runrelease: $(RUNVER).tar.gz
 
 runrelease-source:
 


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