[templates] cleanup

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

4 files changed, 26 insertions, 28 deletions

diff --git a/rules/templates/template-file-make b/rules/templates/template-file-make
index 60d449d03..692702c22 100644
--- a/rules/templates/template-file-make
+++ b/rules/templates/template-file-make
@@ -100,7 +100,7 @@ $(STATEDIR)/@package@.targetinstall:
 #
 # TODO: To build your own package, if this step requires one
 #	@$(call install_init, @package@)
-#	@$(call install_fixup,@package@,PACKAGE,@package@)
+#	@$(call install_fixup,@package@,PACKAGE,@packagedash@)
 #	@$(call install_fixup,@package@,PRIORITY,optional)
 #	@$(call install_fixup,@package@,VERSION,@VERSION@)
 #	@$(call install_fixup,@package@,SECTION,base)
diff --git a/rules/templates/template-src-autoconf-make b/rules/templates/template-src-autoconf-make
index 95ef79023..3ba3df482 100644
--- a/rules/templates/template-src-autoconf-make
+++ b/rules/templates/template-src-autoconf-make
@@ -18,8 +18,9 @@ PACKAGES-$(PTXCONF_@PACKAGE@) += @package@
 #
 @PACKAGE@_VERSION	:= @VERSION@
 @PACKAGE@		:= @package@-$(@PACKAGE@_VERSION)
-@PACKAGE@_SRCDIR		:= $(PTXDIST_WORKSPACE)/local_src/$(@PACKAGE@)
+@PACKAGE@_URL		:= file://$(PTXDIST_WORKSPACE)/local_src/$(@PACKAGE@)
 @PACKAGE@_DIR		:= $(BUILDDIR)/$(@PACKAGE@)
+@PACKAGE@_BUILD_OOT	:= YES
 @PACKAGE@_LICENSE	:= unknown
 
 # ----------------------------------------------------------------------------
@@ -29,11 +30,11 @@ PACKAGES-$(PTXCONF_@PACKAGE@) += @package@
 $(STATEDIR)/@package@.extract:
 	@$(call targetinfo)
 	@$(call clean, $(@PACKAGE@_DIR))
+	@$(call extract, @PACKAGE@)
 ifdef PTXCONF_@PACKAGE@_TRUNK
-	cd $(@PACKAGE@_SRCDIR) && sh autogen.sh
+	cd $(@PACKAGE@_DIR) && sh autogen.sh
 endif
-	@$(call patchin, @PACKAGE@, $(@PACKAGE@_SRCDIR))
-	mkdir -p $(@PACKAGE@_DIR)
+	@$(call patchin, @PACKAGE@)
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -46,15 +47,12 @@ endif
 # autoconf
 #
 @PACKAGE@_CONF_TOOL	:= autoconf
-@PACKAGE@_CONF_OPT	:= $(CROSS_AUTOCONF_USR)
+#@PACKAGE@_CONF_OPT	:= $(CROSS_AUTOCONF_USR)
 
-$(STATEDIR)/@package@.prepare:
-	@$(call targetinfo)
-	@$(call clean, $(@PACKAGE@_DIR)/config.cache)
-	cd $(@PACKAGE@_DIR) && \
-		$(@PACKAGE@_PATH) $(@PACKAGE@_CONF_ENV) \
-		$(@PACKAGE@_SRCDIR)/configure $(@PACKAGE@_CONF_OPT)
-	@$(call touch)
+#$(STATEDIR)/@package@.prepare:
+#	@$(call targetinfo)
+#	@$(call world/prepare, @PACKAGE@)
+#	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Compile
@@ -82,9 +80,9 @@ $(STATEDIR)/@package@.targetinstall:
 	@$(call targetinfo)
 
 	@$(call install_init,  @package@)
-	@$(call install_fixup, @package@, PACKAGE, @package@)
+	@$(call install_fixup, @package@, PACKAGE, @packagedash@)
 	@$(call install_fixup, @package@, PRIORITY, optional)
-	@$(call install_fixup, @package@, VERSION, @VERSION@)
+	@$(call install_fixup, @package@, VERSION, $(@PACKAGE@_VERSION))
 	@$(call install_fixup, @package@, SECTION, base)
 	@$(call install_fixup, @package@, AUTHOR, "@AUTHOR@")
 	@$(call install_fixup, @package@, DEPENDS,)
