Commit 8468e4c7 authored by Shriram V's avatar Shriram V

Adding PKG_OS_TAG (as a future replacement for ZAPPEND), to add to RPM/DEB release tag

parent b84eb30c
......@@ -2,3 +2,5 @@ include $(DEF_ROOT)/package-rpm.def
PKG_APPEND.RHEL7_64 = .el7
PKG_APPEND.RHEL6_64 = .el6
PKG_OS_TAG.RHEL7_64 = r7
PKG_OS_TAG.RHEL6_64 = r6
......@@ -3,3 +3,6 @@ include $(DEF_ROOT)/package-deb.def
PKG_APPEND.UBUNTU16_64 := .16.04
PKG_APPEND.UBUNTU14_64 := .14.04
PKG_APPEND.UBUNTU12_64 := .12.04
PKG_OS_TAG.UBUNTU16_64 := u16
PKG_OS_TAG.UBUNTU14_64 := u14
PKG_OS_TAG.UBUNTU12_64 := u12
......@@ -53,6 +53,7 @@ PKG_ITERATION = 1$(PKG_REVISION)
# - PKG_DEV
# - PKG_LIB
# - PKG_APPEND
# - PKG_OS_TAG
BUILD_DISTRIBUTION := $(shell $(SED) -e 's/[0-9]*_[0-9]*$$//' <<< $(BUILD_PLATFORM))
ifneq ($(wildcard $(DEF_ROOT)/package-$(BUILD_DISTRIBUTION).def), )
include $(DEF_ROOT)/package-$(BUILD_DISTRIBUTION).def
......@@ -60,6 +61,7 @@ else
include $(error unsupported BUILD_PLATFORM $(BUILD_PLATFORM))
endif
PKG_APPEND ?= $(PKG_APPEND.$(BUILD_PLATFORM))
PKG_OS_TAG ?= $(PKG_OS_TAG.$(BUILD_PLATFORM))
# Platform specific package overrides
ifneq ($(wildcard $(BUILD_DISTRIBUTION).def), )
......@@ -80,7 +82,7 @@ endef
# $pkg.spec OR $pkg/debian/{changelog,*.shlibs}
define replace-pkginfo
$(PERL) -pi -e 's|VERSION|$(pvers)|; s|ITERATION|$(PKG_ITERATION)|; s|ZAPPEND|$(PKG_APPEND)|'
$(PERL) -pi -e 's|VERSION|$(pvers)|g; s|ITERATION|$(PKG_ITERATION)|g; s|PKG_OS_TAG|$(PKG_OS_TAG)|g; s|ZAPPEND|$(PKG_APPEND)|g'
endef
# $pkg.spec OR $pkg/debian/rules
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment