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