diff --git a/rules/templates/template-src-cmake-prog-make b/rules/templates/template-src-cmake-prog-make
index 587ed3eed..18c40a22f 100644
--- a/rules/templates/template-src-cmake-prog-make
+++ b/rules/templates/template-src-cmake-prog-make
@@ -50,9 +50,9 @@ $(STATEDIR)/@package@.targetinstall:
 	@$(call targetinfo)
 
 	@$(call install_init,  @package@)
-	@$(call install_fixup, @package@, PACKAGE, @package@)
+	@$(call install_fixup, @package@, PACKAGE, @packagedash@)
 	@$(call install_fixup, @package@, PRIORITY, optional)
-	@$(call install_fixup, @package@, VERSION, @VERSION@)
+	@$(call install_fixup, @package@, VERSION, $(@PACKAGE@_VERSION))
 	@$(call install_fixup, @package@, SECTION, base)
 	@$(call install_fixup, @package@, AUTHOR, "@AUTHOR@")
 	@$(call install_fixup, @package@, DEPENDS,)
diff --git a/rules/templates/template-src-stellaris-make b/rules/templates/template-src-stellaris-make
index e35417b10..ed9874974 100644
--- a/rules/templates/template-src-stellaris-make
+++ b/rules/templates/template-src-stellaris-make
@@ -27,10 +27,11 @@ endif
 #
 # Paths and names
 #
-@PACKAGE@_VERSION	:= trunk
+@PACKAGE@_VERSION	:= @VERSION@
 @PACKAGE@		:= @package@-$(@PACKAGE@_VERSION)
-@PACKAGE@_SRCDIR		:= $(PTXDIST_WORKSPACE)/local_src/$(@PACKAGE@)
+@PACKAGE@_URL		:= file://$(PTXDIST_WORKSPACE)/local_src/$(@PACKAGE@)
 @PACKAGE@_DIR		:= $(BUILDDIR)/$(@PACKAGE@)
+@PACKAGE@_BUILD_OOT	:= YES
 @PACKAGE@_LICENSE	:= unknown
 
 # ----------------------------------------------------------------------------
@@ -44,11 +45,11 @@ endif
 $(STATEDIR)/@package@.extract:
 	@$(call targetinfo)
 	@$(call clean, $(@PACKAGE@_DIR))
+	@$(call extract, @PACKAGE@)
 ifdef PTXCONF_@PACKAGE@_TRUNK
-	cd $(@PACKAGE@_SRCDIR) && sh autogen.sh
+	cd $(@PACKAGE@_DIR) && sh autogen.sh
 endif
-	@$(call patchin, @PACKAGE@, $(@PACKAGE@_SRCDIR))
-	mkdir -p $(@PACKAGE@_DIR)
+	@$(call patchin, @PACKAGE@)
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -61,7 +62,8 @@ endif
 #
 # autoconf
 #
-@PACKAGE@_AUTOCONF = \
+@PACKAGE@_CONF_TOOL	:= autoconf
+@PACKAGE@_CONF_OPT	:= \
 	--host=arm-cortexm3-eabi \
 	--build=i686-unknown-linux-gnu \
 	--with-stellaris-sdk=$(SW_EK_LM3S3748_DIR) \
@@ -69,9 +71,7 @@ endif
 
 #$(STATEDIR)/@package@.prepare:
 #	@$(call targetinfo)
-#	@$(call clean, $(@PACKAGE@_DIR)/config.cache)
-#	cd $(@PACKAGE@_DIR) && \
-#		$(@PACKAGE@_PATH) $(@PACKAGE@_SRCDIR)/configure $(@PACKAGE@_AUTOCONF)
+#	@$(call world/prepare, @PACKAGE@)
 #	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -99,9 +99,9 @@ $(STATEDIR)/@package@.targetinstall:
 	@$(call targetinfo)
 
 	@$(call install_init,  @package@)
-	@$(call install_fixup, @package@, PACKAGE, @package@)
+	@$(call install_fixup, @package@, PACKAGE, @packagedash@)
 	@$(call install_fixup, @package@, PRIORITY, optional)
-	@$(call install_fixup, @package@, VERSION, trunk)
+	@$(call install_fixup, @package@, VERSION, $(@PACKAGE@_VERSION))
 	@$(call install_fixup, @package@, SECTION, base)
 	@$(call install_fixup, @package@, AUTHOR, "@AUTHOR@")
 	@$(call install_fixup, @package@, DEPENDS,)