summaryrefslogtreecommitdiffstats
path: root/appliance
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2010-12-06 17:44:06 +0000
committerRichard W.M. Jones <rjones@redhat.com>2010-12-06 22:04:27 +0000
commit53853f717c5928bc61809cc26160da118cd556fa (patch)
tree905f86bd65b9f3533a4214dd0fb7b86dab821efd /appliance
parent9bc15f5d98a3a17d465a94f42dc3ffb60c077293 (diff)
downloadlibguestfs-53853f717c5928bc61809cc26160da118cd556fa.tar.gz
libguestfs-53853f717c5928bc61809cc26160da118cd556fa.tar.xz
libguestfs-53853f717c5928bc61809cc26160da118cd556fa.zip
Add --with-febootstrap-yum-config.
This allows the febootstrap --yum-config option to be passed through, allowing a separate yum configuration to be used. The hope is that this will enable building in Koji.
Diffstat (limited to 'appliance')
-rwxr-xr-xappliance/make.sh.in9
1 files changed, 5 insertions, 4 deletions
diff --git a/appliance/make.sh.in b/appliance/make.sh.in
index bab0529c..9e54b4af 100755
--- a/appliance/make.sh.in
+++ b/appliance/make.sh.in
@@ -24,12 +24,13 @@ set -e
excludes="--exclude '^perl' --exclude '^python' --exclude '^fedora-logos' --exclude '^redhat-logos' --exclude '^dracut' --exclude '^upstart' --exclude '^plymouth' --exclude '^systemd' --exclude '^linux-firmware' --exclude '^kbd-misc'"
# Run febootstrap on the package list.
-if [ -z "@PACKAGE_DIRECTORY@" ]; then
- @FEBOOTSTRAP@ -v -o supermin.d $excludes --names $(< packagelist )
-else
- @FEBOOTSTRAP@ -v -o supermin.d $excludes @PACKAGE_DIRECTORY@/*
+if [ "x@FEBOOTSTRAP_YUM_CONFIG@" != "xno" ]; then
+ extra="--yum-config @FEBOOTSTRAP_YUM_CONFIG@"
fi
+echo @FEBOOTSTRAP@ -v -o supermin.d --names $(< packagelist ) $excludes $extra
+@FEBOOTSTRAP@ -v -o supermin.d --names $(< packagelist ) $excludes $extra
+
# Remove some things that we don't want in the appliance. This is
# copied from the old febootstrap-minimize. However minimization is
# not so important now that we are caching the appliance.