From f6f9c4c96d8b33d25fa3d5afc01e8934c52ae301 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 17 Sep 2021 15:04:19 +0530 Subject: [PATCH] rpi4: debian packaging changes Signed-off-by: Rohit Yadav --- debian/changelog | 6 ++++++ debian/cloudstack-agent.postinst | 5 +++++ debian/cloudstack-management.postinst | 5 +++++ debian/control | 4 ++-- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a6b34d9403e..08ca38002de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cloudstack (4.15.2.0-rpi4) unstable; urgency=low + + * Update the version to 4.15.2.0-rpi4 + + -- the Apache CloudStack project Fri, 10 Sep 2021 21:19:58 +0530 + cloudstack (4.15.2.0) unstable; urgency=low * Update the version to 4.15.2.0 diff --git a/debian/cloudstack-agent.postinst b/debian/cloudstack-agent.postinst index 0942047a340..39d032678ba 100755 --- a/debian/cloudstack-agent.postinst +++ b/debian/cloudstack-agent.postinst @@ -46,6 +46,11 @@ case "$1" in fi fi + # Create symbolic link for python + if [ ! -f "/usr/bin/python" ]; then + ln -s /usr/bin/python2 /usr/bin/python + fi + # Running cloudstack-agent-upgrade to update bridge name for upgrade from CloudStack 4.0.x (and before) to CloudStack 4.1 (and later) /usr/bin/cloudstack-agent-upgrade if [ ! -d "/etc/libvirt/hooks" ] ; then diff --git a/debian/cloudstack-management.postinst b/debian/cloudstack-management.postinst index 2cc3b9b7b53..9c501a52cc6 100755 --- a/debian/cloudstack-management.postinst +++ b/debian/cloudstack-management.postinst @@ -65,4 +65,9 @@ if [ "$1" = configure ]; then grep -s -q "db.simulator.driver=jdbc:mysql" ${CONFDIR}/${DBPROPS} || sed -i -e "\$adb.simulator.driver=jdbc:mysql" ${CONFDIR}/${DBPROPS} fi + # Create symbolic link for python + if [ ! -f "/usr/bin/python" ]; then + ln -s /usr/bin/python2 /usr/bin/python + fi + #DEBHELPER# diff --git a/debian/control b/debian/control index e6184090f67..f9266a12802 100644 --- a/debian/control +++ b/debian/control @@ -15,14 +15,14 @@ Description: A common package which contains files which are shared by several C Package: cloudstack-management Architecture: all -Depends: ${python3:Depends}, openjdk-11-jre-headless | java11-runtime-headless | java11-runtime | openjdk-11-jre-headless | zulu-11, cloudstack-common (= ${source:Version}), net-tools, sudo, python3-mysql.connector, augeas-tools, mysql-client | mariadb-client, adduser, bzip2, ipmitool, file, gawk, iproute2, qemu-utils, python3-dnspython, lsb-release, init-system-helpers (>= 1.14~), python3-setuptools +Depends: ${python3:Depends}, openjdk-11-jre-headless | java11-runtime-headless | java11-runtime | openjdk-11-jre-headless | zulu-11, cloudstack-common (= ${source:Version}), net-tools, sudo, python3-mysql.connector, augeas-tools, mysql-client | mariadb-client, adduser, bzip2, ipmitool, file, gawk, iproute2, qemu-utils, python3-dnspython, lsb-release, init-system-helpers (>= 1.14~), python3-setuptools, python | python2 Conflicts: cloud-server, cloud-client, cloud-client-ui Description: CloudStack server library The CloudStack management server Package: cloudstack-agent Architecture: all -Depends: ${python:Depends}, ${python3:Depends}, openjdk-11-jre-headless | java11-runtime-headless | java11-runtime | openjdk-11-jre-headless | zulu-11, cloudstack-common (= ${source:Version}), lsb-base (>= 9), openssh-client, qemu-kvm (>= 2.5), libvirt-bin (>= 1.3) | libvirt-daemon-system (>= 3.0), iproute2, ebtables, vlan, ipset, python3-libvirt, ethtool, iptables, lsb-release, aria2, ufw, apparmor +Depends: ${python:Depends}, ${python3:Depends}, openjdk-11-jre-headless | java11-runtime-headless | java11-runtime | openjdk-11-jre-headless | zulu-11, cloudstack-common (= ${source:Version}), lsb-base (>= 9), openssh-client, qemu-kvm (>= 2.5), libvirt-bin (>= 1.3) | libvirt-daemon-system (>= 3.0), iproute2, ebtables, vlan, ipset, python3-libvirt, ethtool, iptables, lsb-release, aria2, ufw, apparmor, python | python2 Recommends: init-system-helpers Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts Description: CloudStack agent