From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id CAE471FF165 for ; Thu, 28 Aug 2025 12:36:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 017B5D209; Thu, 28 Aug 2025 12:37:00 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Thu, 28 Aug 2025 12:35:48 +0200 Message-ID: <20250828103621.936206-1-c.heiss@proxmox.com> X-Mailer: git-send-email 2.50.1 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1756377378703 X-SPAM-LEVEL: Spam detection results: 0 AWL -2.515 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_SOMETLD_ARE_BAD_TLD 5 .bar, .beauty, .buzz, .cam, .casa, .cfd, .club, .date, .guru, .link, .live, .monster, .online, .press, .pw, .quest, .rest, .sbs, .shop, .stream, .top, .trade, .wiki, .work, .xyz TLD abuse PROLO_LEO1 0.1 Meta Catches all Leo drug variations so far RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager] configs: drop unused country.dat file from install X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" I could not find _any_ reference to it in current checkouts of ~every Proxmox repository. AFAICT this was copied from pve-installer in pve-installer commit f0583fd4e ("copied country.pl form pve-manager") in 2017 and simply never dropped here afterwards, so it's an unused leftover. Signed-off-by: Christoph Heiss --- That script and file has been long replaced in pve-installer too, FWIW. Makefile | 2 +- configs/Makefile | 9 ++---- configs/country.pl | 81 ---------------------------------------------- 3 files changed, 3 insertions(+), 89 deletions(-) delete mode 100755 configs/country.pl diff --git a/Makefile b/Makefile index 13fc7c6e0..6c8b82e1a 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,7 @@ distclean: clean .PHONY: clean clean: set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done - rm -f $(PACKAGE)*.tar* country.dat *.deb *.dsc *.build *.buildinfo *.changes + rm -f $(PACKAGE)*.tar* *.deb *.dsc *.build *.buildinfo *.changes rm -rf dest $(PACKAGE)-[0-9]*/ .PHONY: dinstall diff --git a/configs/Makefile b/configs/Makefile index 6b89e8b3a..0619b97c7 100644 --- a/configs/Makefile +++ b/configs/Makefile @@ -1,21 +1,16 @@ include ../defines.mk -all: country.dat - -country.dat: country.pl - ./country.pl > country.dat +all: .PHONY: install -install: country.dat vzdump.conf pve-sources.sources pve-initramfs.conf pve-blacklist.conf pve.logrotate virtual-function-pinning.rules virtual-function-pinning-helper +install: vzdump.conf pve-sources.sources pve-initramfs.conf pve-blacklist.conf pve.logrotate virtual-function-pinning.rules virtual-function-pinning-helper install -D -m 0644 pve.logrotate $(DESTDIR)/etc/logrotate.d/pve install -D -m 0644 pve-sources.sources $(DESTDIR)/etc/apt/sources.list.d/pve-enterprise.sources 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 - install -D -m 0644 country.dat $(DESTDIR)/usr/share/$(PACKAGE)/country.dat install -D -m 0644 proxmox-ve-default.link $(DESTDIR)/usr/lib/systemd/network/99-default.link.d/proxmox-mac-address-policy.conf install -D -m 0644 virtual-function-pinning.rules $(DESTDIR)/usr/lib/udev/rules.d/70-virtual-function-pinning.rules install -D -m 0755 virtual-function-pinning-helper $(DESTDIR)/usr/lib/udev/virtual-function-naming-helper clean: - rm -f country.dat diff --git a/configs/country.pl b/configs/country.pl deleted file mode 100755 index bf74e2c9e..000000000 --- a/configs/country.pl +++ /dev/null @@ -1,81 +0,0 @@ -#!/usr/bin/perl -w - -use strict; -use PVE::Tools; - -# see also: http://en.wikipedia.org/wiki/Keyboard_layout -# -# country codes from: /usr/share/zoneinfo/iso3166.tab -# timezones from: /usr/share/zoneinfo/zone.tab -# keymaps: find /usr/share/keymaps/i386/ -type f -name '*.kmap.gz' -# x11 layouts: /usr/share/X11/xkb/rules/xorg.lst - -my $country = {}; - -my $line; -open(TMP, ")) { - if ($line =~ m/^([A-Z][A-Z])\s+(.*\S)\s*$/) { - $country->{ lc($1) } = $2; - } -} -close(TMP); - -# we need mappings for X11, console, and kvm vnc - -# LC(-LC)? => [DESC, kvm, console, X11, X11variant] -my $keymaps = PVE::Tools::kvmkeymaps(); - -foreach my $km (sort keys %$keymaps) { - my ($desc, $kvm, $console, $x11, $x11var) = @{ $keymaps->{$km} }; - - if ($km =~ m/^([a-z][a-z])-([a-z][a-z])$/i) { - defined($country->{$2}) || die "undefined country code '$2'"; - } else { - defined($country->{$km}) || die "undefined country code '$km'"; - } - - $x11var = '' if !defined($x11var); - print "map:$km:$desc:$kvm:$console:$x11:$x11var:\n"; -} - -my $defmap = { - 'us' => 'en-us', - 'be' => 'fr-be', - 'br' => 'pt-br', - 'ca' => 'en-us', - 'dk' => 'dk', - 'nl' => 'en-us', # most Dutch people us US layout - 'fi' => 'fi', - 'fr' => 'fr', - 'de' => 'de', - 'at' => 'de', - 'hu' => 'hu', - 'is' => 'is', - 'it' => 'it', - 'va' => 'it', - 'jp' => 'jp', - 'lt' => 'lt', - 'mk' => 'mk', - 'no' => 'no', - 'pl' => 'pl', - 'pt' => 'pt', - 'si' => 'si', - 'es' => 'es', - 'gi' => 'es', - 'ch' => 'de-ch', - 'gb' => 'en-gb', - 'lu' => 'fr-ch', - 'li' => 'de-ch', -}; - -my $mirrors = PVE::Tools::debmirrors(); -foreach my $cc (keys %$mirrors) { - die "undefined country code '$cc'" if !defined($country->{$cc}); -} - -foreach my $cc (sort keys %$country) { - my $map = $defmap->{$cc} || ''; - my $mir = $mirrors->{$cc} || ''; - print "$cc:$country->{$cc}:$map:$mir:\n"; -} -- 2.50.1 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel