From df5446c040b99bf2631e5da226e73a2fa82c7b15 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Wed, 22 May 2019 02:14:02 +0000
Subject: [PATCH] ci: support CentOS-7
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 32b0226e..faca4590 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 5d7c2cf6..d559ec5f 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 /" <<EOF
+v2essential devtest
+essential devtest
+all Search::Xapian-
EOF
;;
esac
--
2.50.0