templates: remove fancy version magic

It confuses most people and is rarely used. It's just templates, so if
someone needs something like that, it can be added to the generated rules.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

14 files changed, 10 insertions, 90 deletions

diff --git a/rules/templates/src-autoconf-lib/configure.ac b/rules/templates/src-autoconf-lib/configure.ac
index 091ce7ada..b652e2d81 100644
--- a/rules/templates/src-autoconf-lib/configure.ac
+++ b/rules/templates/src-autoconf-lib/configure.ac
@@ -1,8 +1,6 @@
 AC_PREREQ(2.59)
 
-esyscmd([echo "define(myversion, $(dir=$(basename $(pwd)); if test \"${dir%%-trunk}\" != \"$dir\"; then echo 99999999-9; else prefix=${dir%%-[0-9]*-[0-9]}; echo ${dir##$prefix-}; fi))"])
-
-AC_INIT([@name@], myversion, [bugs@pengutronix.de])
+AC_INIT([@name@], @VERSION@, [bugs@pengutronix.de])
 AC_CONFIG_SRCDIR([@name@.c])
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
diff --git a/rules/templates/src-autoconf-prog/configure.ac b/rules/templates/src-autoconf-prog/configure.ac
index 091ce7ada..b652e2d81 100644
--- a/rules/templates/src-autoconf-prog/configure.ac
+++ b/rules/templates/src-autoconf-prog/configure.ac
@@ -1,8 +1,6 @@
 AC_PREREQ(2.59)
 
-esyscmd([echo "define(myversion, $(dir=$(basename $(pwd)); if test \"${dir%%-trunk}\" != \"$dir\"; then echo 99999999-9; else prefix=${dir%%-[0-9]*-[0-9]}; echo ${dir##$prefix-}; fi))"])
-
-AC_INIT([@name@], myversion, [bugs@pengutronix.de])
+AC_INIT([@name@], @VERSION@, [bugs@pengutronix.de])
 AC_CONFIG_SRCDIR([@name@.c])
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
diff --git a/rules/templates/src-autoconf-proglib/configure.ac b/rules/templates/src-autoconf-proglib/configure.ac
index 091ce7ada..b652e2d81 100644
--- a/rules/templates/src-autoconf-proglib/configure.ac
+++ b/rules/templates/src-autoconf-proglib/configure.ac
@@ -1,8 +1,6 @@
 AC_PREREQ(2.59)
 
-esyscmd([echo "define(myversion, $(dir=$(basename $(pwd)); if test \"${dir%%-trunk}\" != \"$dir\"; then echo 99999999-9; else prefix=${dir%%-[0-9]*-[0-9]}; echo ${dir##$prefix-}; fi))"])
-
-AC_INIT([@name@], myversion, [bugs@pengutronix.de])
+AC_INIT([@name@], @VERSION@, [bugs@pengutronix.de])
 AC_CONFIG_SRCDIR([@name@.c])
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
diff --git a/rules/templates/src-stellaris/configure.ac b/rules/templates/src-stellaris/configure.ac
index 0de2c4fc9..bc3248a03 100644
--- a/rules/templates/src-stellaris/configure.ac
+++ b/rules/templates/src-stellaris/configure.ac
@@ -1,8 +1,6 @@
 AC_PREREQ(2.59)
 
-esyscmd([echo "define(myversion, $(dir=$(basename $(pwd)); if test \"${dir%%-trunk}\" != \"$dir\"; then echo 99999999-9; else prefix=${dir%%-[0-9]*-[0-9]}; echo ${dir##$prefix-}; fi))"])
-
-AC_INIT([@name@], myversion, [bugs@pengutronix.de])
+AC_INIT([@name@], @VERSION@, [bugs@pengutronix.de])
 AC_CONFIG_SRCDIR([@name@.c])
 
 PART=LM3S3748
diff --git a/rules/templates/template-src-autoconf-in b/rules/templates/template-src-autoconf-in
index 40634cbe2..bd724effb 100644
--- a/rules/templates/template-src-autoconf-in
+++ b/rules/templates/template-src-autoconf-in
@@ -5,13 +5,3 @@ config @PACKAGE@
 	prompt "@package@"
 	help
 	  FIXME
-
-if @PACKAGE@
-
-config @PACKAGE@_TRUNK
-	bool
-	prompt "use trunk"
-	help
-	  Build trunk instead of latest release.
-
-endif
diff --git a/rules/templates/template-src-autoconf-make b/rules/templates/template-src-autoconf-make
index 92d49977b..26d0951e1 100644
--- a/rules/templates/template-src-autoconf-make
+++ b/rules/templates/template-src-autoconf-make
@@ -16,14 +16,9 @@ PACKAGES-$(PTXCONF_@PACKAGE@) += @package@
 #
 # Paths and names
 #
