Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/zcs 6046 #2

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Feature/zcs 6046 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b84eb30
Fix local package overrides for platforms, broken during reorg
quanah May 7, 2016
8468e4c
Adding PKG_OS_TAG (as a future replacement for ZAPPEND), to add to RP…
Jun 24, 2017
e024c60
Do not sign changes files (they will be signed while pushing into rep…
Jul 18, 2017
1cd0124
ZCS-6046: Defination of ubuntu 18 added
Sep 26, 2018
779f6a2
Adding PKG_OS_TAG (as a future replacement for ZAPPEND), to add to RP…
Jun 24, 2017
6efbcaf
Do not sign changes files (they will be signed while pushing into rep…
Jul 18, 2017
b02054b
Merge branch 'develop' of github.com:Zimbra/zimbra-package-stub into …
Prashantsurana Feb 7, 2020
6648558
ZCS-6046: Defination of ubuntu 18 added
Sep 26, 2018
e8799a5
Merge branch 'feature/ZCS-6046' of github.com:Zimbra/zimbra-package-s…
Prashantsurana Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions bin/get_plat_tag.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,10 @@ if [ -f /etc/lsb-release ]; then
echo "16${i}"
exit 0
fi
if [ "$RELEASE" = "bionic" ]; then
echo "18${i}"
exit 0
fi
echo "UNKNOWN${i}"
exit 0
fi
Expand Down
2 changes: 2 additions & 0 deletions def/package-RHEL.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions def/package-UBUNTU.def
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
include $(DEF_ROOT)/package-deb.def

PKG_APPEND.UBUNTU18_64 := .18.04
PKG_APPEND.UBUNTU16_64 := .16.04
PKG_APPEND.UBUNTU14_64 := .14.04
PKG_APPEND.UBUNTU12_64 := .12.04
PKG_OS_TAG.UBUNTU18_64 := u18
PKG_OS_TAG.UBUNTU16_64 := u16
PKG_OS_TAG.UBUNTU14_64 := u14
PKG_OS_TAG.UBUNTU12_64 := u12
2 changes: 1 addition & 1 deletion def/package-deb.def
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PKG_EXT := deb

PKG_BUILD := dpkg-buildpackage -irpm
PKG_BUILD := dpkg-buildpackage -irpm -us -uc
PKG_EXTRACT := sudo apt-get --assume-yes --verbose-versions install
PKG_PURGE := sudo apt-get --assume-yes --purge purge
PKG_DEV := dev
Expand Down
8 changes: 5 additions & 3 deletions def/package.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,15 @@ 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
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), )
Expand All @@ -78,9 +80,9 @@ define generic-clean
$(RM) -rf $(PLATFORM_DIR)
endef

# $pkg.spec OR $pkg/debian/{changelog,*.shlibs}
# $pkg.spec OR $pkg/debian/{changelog,*.shlibs,control}
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
Expand All @@ -93,7 +95,7 @@ define replace-dictinfo
$(PERL) -pi -e 's/ADICT/$(dictver)/g;'
endef

# $pkg.spec OR $pkg/debian/{changelog, control, copyright, watch}
# $pkg.spec OR $pkg/debian/{changelog,control,copyright,watch}
define replace-perl-modinfo
$(PERL) -pi -e 's/MODNAME/$(pname)/g; s/MODNORMNAME/$(pname_lc)/g;'
endef