From 30c005c6f36d1d62bdac044e6656632da8d55533 Mon Sep 17 00:00:00 2001 From: jiangcuo Date: Tue, 24 Dec 2024 18:37:58 +0800 Subject: [PATCH] fix pxcloud mirrors --- .../pxcloud/003-set-pxcloud-mirror.patch | 42 +++++++++++++++++++ packages/pve-manager/series | 1 + packages/pve-manager/series.aarch64 | 1 - packages/pve-manager/series.loongarch64 | 1 - packages/pve-manager/series.riscv64 | 1 - 5 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 packages/pve-manager/patches/pxcloud/003-set-pxcloud-mirror.patch delete mode 100644 packages/pve-manager/series.aarch64 delete mode 100644 packages/pve-manager/series.loongarch64 delete mode 100644 packages/pve-manager/series.riscv64 diff --git a/packages/pve-manager/patches/pxcloud/003-set-pxcloud-mirror.patch b/packages/pve-manager/patches/pxcloud/003-set-pxcloud-mirror.patch new file mode 100644 index 0000000..3751986 --- /dev/null +++ b/packages/pve-manager/patches/pxcloud/003-set-pxcloud-mirror.patch @@ -0,0 +1,42 @@ +diff --git a/configs/Makefile b/configs/Makefile +index fa586e28..d72a466b 100644 +--- a/configs/Makefile ++++ b/configs/Makefile +@@ -6,9 +6,9 @@ country.dat: country.pl + ./country.pl > country.dat + + .PHONY: install +-install: country.dat vzdump.conf pve-sources.list pve-initramfs.conf pve-blacklist.conf pve.logrotate ++install: country.dat vzdump.conf pveport.list pve-initramfs.conf pve-blacklist.conf pve.logrotate + install -D -m 0644 pve.logrotate $(DESTDIR)/etc/logrotate.d/pve +- install -D -m 0644 pve-sources.list $(DESTDIR)/etc/apt/sources.list.d/pve-enterprise.list ++ install -D -m 0644 pveport.list $(DESTDIR)/etc/apt/sources.list.d/pveport.list + install -D -m 0644 pve-blacklist.conf $(DESTDIR)/etc/modprobe.d/pve-blacklist.conf + install -D -m 0644 vzdump.conf $(DESTDIR)/etc/vzdump.conf + install -D -m 0644 pve-initramfs.conf $(DESTDIR)/etc/initramfs-tools/conf.d/pve-initramfs.conf +diff --git a/configs/pve-sources.list b/configs/pve-sources.list +deleted file mode 100644 +index 010385a9..00000000 +--- a/configs/pve-sources.list ++++ /dev/null +@@ -1 +0,0 @@ +-deb https://enterprise.proxmox.com/debian/pve bookworm pve-enterprise +diff --git a/configs/pveport.list b/configs/pveport.list +new file mode 100644 +index 00000000..635f88c7 +--- /dev/null ++++ b/configs/pveport.list +@@ -0,0 +1 @@ ++deb https://mirrors.lierfang.com/pxcloud/pve bookworm main +\ No newline at end of file +diff --git a/debian/lintian-overrides b/debian/lintian-overrides +index fb9cc49d..f9731f49 100644 +--- a/debian/lintian-overrides ++++ b/debian/lintian-overrides +@@ -3,5 +3,5 @@ pve-manager: no-manual-page [usr/bin/pvebanner] + pve-manager: no-manual-page [usr/bin/pveupdate] + pve-manager: non-standard-dir-perm 0700 != 0755 [var/log/pveproxy/] + pve-manager: systemd-service-file-refers-to-unusual-wantedby-target getty.target [lib/systemd/system/pvebanner.service] +-pve-manager: package-installs-apt-sources [etc/apt/sources.list.d/pve-enterprise.list] ++pve-manager: package-installs-apt-sources [etc/apt/sources.list.d/pveport.list] + pve-manager: privacy-breach-generic usr/share/pve-manager/touch/sencha-touch-all-debug.js * diff --git a/packages/pve-manager/series b/packages/pve-manager/series index ffc6fb3..b45bdb6 100644 --- a/packages/pve-manager/series +++ b/packages/pve-manager/series @@ -9,3 +9,4 @@ patches/changelog/004-add-changelog-8.3.1+port1.patch patches/010-set-architecture-to-any.patch patches/pxcloud/001-add-pxcloud-support.patch patches/pxcloud/002-add-pxcloud-maintainer.patch +patches/pxcloud/003-set-pxcloud-mirror.patch diff --git a/packages/pve-manager/series.aarch64 b/packages/pve-manager/series.aarch64 deleted file mode 100644 index 448dec5..0000000 --- a/packages/pve-manager/series.aarch64 +++ /dev/null @@ -1 +0,0 @@ -patches/003-add-pveport-source.patch diff --git a/packages/pve-manager/series.loongarch64 b/packages/pve-manager/series.loongarch64 deleted file mode 100644 index 671f395..0000000 --- a/packages/pve-manager/series.loongarch64 +++ /dev/null @@ -1 +0,0 @@ -patches/other/003-add-pveport-source-looon64-riscv64.patch diff --git a/packages/pve-manager/series.riscv64 b/packages/pve-manager/series.riscv64 deleted file mode 100644 index 671f395..0000000 --- a/packages/pve-manager/series.riscv64 +++ /dev/null @@ -1 +0,0 @@ -patches/other/003-add-pveport-source-looon64-riscv64.patch