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

build: Change --with-febootstrap-yum-config to --with-febootstrap-packager-config

Browse Source 
For the rationale behind this renaming, see:
b8cbe191d0

You can still, for the time being, use
./configure --with-febootstrap-yum-config
but it's preferred to switch to the new option.  The new option is
identical, just renamed.

Qe still pass the deprecated --yum-config option to febootstrap
itself, since both old and new febootstrap support this.
This commit is contained in:
Richard W.M. Jones
2012-12-22 17:26:44 +00:00
parent e73cf67762
commit bfddae7cee
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
appliance/make.sh.in
View File

@@ -28,8 +28,10 @@ done
exec 5<&-
# Run febootstrap on the package list.
if [ "x@FEBOOTSTRAP_YUM_CONFIG@" != "xno" ]; then
extra="--yum-config @FEBOOTSTRAP_YUM_CONFIG@"
# NB: Keep using --yum-config (deprecated alias) here since both old
# and new febootstrap still support it.
if [ "x@FEBOOTSTRAP_PACKAGER_CONFIG@" != "xno" ]; then
extra="--yum-config @FEBOOTSTRAP_PACKAGER_CONFIG@"
fi
echo @FEBOOTSTRAP@ -v -o supermin.d --names $(< packagelist ) $excludes $extra

25
configure.ac
View File

@@ -365,14 +365,27 @@ AC_CHECK_PROG([FEBOOTSTRAP],
[febootstrap],[febootstrap],[no])
dnl Pass a febootstrap --yum-config option.
AC_MSG_CHECKING([if user requested febootstrap --yum-config option])
dnl
dnl Note that in febootstrap >= 3.21, this option is now called
dnl --packager-config, although --yum-config can still be used
dnl as a deprecated alias.
AC_MSG_CHECKING([for --with-febootstrap-yum-config option (deprecated)])
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])
[pass febootstrap --packager-config option @<:@default=no@:>@])],
[FEBOOTSTRAP_PACKAGER_CONFIG="$withval"],
[FEBOOTSTRAP_PACKAGER_CONFIG=no])
AC_MSG_RESULT([$FEBOOTSTRAP_PACKAGER_CONFIG])
AC_SUBST([FEBOOTSTRAP_PACKAGER_CONFIG])
AC_MSG_CHECKING([for --with-febootstrap-packager-config option])
AC_ARG_WITH([febootstrap-packager-config],
[AS_HELP_STRING([--with-febootstrap-packager-config=FILE],
[pass febootstrap --packager-config option @<:@default=no@:>@])],
[FEBOOTSTRAP_PACKAGER_CONFIG="$withval"],
[FEBOOTSTRAP_PACKAGER_CONFIG=no])
AC_MSG_RESULT([$FEBOOTSTRAP_PACKAGER_CONFIG])
AC_SUBST([FEBOOTSTRAP_PACKAGER_CONFIG])
if test "x$enable_appliance" = "xyes"; then
test "x$FEBOOTSTRAP" = "xno" &&