From 23c0c60ee48d46c53ba9140a0b0065b61ec9ec21 Mon Sep 17 00:00:00 2001 From: Dmitry Maksyoma Date: Thu, 3 Aug 2023 22:00:08 +1200 Subject: [PATCH 1/3] Fix Alpine build --- src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh index 8385d43..37f9e53 100644 --- a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh +++ b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh @@ -59,7 +59,7 @@ elif [[ "${DISTRO}" == "opensuse" ]] ; then fi elif [[ "${DISTRO}" == "fedora37" ]] ; then if [[ "$(arch)" =~ ^x86_64$ ]] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_thirtyseven_${KASM_VER_NAME_PART}_x86_64.rpm" + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_thirtyseven_${KASM_VER_NAME_PART}_x86_64.rpm" else BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_thirtyseven_${KASM_VER_NAME_PART}_aarch64.rpm" fi @@ -152,6 +152,8 @@ elif [[ "${DISTRO}" == "alpine" ]] ; then perl-switch \ perl-try-tiny \ perl-yaml-tiny \ + perl-datetime \ + perl-datetime-timezone \ pixman \ py3-xdg \ python3 \ From e9a746a6ec6e18ce6327f87ca770b4d5b853dd18 Mon Sep 17 00:00:00 2001 From: Dmitry Maksyoma Date: Thu, 3 Aug 2023 22:41:48 +1200 Subject: [PATCH 2/3] Fix openSuse buil --- src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh index 37f9e53..8bc1c85 100644 --- a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh +++ b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh @@ -17,8 +17,8 @@ echo "Install KasmVNC server" cd /tmp BUILD_ARCH=$(uname -p) UBUNTU_CODENAME="" -COMMIT_ID="9450157af1e16f9a27c12170ac0ebfd28ee50ebc" -BRANCH="master" # just use 'release' for a release branch +COMMIT_ID="6a73d1cb49f5028a340c1dfe5a35cb390aec31bd" +BRANCH="bugfix_KASM-4765-fix-opensuse-datetime-dependency" # just use 'release' for a release branch KASMVNC_VER="1.1.1" COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) From 417c5f42fdf4bf2d27e724d6ffd17bba0f495018 Mon Sep 17 00:00:00 2001 From: Matthew McClaskey Date: Thu, 3 Aug 2023 18:36:06 +0000 Subject: [PATCH 3/3] Update to tip Kasmvnc --- src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh index 8bc1c85..fa0e286 100644 --- a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh +++ b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh @@ -17,8 +17,8 @@ echo "Install KasmVNC server" cd /tmp BUILD_ARCH=$(uname -p) UBUNTU_CODENAME="" -COMMIT_ID="6a73d1cb49f5028a340c1dfe5a35cb390aec31bd" -BRANCH="bugfix_KASM-4765-fix-opensuse-datetime-dependency" # just use 'release' for a release branch +COMMIT_ID="fa884809145e0ba6e5e1da49887a82b5cab0a1d1" +BRANCH="master" # just use 'release' for a release branch KASMVNC_VER="1.1.1" COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6)