-ifdef PTXCONF_@PACKAGE@_TRUNK
-@PACKAGE@_VERSION	:= trunk
-else
 @PACKAGE@_VERSION	:= @VERSION@
-@PACKAGE@_MD5		:=
-endif
 @PACKAGE@		:= @package@-$(@PACKAGE@_VERSION)
-@PACKAGE@_URL		:= file://$(PTXDIST_WORKSPACE)/local_src/$(@PACKAGE@)
+@PACKAGE@_URL		:= file://$(PTXDIST_WORKSPACE)/local_src/@package@
 @PACKAGE@_DIR		:= $(BUILDDIR)/$(@PACKAGE@)
 @PACKAGE@_BUILD_OOT	:= YES
 @PACKAGE@_LICENSE	:= unknown
@@ -32,19 +27,13 @@ endif
 # Extract
 # ----------------------------------------------------------------------------
 
-ifdef PTXCONF_@PACKAGE@_TRUNK
 $(STATEDIR)/@package@.extract: $(STATEDIR)/autogen-tools
-endif
 
 $(STATEDIR)/@package@.extract:
 	@$(call targetinfo)
 	@$(call clean, $(@PACKAGE@_DIR))
 	@$(call extract, @PACKAGE@)
-ifdef PTXCONF_@PACKAGE@_TRUNK
-	cd $(@PACKAGE@_DIR) && sh autogen.sh
-else
 	cd $(@PACKAGE@_DIR) && [ -f configure ] || sh autogen.sh
-endif
 	@$(call patchin, @PACKAGE@)
 	@$(call touch)
 
diff --git a/rules/templates/template-src-cmake-prog-in b/rules/templates/template-src-cmake-prog-in
index 8d83379d1..37e6541dd 100644
--- a/rules/templates/template-src-cmake-prog-in
+++ b/rules/templates/template-src-cmake-prog-in
@@ -6,13 +6,3 @@ config @PACKAGE@
 	select HOST_CMAKE
 	help
 	  FIXME
-
-if @PACKAGE@
-
-config @PACKAGE@_TRUNK
-	bool
-	prompt "use trunk"
-	help
-	  Build trunk instead of latest release.
-
-endif
diff --git a/rules/templates/template-src-cmake-prog-make b/rules/templates/template-src-cmake-prog-make
index 81850a224..dea802599 100644
--- a/rules/templates/template-src-cmake-prog-make
+++ b/rules/templates/template-src-cmake-prog-make
@@ -16,14 +16,9 @@ PACKAGES-$(PTXCONF_@PACKAGE@) += @package@
 #
 # Paths and names
 #
-ifdef PTXCONF_@PACKAGE@_TRUNK
-@PACKAGE@_VERSION	:= trunk
-else
 @PACKAGE@_VERSION	:= @VERSION@
-@PACKAGE@_MD5		:=
-endif
 @PACKAGE@		:= @package@-$(@PACKAGE@_VERSION)
-@PACKAGE@_URL		:= file://$(PTXDIST_WORKSPACE)/local_src/$(@PACKAGE@)
+@PACKAGE@_URL		:= file://$(PTXDIST_WORKSPACE)/local_src/@package@
 @PACKAGE@_DIR		:= $(BUILDDIR)/$(@PACKAGE@)
 @PACKAGE@_LICENSE	:= unknown
 
diff --git a/rules/templates/template-src-linux-driver-make b/rules/templates/template-src-linux-driver-make
index 2d562bc20..47cde9c06 100644
--- a/rules/templates/template-src-linux-driver-make
+++ b/rules/templates/template-src-linux-driver-make
@@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_@PACKAGE@) += @package@
 #
 @PACKAGE@_VERSION	:= @VERSION@
 @PACKAGE@		:= @package@-$(@PACKAGE@_VERSION)
-@PACKAGE@_URL		:= lndir://$(PTXDIST_WORKSPACE)/local_src/$(@PACKAGE@)
+@PACKAGE@_URL		:= lndir://$(PTXDIST_WORKSPACE)/local_src/@package@
 @PACKAGE@_DIR		:= $(BUILDDIR)/$(@PACKAGE@)
 @PACKAGE@_LICENSE	:= unknown
 
diff --git a/rules/templates/template-src-make-prog-make b/rules/templates/template-src-make-prog-make
index 54c1bedef..22c0de450 100644
--- a/rules/templates/template-src-make-prog-make
+++ b/rules/templates/template-src-make-prog-make
@@ -19,7 +19,7 @@ PACKAGES-$(PTXCONF_@PACKAGE@) += @package@
 @PACKAGE@_VERSION	:= @VERSION@
 @PACKAGE@_MD5		:=
 @PACKAGE@		:= @package@-$(@PACKAGE@_VERSION)
