Revert hack to supermin to get builds working temporarily.

This reverts commit 777f74553b
and commit 70f64c1be1.
This commit is contained in:
Richard W.M. Jones 2016-01-06 10:51:10 +00:00
parent 1c245f7a21
commit 021f6c037a

View File

@ -813,33 +813,29 @@ ip route list ||:
if ping -c 3 -w 20 8.8.8.8 && wget http://libguestfs.org -O /dev/null; then
extra=
else
# Temporarily until https://fedorahosted.org/rel-eng/ticket/6274
# is fixed in Koji. This isn't a permanent solution because the
# non-root build process cannot read all /etc files.
extra="--with-supermin-extra-options=--use-installed"
# mkdir repo
# # -n 1 because of RHBZ#980502.
# find /var/cache/yum -type f -name '*.rpm' -print0 | xargs -0 -n 1 cp -t repo
# createrepo repo
# cat > yum.conf <<EOF
# [main]
# cachedir=/var/cache/yum
# debuglevel=1
# logfile=/var/log/yum.log
# retries=20
# obsoletes=1
# gpgcheck=0
# assumeyes=1
# reposdir=/dev/null
mkdir repo
# -n 1 because of RHBZ#980502.
find /var/cache/yum -type f -name '*.rpm' -print0 | xargs -0 -n 1 cp -t repo
createrepo repo
cat > yum.conf <<EOF
[main]
cachedir=/var/cache/yum
debuglevel=1
logfile=/var/log/yum.log
retries=20
obsoletes=1
gpgcheck=0
assumeyes=1
reposdir=/dev/null
# [local]
# name=local
# baseurl=file://$(pwd)/repo
# failovermethod=priority
# enabled=1
# gpgcheck=0
# EOF
# extra=--with-supermin-packager-config=$(pwd)/yum.conf
[local]
name=local
baseurl=file://$(pwd)/repo
failovermethod=priority
enabled=1
gpgcheck=0
EOF
extra=--with-supermin-packager-config=$(pwd)/yum.conf
fi
%global localconfigure \