diff --git a/build.sh b/build.sh index 81a17f6..654bea4 100755 --- a/build.sh +++ b/build.sh @@ -334,8 +334,6 @@ if [ ! -e "${PACKAGES}/proxmox-backup-${BUILD_PACKAGE}_${PROXMOX_BACKUP_VER}_${P fi [[ "${BUILD_PROFILES}" =~ cross ]] && \ patch -p1 -d proxmox-backup/ < "${PATCHES}/${PBSVERSION}/proxmox-backup-cross.patch" - [ "${PBSVERSION}" = "pbs3" ] && \ - patch -p1 -d proxmox-backup/ < "${PATCHES}/${PBSVERSION}/proxmox-backup-dashboard_fix.patch" cd proxmox-backup/ set_package_info cargo vendor diff --git a/patches/pbs3/proxmox-backup-dashboard_fix.patch b/patches/pbs3/proxmox-backup-dashboard_fix.patch deleted file mode 100644 index 89a97a7..0000000 --- a/patches/pbs3/proxmox-backup-dashboard_fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/www/panel/NodeInfo.js b/www/panel/NodeInfo.js -index 72f97c7c..7c623ca6 100644 ---- a/www/panel/NodeInfo.js -+++ b/www/panel/NodeInfo.js -@@ -151,8 +151,11 @@ Ext.define('PBS.NodeInfoPanel', { - return data.kversion; - } - let kernel = data['current-kernel']; -- let buildDate = kernel.version.match(/\((.+)\)\s*$/)[1] ?? 'unknown'; -- return `${kernel.sysname} ${kernel.release} (${buildDate})`; -+ let buildDate = kernel.version.match(/(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}Z|[MTWFS]+[a-z]{2}.+\d{4}\b)\s*/); -+ if (!buildDate) { -+ buildDate=['unknown']; -+ } -+ return `${kernel.sysname} ${kernel.release} (${buildDate[0]})`; - }, - value: '', - }, -diff --git a/debian/changelog b/debian/changelog -index dc4a04cb..862fd783 100644 ---- a/debian/changelog -+++ b/debian/changelog -@@ -1,3 +1,9 @@ -+rust-proxmox-backup (3.1.2-2) bookworm; urgency=medium -+ -+ * ui: fix dashboard endless loading with custom kernels -+ -+ -- Wolfgang Sun, 03 Dec 2023 13:27:21 +0100 -+ - rust-proxmox-backup (3.1.2-1) bookworm; urgency=medium - - * sync: fix recent regression with recursive remote sync