summaryrefslogtreecommitdiff
path: root/stubdom
diff options
context:
space:
mode:
authorJuergen Gross <jgross@suse.com>2021-09-10 07:55:17 +0200
committerIan Jackson <iwj@xenproject.org>2021-10-18 14:28:46 +0100
commit3ae80dea4601764818d1e5b84bd1e4479c0d4790 (patch)
treee07e5f76975f3ce3af16fce0a81ea61cd6ec3778 /stubdom
parent9cfeb83cbe23a873de512211d7ecd989348b9df0 (diff)
stubdom: disable building pv-grub
The stubdom based pv-grub is using a very outdated version of grub (0.97) and should not be used any longer. Mainline grub has support for PV guests for a long time now, so that should be used as a boot loader of a PV domain. So disable building pv-grub per default. In case someone really wants to continue using it he/she can still use a pv-grub binary from an older Xen version or manually enable building it via: configure --enable-pv-grub [ This was already disabled in osstest by 8dee6e333622 "make-flight: Drop pvgrub (pvgrub1) tests" -iwj ] Signed-off-by: Juergen Gross <jgross@suse.com> Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Acked-by: Ian Jackson <iwj@xenproject.org> Release-Acked-by: Ian Jackson <iwj@xenproject.org>
Diffstat (limited to 'stubdom')
-rwxr-xr-xstubdom/configure8
-rw-r--r--stubdom/configure.ac2
2 files changed, 3 insertions, 7 deletions
diff --git a/stubdom/configure b/stubdom/configure
index aa48df986d..df31532abb 100755
--- a/stubdom/configure
+++ b/stubdom/configure
@@ -1342,7 +1342,7 @@ Optional Features:
--enable-ioemu-stubdom Build and install ioemu-stubdom
--enable-c-stubdom Build and install c-stubdom (default is DISABLED)
--enable-caml-stubdom Build and install caml-stubdom (default is DISABLED)
- --disable-pv-grub Build and install pv-grub (default is ENABLED)
+ --enable-pv-grub Build and install pv-grub (default is DISABLED)
--disable-xenstore-stubdom
Build and install xenstore-stubdom (default is
ENABLED)
@@ -2129,11 +2129,7 @@ fi
else
-grub=y
-STUBDOM_TARGETS="$STUBDOM_TARGETS grub"
-STUBDOM_BUILD="$STUBDOM_BUILD pv-grub"
-STUBDOM_INSTALL="$STUBDOM_INSTALL install-grub"
-STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-grub"
+grub=n
fi
diff --git a/stubdom/configure.ac b/stubdom/configure.ac
index bd6f765929..a07a1edae5 100644
--- a/stubdom/configure.ac
+++ b/stubdom/configure.ac
@@ -21,7 +21,7 @@ m4_include([../m4/fetcher.m4])
AX_STUBDOM_CONDITIONAL([ioemu-stubdom], [ioemu])
AX_STUBDOM_DEFAULT_DISABLE([c-stubdom], [c])
AX_STUBDOM_DEFAULT_DISABLE([caml-stubdom], [caml])
-AX_STUBDOM_DEFAULT_ENABLE([pv-grub], [grub])
+AX_STUBDOM_DEFAULT_DISABLE([pv-grub], [grub])
AX_STUBDOM_DEFAULT_ENABLE([xenstore-stubdom], [xenstore])
AX_STUBDOM_DEFAULT_ENABLE([xenstorepvh-stubdom], [xenstorepvh])
AX_STUBDOM_CONDITIONAL([vtpm-stubdom], [vtpm])