naoki: Add functionality to have different version numbers than main package.

diff --git a/pkgs/Constants b/pkgs/Constants
index e88552b3b5d7bfe48a8afa11bf08ed4ee2ac8351..5142556a85c0b86ebbe01960b4992010e341a9a4 100644 (file)
--- a/pkgs/Constants
+++ b/pkgs/Constants
@@ -82,13 +82,6 @@ export BUILD_ID
 # Package variables
 #
 ###############################################################################
-#
-# Constants
-#
-
-# The suffix of the package name
-PKG_SUFFIX = -$(PKG_VER)-$(DISTRO_SNAME)$(DISTRO_EPOCH)-$(PKG_ARCH).$(PKG_REL).ipk
-
 #
 # Variables
 #

diff --git a/pkgs/Functions b/pkgs/Functions
index 258a02fa39bf5724bc4da07f465f3d243914be1f..ff64af3b9da3f8b445f6209f77c03c2c15c88c8b 100644 (file)
--- a/pkgs/Functions
+++ b/pkgs/Functions
@@ -7,7 +7,10 @@
 
 include $(PKGROOT)/gmsl
 
-DO_PACKAGE_FILENAME = $(1)$(PKG_SUFFIX)
+DO_PACKAGE_FILENAME = $(1)$(call DO_PKG_SUFFIX,$(1))
+
+DO_PKG_SUFFIX = \
+       -$(if $(PKG_VER-$(1)),$(PKG_VER-$(1)),$(PKG_VER))-$(DISTRO_SNAME)$(DISTRO_EPOCH)-$(PKG_ARCH).$(if $(PKG_REL-$(1)),$(PKG_REL-$(1)),$(PKG_REL)).ipk
 
 define DO_PACKAGE
        @echo "#####################################################################"