-@PACKAGE@_URL		:= file://local_src/$(@PACKAGE@)
+@PACKAGE@_URL		:= file://local_src/@package@
 @PACKAGE@_DIR		:= $(BUILDDIR)/$(@PACKAGE@)
 @PACKAGE@_LICENSE	:= unknown
 
diff --git a/rules/templates/template-src-qmake-prog-in b/rules/templates/template-src-qmake-prog-in
index 73254d55b..914b6816c 100644
--- a/rules/templates/template-src-qmake-prog-in
+++ b/rules/templates/template-src-qmake-prog-in
@@ -6,13 +6,3 @@ config @PACKAGE@
 	select QT4
 	help
 	  FIXME
-
-if @PACKAGE@
-
-config @PACKAGE@_TRUNK
-	bool
-	prompt "use trunk"
-	help
-	  Build trunk instead of latest release.
-
-endif
diff --git a/rules/templates/template-src-qmake-prog-make b/rules/templates/template-src-qmake-prog-make
index 78656b623..38ee6e709 100644
--- a/rules/templates/template-src-qmake-prog-make
+++ b/rules/templates/template-src-qmake-prog-make
@@ -16,14 +16,9 @@ PACKAGES-$(PTXCONF_@PACKAGE@) += @package@
 #
 # Paths and names
 #
-ifdef PTXCONF_@PACKAGE@_TRUNK
-@PACKAGE@_VERSION	:= trunk
-else
 @PACKAGE@_VERSION	:= @VERSION@
-@PACKAGE@_MD5		:=
-endif
 @PACKAGE@		:= @package@-$(@PACKAGE@_VERSION)
-@PACKAGE@_URL		:= file://$(PTXDIST_WORKSPACE)/local_src/$(@PACKAGE@)
+@PACKAGE@_URL		:= file://$(PTXDIST_WORKSPACE)/local_src/@package@
 @PACKAGE@_DIR		:= $(BUILDDIR)/$(@PACKAGE@)
 @PACKAGE@_BUILD_OOT	:= YES
 @PACKAGE@_LICENSE	:= unknown
diff --git a/rules/templates/template-src-stellaris-in b/rules/templates/template-src-stellaris-in
index d947ef0ff..d255fec84 100644
--- a/rules/templates/template-src-stellaris-in
+++ b/rules/templates/template-src-stellaris-in
@@ -6,13 +6,3 @@ config @PACKAGE@
 	prompt "@package@"
 	help
 	  FIXME
-
-if @PACKAGE@
-
-config @PACKAGE@_TRUNK
-	bool
-	prompt "use trunk"
-	help
-	  Build trunk instead of latest release.
-
-endif
diff --git a/rules/templates/template-src-stellaris-make b/rules/templates/template-src-stellaris-make
index bdf4c5348..a26bd5488 100644
--- a/rules/templates/template-src-stellaris-make
+++ b/rules/templates/template-src-stellaris-make
@@ -27,14 +27,9 @@ endif
 #
 # Paths and names
 #
-ifdef PTXCONF_@PACKAGE@_TRUNK
-@PACKAGE@_VERSION	:= trunk
-else
 @PACKAGE@_VERSION	:= @VERSION@
-@PACKAGE@_MD5		:=
-endif
 @PACKAGE@		:= @package@-$(@PACKAGE@_VERSION)
-@PACKAGE@_URL		:= file://$(PTXDIST_WORKSPACE)/local_src/$(@PACKAGE@)
+@PACKAGE@_URL		:= file://$(PTXDIST_WORKSPACE)/local_src/@package@
 @PACKAGE@_DIR		:= $(BUILDDIR)/$(@PACKAGE@)
 @PACKAGE@_BUILD_OOT	:= YES
 @PACKAGE@_LICENSE	:= unknown
@@ -47,19 +42,13 @@ endif
 # Extract
 # ----------------------------------------------------------------------------
 
-ifdef PTXCONF_@PACKAGE@_TRUNK
 $(STATEDIR)/@package@.extract: $(STATEDIR)/autogen-tools
-endif
 
 $(STATEDIR)/@package@.extract:
 	@$(call targetinfo)
 	@$(call clean, $(@PACKAGE@_DIR))
 	@$(call extract, @PACKAGE@)
-ifdef PTXCONF_@PACKAGE@_TRUNK
-	cd $(@PACKAGE@_DIR) && sh autogen.sh
-else
 	cd $(@PACKAGE@_DIR) && [ -f configure ] || sh autogen.sh
-endif
 	@$(call patchin, @PACKAGE@)
 	@$(call touch)