This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=e0c5e925ce09ce45852289f6755ffa9a74995b65 commit e0c5e925ce09ce45852289f6755ffa9a74995b65 Author: Guillem Jover <guil...@debian.org> AuthorDate: Mon Nov 13 01:32:03 2023 +0100 arch: Remove knetbsd-any support This port got started but did not really go very far, and has since been abandoned. Remove references to it. If it ever comes back it can be included again. --- data/ostable | 1 - data/tupletable | 1 - scripts/Dpkg/Vendor/Debian.pm | 4 ++-- scripts/t/Dpkg_Arch.t | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/data/ostable b/data/ostable index 776cd0158..64f424490 100644 --- a/data/ostable +++ b/data/ostable @@ -29,7 +29,6 @@ x32-gnu-linux linux-gnux32 linux[^-]*-gnux32 base-gnu-linux linux-gnu linux[^-]*(-gnu.*)? eabihf-gnu-kfreebsd kfreebsd-gnueabihf kfreebsd[^-]*-gnueabihf base-gnu-kfreebsd kfreebsd-gnu kfreebsd[^-]*(-gnu.*)? -base-gnu-knetbsd knetbsd-gnu knetbsd[^-]*(-gnu.*)? base-gnu-kopensolaris kopensolaris-gnu kopensolaris[^-]*(-gnu.*)? base-gnu-hurd gnu gnu[^-]* base-bsd-darwin darwin darwin[^-]* diff --git a/data/tupletable b/data/tupletable index 8e0ed0750..db0d0c0bb 100644 --- a/data/tupletable +++ b/data/tupletable @@ -39,7 +39,6 @@ x32-gnu-linux-amd64 x32 base-gnu-linux-<cpu> <cpu> eabihf-gnu-kfreebsd-arm kfreebsd-armhf base-gnu-kfreebsd-<cpu> kfreebsd-<cpu> -base-gnu-knetbsd-<cpu> knetbsd-<cpu> base-gnu-kopensolaris-<cpu> kopensolaris-<cpu> base-gnu-hurd-<cpu> hurd-<cpu> base-bsd-dragonflybsd-<cpu> dragonflybsd-<cpu> diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm index 72b2c3b94..956d2194b 100644 --- a/scripts/Dpkg/Vendor/Debian.pm +++ b/scripts/Dpkg/Vendor/Debian.pm @@ -324,9 +324,9 @@ sub set_build_features { ## Area: hardening # Mask features that are not available on certain architectures. - if (none { $os eq $_ } qw(linux kfreebsd knetbsd hurd) or + if (none { $os eq $_ } qw(linux kfreebsd hurd) or any { $cpu eq $_ } qw(alpha hppa ia64)) { - # Disabled on non-(linux/kfreebsd/knetbsd/hurd). + # Disabled on non-(linux/kfreebsd/hurd). # Disabled on alpha, hppa, ia64. $use_feature{hardening}{pie} = 0; } diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t index b39e034a5..5aba6bc64 100644 --- a/scripts/t/Dpkg_Arch.t +++ b/scripts/t/Dpkg_Arch.t @@ -16,7 +16,7 @@ use strict; use warnings; -use Test::More tests => 16260; +use Test::More tests => 15165; use_ok('Dpkg::Arch', qw(debarch_to_debtuple debarch_to_multiarch debarch_eq debarch_is debarch_is_wildcard @@ -28,7 +28,7 @@ use_ok('Dpkg::Arch', qw(debarch_to_debtuple debarch_to_multiarch get_host_gnu_type get_valid_arches)); -my $KNOWN_ARCHES_TOTAL = 488; +my $KNOWN_ARCHES_TOTAL = 454; my @valid_arches = get_valid_arches(); sub get_valid_wildcards -- Dpkg.Org's dpkg
