mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add --with-febootstrap-yum-config.

Browse Source 
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.
This commit is contained in:
Richard W.M. Jones
2010-12-06 17:44:06 +00:00
parent 9bc15f5d98
commit 53853f717c
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
appliance/make.sh.in
View File

@@ -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.

22
configure.ac
View File

@@ -200,19 +200,15 @@ if test "x$enable_appliance" = "xyes"; then
$FEBOOTSTRAP --version >/dev/null 2>&1 ||
AC_MSG_ERROR([febootstrap >= 3.0 must be installed, your version is too old])
dnl Build from local package files, used when building with no network
dnl access, ie. under Koji.
AC_MSG_CHECKING([if we should build the appliance from local packages])
AC_ARG_WITH([local-package-directory],
[AS_HELP_STRING([--with-local-package-directory],
[build from local packages in dir @<:@default=no@:>@])],
[local_package_directory=$withval],
[local_package_directory=no])
AC_MSG_RESULT([$local_package_directory])
PACKAGE_DIRECTORY=
test "x$local_package_directory" != "xno" &&
PACKAGE_DIRECTORY="$local_package_directory"
AC_SUBST([PACKAGE_DIRECTORY])
dnl Pass a febootstrap --yum-config option.
AC_MSG_CHECKING([if user requested febootstrap --yum-config option])
AC_ARG_WITH([febootstrap-yum-config],
[AS_HELP_STRING([--with-febootstrap-yum-config=FILE],
[pass febootstrap --yum-config option @<:@default=no@:>@])],
[FEBOOTSTRAP_YUM_CONFIG="$withval"],
[FEBOOTSTRAP_YUM_CONFIG=no])
AC_MSG_RESULT([$FEBOOTSTRAP_YUM_CONFIG])
AC_SUBST([FEBOOTSTRAP_YUM_CONFIG])
dnl Which distro?
dnl