rpms/libguestfs
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Not a bug in yum, but in my shell script.

Browse Source
This commit is contained in:
Richard W.M. Jones 2010-12-06 19:48:29 +00:00
parent 1b16b6142b
commit 87a9821719
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
0002-Add-with-febootstrap-yum-config.patch
View File

@ -1,4 +1,4 @@
From 23b321b960d1e224fd293662d4c31e5ccfbc8ae9 Mon Sep 17 00:00:00 2001 From 461dc7038433c5183a428f88495c792a0aa4906c Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com> From: Richard W.M. Jones <rjones@redhat.com>
Date: Mon, 6 Dec 2010 17:44:06 +0000 Date: Mon, 6 Dec 2010 17:44:06 +0000
Subject: [PATCH 2/2] Add --with-febootstrap-yum-config. Subject: [PATCH 2/2] Add --with-febootstrap-yum-config.
@ -13,7 +13,7 @@ The hope is that this will enable building in Koji.
2 files changed, 14 insertions(+), 17 deletions(-) 2 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/appliance/make.sh.in b/appliance/make.sh.in diff --git a/appliance/make.sh.in b/appliance/make.sh.in
index bab0529..55b6530 100755 index bab0529..9e54b4a 100755
--- a/appliance/make.sh.in --- a/appliance/make.sh.in
+++ b/appliance/make.sh.in +++ b/appliance/make.sh.in
@@ -24,12 +24,13 @@ set -e @@ -24,12 +24,13 @@ set -e
@ -25,7 +25,7 @@ index bab0529..55b6530 100755
-else -else
- @FEBOOTSTRAP@ -v -o supermin.d $excludes @PACKAGE_DIRECTORY@/* - @FEBOOTSTRAP@ -v -o supermin.d $excludes @PACKAGE_DIRECTORY@/*
+if [ "x@FEBOOTSTRAP_YUM_CONFIG@" != "xno" ]; then +if [ "x@FEBOOTSTRAP_YUM_CONFIG@" != "xno" ]; then
+ extra="--yum-config '@FEBOOTSTRAP_YUM_CONFIG@'" + extra="--yum-config @FEBOOTSTRAP_YUM_CONFIG@"
fi fi
+echo @FEBOOTSTRAP@ -v -o supermin.d --names $(< packagelist ) $excludes $extra +echo @FEBOOTSTRAP@ -v -o supermin.d --names $(< packagelist ) $excludes $extra

8
libguestfs.spec
View File

@ -30,7 +30,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Epoch: 1 Epoch: 1
Version: 1.7.19 Version: 1.7.19
Release: 7%{?dist} Release: 8%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: Development/Libraries Group: Development/Libraries
URL: http://libguestfs.org/ URL: http://libguestfs.org/
@ -453,9 +453,7 @@ failovermethod=priority
enabled=1 enabled=1
gpgcheck=0 gpgcheck=0
EOF EOF
# Note that yum.conf has to be a relative path because of a bug %define extra --with-febootstrap-yum-config=$(pwd)/yum.conf
# in this version of the yum API.
%define extra --with-febootstrap-yum-config=../yum.conf
%endif %endif
./configure \ ./configure \
@ -741,7 +739,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Dec 6 2010 Richard Jones <rjones@redhat.com> - 1:1.7.19-7 * Mon Dec 6 2010 Richard Jones <rjones@redhat.com> - 1:1.7.19-8
- Rebuild appliance properly using febootstrap 3.1 and alternate yum repo. - Rebuild appliance properly using febootstrap 3.1 and alternate yum repo.
* Sun Dec 5 2010 Richard Jones <rjones@redhat.com> - 1:1.7.19-1 * Sun Dec 5 2010 Richard Jones <rjones@redhat.com> - 1:1.7.19-1