stubdom: remove c-stubdom
PATCH 1/1 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 <[email protected]>
--- stubdom/Makefile | 19 ------------------- stubdom/c/Makefile | 13 ------------- stubdom/c/main.c | 8 -------- stubdom/c/minios.cfg | 2 -- stubdom/configure | 44 -------------------------------------------- stubdom/configure.ac | 1 - 6 files changed, 87 deletions(-) delete mode 100644 stubdom/c/Makefile delete mode 100644 stubdom/c/main.c delete mode 100644 stubdom/c/minios.cfg
stubdom/Makefile +0 -19
@@ -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)
stubdom/c/Makefile deleted +0 -13
@@ -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
stubdom/c/main.c deleted +0 -8
@@ -1,8 +0,0 @@ -#include <stdio.h> -#include <unistd.h> - -int main (void ) { -sleep (2 ); -printf ("Hello, world!\n" ); -return 0 ; -}
stubdom/c/minios.cfg deleted +0 -2
@@ -1,2 +0,0 @@ -CONFIG_LIBC=y -CONFIG_LWIP=y
stubdom/configure +0 -44
68 lines not on this page · raw message
stubdom/configure.ac +0 -1
@@ -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])
Signature · 1 line
2.54.0
Quoted 7 lines · Juergen Gross
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 <[email protected]>
I didn't even realise we had one of these...
Acked-by Andrew Cooper <[email protected]>
Quoted 11 lines
--- stubdom/Makefile | 19 ------------------- stubdom/c/Makefile | 13 ------------- stubdom/c/main.c | 8 -------- stubdom/c/minios.cfg | 2 -- stubdom/configure | 44 -------------------------------------------- stubdom/configure.ac | 1 - 6 files changed, 87 deletions(-) delete mode 100644 stubdom/c/Makefile delete mode 100644 stubdom/c/main.c delete mode 100644 stubdom/c/minios.cfg
CHANGELOG.md too.
~Andrew