cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/4.9-systemdubuntupkging to 835ce70 [Forced Update!]
Date Wed, 24 Aug 2016 10:15:07 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.9-systemdubuntupkging 4e5cb7b45 -> 835ce703e (forced update)


CLOUDSTACK-9462: Use same pkgs on systemd and init based distros

This is an experimental change, if successful we'll meld this on previous commit.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/835ce703
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/835ce703
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/835ce703

Branch: refs/heads/4.9-systemdubuntupkging
Commit: 835ce703e09deeeea4ce02c58a5c009a01aa8717
Parents: 917e288
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Wed Aug 24 13:36:07 2016 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Wed Aug 24 15:44:42 2016 +0530

----------------------------------------------------------------------
 debian/control | 6 ++++--
 debian/rules   | 9 ---------
 2 files changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/835ce703/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index d7c7928..de44b32 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,8 @@ Description: CloudStack server library
 
 Package: cloudstack-agent
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, ${jre:Depends}, cloudstack-common (= ${source:Version}),
lsb-base (>= 4.0), libcommons-daemon-java, openssh-client, qemu-kvm (>= 1.0), libvirt-bin
(>= 0.9.8), uuid-runtime, iproute, ebtables, vlan, ${init:Depends}, ipset, python-libvirt,
ethtool, iptables, lsb-release
+Depends: ${python:Depends}, openjdk-8-jre-headless | openjdk-7-jre-headless, cloudstack-common
(= ${source:Version}), lsb-base (>= 4.0), libcommons-daemon-java, openssh-client, qemu-kvm
(>= 1.0), libvirt-bin (>= 0.9.8), uuid-runtime, iproute, ebtables, vlan, jsvc, ipset,
python-libvirt, ethtool, iptables, lsb-release
+Recommends: init-system-helpers
 Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts
 Description: CloudStack agent
  The CloudStack agent is in charge of managing shared computing resources in
@@ -31,7 +32,8 @@ Description: CloudStack agent
 
 Package: cloudstack-usage
 Architecture: all
-Depends: ${misc:Depends}, ${jre:Depends}, cloudstack-common (= ${source:Version}), jsvc,
libmysql-java
+Depends: openjdk-8-jre-headless | openjdk-7-jre-headless, cloudstack-common (= ${source:Version}),
jsvc, libmysql-java
+Recommends: init-system-helpers
 Description: CloudStack usage monitor
  The CloudStack usage monitor provides usage accounting across the entire cloud for
  cloud operators to charge based on usage parameters.

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/835ce703/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 32216ff..dc7b44c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,18 +5,9 @@ PACKAGE = $(shell dh_listpackages|head -n 1|cut -d '-' -f 1)
 SYSCONFDIR = "/etc"
 DESTDIR = "debian/tmp"
 
-ifeq ($(shell lsb_release -sr), 14.04)
-        SUBSTVARS = -Vjre:Depends="openjdk-7-jre-headless" -Vjdk:Depends="openjdk-7-jdk"
-Vinit:"Depends:jsvc"
-else
-        SUBSTVARS = -Vjre:Depends="openjdk-8-jre-headless" -Vjdk:Depends="openjdk-8-jdk"
-Vinit:"Depends:systemd"
-endif
-
 %:
 	dh $@ --with python2,systemd
 
-override_dh_gencontrol:
-	dh_gencontrol -- $(SUBSTVARS)
-
 override_dh_auto_configure:
 	cp packaging/debian/replace.properties replace.properties.tmp
 	echo VERSION=${VERSION} >> replace.properties.tmp


Mime
View raw message