From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 6827D205C1 for ; Wed, 22 May 2019 02:14:04 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 5/5] ci: support CentOS-7 Date: Wed, 22 May 2019 02:14:02 +0000 Message-Id: <20190522021402.24114-6-e@80x24.org> In-Reply-To: <20190522021402.24114-1-e@80x24.org> References: <20190522021402.24114-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Tested on an amd64 chroot built with rinse 3.4 --- ci/deps.perl | 7 +++++++ ci/profiles.sh | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/ci/deps.perl b/ci/deps.perl index 32b0226..faca459 100755 --- a/ci/deps.perl +++ b/ci/deps.perl @@ -58,6 +58,8 @@ my $profiles = { my @precious; if ($^O eq 'freebsd') { @precious = qw(perl curl Socket6 IO::Compress::Gzip); +} elsif ($pkg_fmt eq 'rpm') { + @precious = qw(perl curl); } if (@precious) { @@ -168,6 +170,11 @@ if ($pkg_fmt eq 'deb') { root(qw(pkg install -y), @quiet, @pkg_install) if @pkg_install; root(qw(pkg autoremove -y), @quiet); # TODO: yum / rpm support +} elsif ($pkg_fmt eq 'rpm') { + my @quiet = $ENV{V} ? () : ('-q'); + exclude_uninstalled(\@pkg_remove); + root(qw(yum remove -y), @quiet, @pkg_remove) if @pkg_remove; + root(qw(yum install -y), @quiet, @pkg_install) if @pkg_install; } else { die "unsupported package format: $pkg_fmt\n"; } diff --git a/ci/profiles.sh b/ci/profiles.sh index 5d7c2cf..d559ec5 100755 --- a/ci/profiles.sh +++ b/ci/profiles.sh @@ -68,6 +68,12 @@ all devtest- v2essential essential essential devtest- +EOF + ;; +centos-7) sed "s/^/$PKG_FMT /" <