This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit f358813e1d14f44df2434c78850387bf5b3b1490 Merge: 1662af131e7 f8385a48da2 Author: Rohit Yadav <[email protected]> AuthorDate: Fri Jul 26 12:30:02 2024 +0000 Merge remote-tracking branch 'origin/4.19' into main Signed-off-by: Rohit Yadav <[email protected]> .../org/apache/cloudstack/api/ApiConstants.java | 1 + .../cloudstack/api/response/SnapshotResponse.java | 8 +++++ .../META-INF/db/views/cloud.snapshot_view.sql | 1 + .../main/java/com/cloud/api/ApiResponseHelper.java | 1 + .../cloud/api/query/dao/SnapshotJoinDaoImpl.java | 1 + .../com/cloud/api/query/vo/SnapshotJoinVO.java | 8 +++++ tools/appliance/README.md | 13 ++++++-- tools/appliance/build.sh | 22 +++++++++---- .../http/{preseed.cfg => preseed_aarch64.cfg} | 11 ++++++- .../http/{preseed.cfg => preseed_x86_64.cfg} | 0 .../scripts/install_systemvm_packages.sh | 22 ++++++++----- ...n => template-base_aarch64-target_aarch64.json} | 36 ++++++++++++++++------ ...on => template-base_x86_64-target_aarch64.json} | 36 ++++++++++++++++------ ...son => template-base_x86_64-target_x86_64.json} | 2 +- ui/src/components/view/InfoCard.vue | 8 +++-- ui/src/components/view/ListView.vue | 16 +++++++++- ui/src/utils/links.js | 36 ++++++++++++++++++++++ 17 files changed, 183 insertions(+), 39 deletions(-) diff --cc tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh index 92223cfbd88,ebf53dfc2d3..686661a72f9 --- a/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh +++ b/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh @@@ -98,11 -108,13 +104,13 @@@ function install_packages() apt_clean - install_vhd_util - # Install xenserver guest utilities as debian repos don't have it - wget --no-check-certificate https://download.cloudstack.org/systemvm/debian/xe-guest-utilities_7.20.2-0ubuntu1_amd64.deb - dpkg -i xe-guest-utilities_7.20.2-0ubuntu1_amd64.deb - rm -f xe-guest-utilities_7.20.2-0ubuntu1_amd64.deb + if [ "${arch}" != "arm64" ]; then + install_vhd_util + # Install xenserver guest utilities as debian repos don't have it - wget https://mirrors.kernel.org/ubuntu/pool/main/x/xe-guest-utilities/xe-guest-utilities_7.10.0-0ubuntu1_amd64.deb - dpkg -i xe-guest-utilities_7.10.0-0ubuntu1_amd64.deb - rm -f xe-guest-utilities_7.10.0-0ubuntu1_amd64.deb ++ wget --no-check-certificate https://download.cloudstack.org/systemvm/debian/xe-guest-utilities_7.20.2-0ubuntu1_amd64.deb ++ dpkg -i xe-guest-utilities_7.20.2-0ubuntu1_amd64.deb ++ rm -f xe-guest-utilities_7.20.2-0ubuntu1_amd64.deb + fi } return 2>/dev/null || install_packages diff --cc tools/appliance/systemvmtemplate/template-base_aarch64-target_aarch64.json index 2b0fe3a07ab,4d8a540a396..2ceadeaf742 --- a/tools/appliance/systemvmtemplate/template-base_aarch64-target_aarch64.json +++ b/tools/appliance/systemvmtemplate/template-base_aarch64-target_aarch64.json @@@ -27,10 -32,11 +32,11 @@@ "format": "qcow2", "headless": true, "http_directory": "http", - "iso_checksum": "sha512:33c08e56c83d13007e4a5511b9bf2c4926c4aa12fd5dd56d493c0653aecbab380988c5bf1671dbaea75c582827797d98c4a611f7fb2b131fbde2c677d5258ec9", - "iso_url": "https://cdimage.debian.org/mirror/cdimage/archive/12.5.0/amd64/iso-cd/debian-12.5.0-amd64-netinst.iso";, - "iso_checksum": "sha512:4980197fa30646a43df2672d98500a182d6636422e39e809d986551356f4d24b1ffab6d745331369b27f2e9a5326f020ba141df5772ac2c6328c08cce73de7e8", - "iso_url": "https://cdimage.debian.org/mirror/cdimage/archive/11.10.0/arm64/iso-cd/debian-11.10.0-arm64-netinst.iso";, ++ "iso_checksum": "sha512:14c2ca243ee7f6e447cc4466296d974ee36645c06d72043236c3fbea78f1948d3af88d65139105a475288f270e4b636e6885143d01bdf69462620d1825e470ae", ++ "iso_url": "https://cdimage.debian.org/mirror/cdimage/archive/12.5.0/arm64/iso-cd/debian-12.5.0-arm64-netinst.iso";, "net_device": "virtio-net", "output_directory": "../dist", + "qemu_binary": "qemu-system-aarch64", "qemuargs": [ [ "-m", diff --cc tools/appliance/systemvmtemplate/template-base_x86_64-target_aarch64.json index 2b0fe3a07ab,4763d1e3e82..b49ed17104a --- a/tools/appliance/systemvmtemplate/template-base_x86_64-target_aarch64.json +++ b/tools/appliance/systemvmtemplate/template-base_x86_64-target_aarch64.json @@@ -27,10 -31,11 +31,11 @@@ "format": "qcow2", "headless": true, "http_directory": "http", - "iso_checksum": "sha512:33c08e56c83d13007e4a5511b9bf2c4926c4aa12fd5dd56d493c0653aecbab380988c5bf1671dbaea75c582827797d98c4a611f7fb2b131fbde2c677d5258ec9", - "iso_url": "https://cdimage.debian.org/mirror/cdimage/archive/12.5.0/amd64/iso-cd/debian-12.5.0-amd64-netinst.iso";, - "iso_checksum": "sha512:4980197fa30646a43df2672d98500a182d6636422e39e809d986551356f4d24b1ffab6d745331369b27f2e9a5326f020ba141df5772ac2c6328c08cce73de7e8", - "iso_url": "https://cdimage.debian.org/mirror/cdimage/archive/11.10.0/arm64/iso-cd/debian-11.10.0-arm64-netinst.iso";, ++ "iso_checksum": "sha512:14c2ca243ee7f6e447cc4466296d974ee36645c06d72043236c3fbea78f1948d3af88d65139105a475288f270e4b636e6885143d01bdf69462620d1825e470ae", ++ "iso_url": "https://cdimage.debian.org/mirror/cdimage/archive/12.5.0/arm64/iso-cd/debian-12.5.0-arm64-netinst.iso";, "net_device": "virtio-net", "output_directory": "../dist", + "qemu_binary": "qemu-system-aarch64", "qemuargs": [ [ "-m",
