From 19382e401c5fe158200ba43c204875e368158374 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 24 Jun 2019 02:52:57 +0000 Subject: [PATCH] Revert "ci: require IO::KQueue on FreeBSD, for now" Now that we support IO::Poll once again, we can remove the IO::KQueue requirement. --- ci/deps.perl | 5 ++++- ci/profiles.sh | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ci/deps.perl b/ci/deps.perl index ad2c11d2..62870c1f 100755 --- a/ci/deps.perl +++ b/ci/deps.perl @@ -60,7 +60,7 @@ my $profiles = { # account for granularity differences between package systems and OSes my @precious; if ($^O eq 'freebsd') { - @precious = qw(perl curl Socket6 IO::Compress::Gzip IO::KQueue); + @precious = qw(perl curl Socket6 IO::Compress::Gzip); } elsif ($pkg_fmt eq 'rpm') { @precious = qw(perl curl); } @@ -149,6 +149,9 @@ my (@pkg_install, @pkg_remove, %all); for my $ary (values %$profiles) { $all{$_} = \@pkg_remove for @$ary; } +if ($^O eq 'freebsd') { + $all{'IO::KQueue'} = \@pkg_remove; +} $profiles->{all} = [ keys %all ]; # pseudo-profile for all packages # parse the profile list from the command-line diff --git a/ci/profiles.sh b/ci/profiles.sh index 1ddf7891..d559ec5f 100755 --- a/ci/profiles.sh +++ b/ci/profiles.sh @@ -54,7 +54,8 @@ esac case $ID-$VERSION_ID in freebsd-11|freebsd-12) sed "s/^/$PKG_FMT /" <