mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
stubdom: remove c-stubdom
C-stubdom was meant as a base for building new Mini-OS based stubdoms. It hasn't seen any work for many years now and creating new stubdoms should use UNIKRAFT instead of Mini-OS. So remove c-stubdom. Signed-off-by: Juergen Gross <jgross@suse.com> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Teddy Astie <teddy.astie@vates.tech>
This commit is contained in:
Juergen Gross authored and Andrew Cooper committed
1 parent
be22d975b0
commit
95c36e9d87
6 files changed
-87
No files matched your search
@@ -339,17 +339,6 @@ $(TARGETS_MINIOS): mini-os-%:
|
||||
mkdir -p $@/$$i ; \
|
||||
done
|
||||
|
||||
###
|
||||
# C
|
||||
###
|
||||
|
||||
c-minios-config.mk: $(CURDIR)/c/minios.cfg
|
||||
MINIOS_CONFIG="$<" CONFIG_FILE="$(CURDIR)/$@" $(MAKE) DESTDIR= -C $(MINI_OS) config
|
||||
|
||||
.PHONY: c
|
||||
c: $(CROSS_ROOT) c-minios-config.mk
|
||||
CPPFLAGS="$(TARGET_CPPFLAGS) $(shell cat c-minios-config.mk)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= -C $@ LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH)
|
||||
|
||||
######
|
||||
# VTPM
|
||||
######
|
||||
@@ -432,10 +421,6 @@ xenstorepvh: $(CROSS_ROOT) xenstorepvh-minios-config.mk
|
||||
# minios
|
||||
########
|
||||
|
||||
.PHONY: c-stubdom
|
||||
c-stubdom: mini-os-$(XEN_TARGET_ARCH)-c lwip-$(XEN_TARGET_ARCH) libxenguest c
|
||||
DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/c/minios.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) APP_OBJS=$(CURDIR)/c/main.a
|
||||
|
||||
.PHONY: vtpm-stubdom
|
||||
vtpm-stubdom: mini-os-$(XEN_TARGET_ARCH)-vtpm vtpm
|
||||
DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/vtpm/minios.cfg" $(MAKE) -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS="$(CURDIR)/vtpm/vtpm.a" APP_LDLIBS="-ltpm -ltpm_crypto -lgmp -lpolarssl"
|
||||
@@ -485,8 +470,6 @@ else
|
||||
install-grub-if-enabled:
|
||||
endif
|
||||
|
||||
install-c: c-stubdom
|
||||
|
||||
install-xenstore: xenstore-stubdom
|
||||
$(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
|
||||
$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-xenstore/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/xenstore-stubdom.gz"
|
||||
@@ -540,13 +523,11 @@ uninstall-vtpmmgr:
|
||||
.PHONY: clean
|
||||
clean: $(foreach lib,$(STUB_LIBS),clean-libxen$(lib))
|
||||
clean:
|
||||
rm -fr mini-os-$(XEN_TARGET_ARCH)-c
|
||||
rm -fr mini-os-$(XEN_TARGET_ARCH)-grub
|
||||
rm -fr mini-os-$(XEN_TARGET_ARCH)-xenstore
|
||||
rm -fr mini-os-$(XEN_TARGET_ARCH)-xenstorepvh
|
||||
rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpm
|
||||
rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpmmgr
|
||||
$(MAKE) DESTDIR= -C c clean
|
||||
$(MAKE) -C vtpm clean
|
||||
$(MAKE) -C vtpmmgr clean
|
||||
rm -fr grub-$(XEN_TARGET_ARCH)
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
XEN_ROOT = $(CURDIR)/../..
|
||||
|
||||
ifeq (,$(findstring clean,$(MAKECMDGOALS)))
|
||||
include $(XEN_ROOT)/Config.mk
|
||||
endif
|
||||
|
||||
all: main.a
|
||||
|
||||
main.a: main.o
|
||||
$(AR) cr $@ $^
|
||||
|
||||
clean:
|
||||
rm -f *.a *.o
|
||||
@@ -1,8 +0,0 @@
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
|
||||
int main(void) {
|
||||
sleep(2);
|
||||
printf("Hello, world!\n");
|
||||
return 0;
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
CONFIG_LIBC=y
|
||||
CONFIG_LWIP=y
|
||||
Vendored
-44
@@ -661,7 +661,6 @@ debug
|
||||
xenstorepvh
|
||||
xenstore
|
||||
grub
|
||||
c
|
||||
host_os
|
||||
host_vendor
|
||||
host_cpu
|
||||
@@ -712,7 +711,6 @@ SHELL'
|
||||
ac_subst_files=''
|
||||
ac_user_opts='
|
||||
enable_option_checking
|
||||
enable_c_stubdom
|
||||
enable_pv_grub
|
||||
enable_xenstore_stubdom
|
||||
enable_xenstorepvh_stubdom
|
||||
@@ -1360,7 +1358,6 @@ Optional Features:
|
||||
--disable-option-checking ignore unrecognized --enable/--with options
|
||||
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
||||
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
||||
--enable-c-stubdom Build and install c-stubdom (default is DISABLED)
|
||||
--enable-pv-grub Build and install pv-grub (default is DISABLED)
|
||||
--disable-xenstore-stubdom
|
||||
Build and install xenstore-stubdom (default is
|
||||
@@ -2406,47 +2403,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
||||
|
||||
# Enable/disable stub domains
|
||||
|
||||
# Check whether --enable-c-stubdom was given.
|
||||
if test ${enable_c_stubdom+y}
|
||||
then :
|
||||
enableval=$enable_c_stubdom;
|
||||
|
||||
if test "x$enableval" = "xyes"
|
||||
then :
|
||||
|
||||
|
||||
c=y
|
||||
STUBDOM_TARGETS="$STUBDOM_TARGETS c"
|
||||
STUBDOM_BUILD="$STUBDOM_BUILD c-stubdom"
|
||||
STUBDOM_INSTALL="$STUBDOM_INSTALL install-c"
|
||||
STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-c"
|
||||
|
||||
|
||||
else $as_nop
|
||||
|
||||
if test "x$enableval" = "xno"
|
||||
then :
|
||||
|
||||
|
||||
c=n
|
||||
|
||||
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
else $as_nop
|
||||
|
||||
|
||||
c=n
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-pv-grub was given.
|
||||
if test ${enable_pv_grub+y}
|
||||
then :
|
||||
|
||||
@@ -18,7 +18,6 @@ m4_include([../m4/depends.m4])
|
||||
m4_include([../m4/fetcher.m4])
|
||||
|
||||
# Enable/disable stub domains
|
||||
AX_STUBDOM_DEFAULT_DISABLE([c-stubdom], [c])
|
||||
AX_STUBDOM_DEFAULT_DISABLE([pv-grub], [grub])
|
||||
AX_STUBDOM_DEFAULT_ENABLE([xenstore-stubdom], [xenstore])
|
||||
AX_STUBDOM_DEFAULT_ENABLE([xenstorepvh-stubdom], [xenstorepvh])
|
||||
|
||||