:p
atchew
Login
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> --- 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 diff --git a/stubdom/Makefile b/stubdom/Makefile index XXXXXXX..XXXXXXX 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -XXX,XX +XXX,XX @@ $(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 ###### @@ -XXX,XX +XXX,XX @@ 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" @@ -XXX,XX +XXX,XX @@ 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" @@ -XXX,XX +XXX,XX @@ 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) diff --git a/stubdom/c/Makefile b/stubdom/c/Makefile deleted file mode 100644 index XXXXXXX..XXXXXXX --- a/stubdom/c/Makefile +++ /dev/null @@ -XXX,XX +XXX,XX @@ -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 diff --git a/stubdom/c/main.c b/stubdom/c/main.c deleted file mode 100644 index XXXXXXX..XXXXXXX --- a/stubdom/c/main.c +++ /dev/null @@ -XXX,XX +XXX,XX @@ -#include <stdio.h> -#include <unistd.h> - -int main(void) { - sleep(2); - printf("Hello, world!\n"); - return 0; -} diff --git a/stubdom/c/minios.cfg b/stubdom/c/minios.cfg deleted file mode 100644 index XXXXXXX..XXXXXXX --- a/stubdom/c/minios.cfg +++ /dev/null @@ -XXX,XX +XXX,XX @@ -CONFIG_LIBC=y -CONFIG_LWIP=y diff --git a/stubdom/configure b/stubdom/configure index XXXXXXX..XXXXXXX 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -XXX,XX +XXX,XX @@ debug xenstorepvh xenstore grub -c host_os host_vendor host_cpu @@ -XXX,XX +XXX,XX @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_c_stubdom enable_pv_grub enable_xenstore_stubdom enable_xenstorepvh_stubdom @@ -XXX,XX +XXX,XX @@ 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 @@ -XXX,XX +XXX,XX @@ 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 : diff --git a/stubdom/configure.ac b/stubdom/configure.ac index XXXXXXX..XXXXXXX 100644 --- a/stubdom/configure.ac +++ b/stubdom/configure.ac @@ -XXX,XX +XXX,XX @@ 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]) -- 2.54.0
Remove the example stunbdom "c-stubdom". Changes in V2: - add patch 2 Juergen Gross (2): stubdom: remove c-stubdom CHANGELOG: add entry for removed c-stubdom CHANGELOG.md | 1 + stubdom/Makefile | 19 ------------------- stubdom/c/Makefile | 13 ------------- stubdom/c/main.c | 8 -------- stubdom/c/minios.cfg | 2 -- stubdom/configure | 44 -------------------------------------------- stubdom/configure.ac | 1 - 7 files changed, 1 insertion(+), 87 deletions(-) delete mode 100644 stubdom/c/Makefile delete mode 100644 stubdom/c/main.c delete mode 100644 stubdom/c/minios.cfg -- 2.54.0
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> --- 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 diff --git a/stubdom/Makefile b/stubdom/Makefile index XXXXXXX..XXXXXXX 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -XXX,XX +XXX,XX @@ $(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 ###### @@ -XXX,XX +XXX,XX @@ 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" @@ -XXX,XX +XXX,XX @@ 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" @@ -XXX,XX +XXX,XX @@ 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) diff --git a/stubdom/c/Makefile b/stubdom/c/Makefile deleted file mode 100644 index XXXXXXX..XXXXXXX --- a/stubdom/c/Makefile +++ /dev/null @@ -XXX,XX +XXX,XX @@ -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 diff --git a/stubdom/c/main.c b/stubdom/c/main.c deleted file mode 100644 index XXXXXXX..XXXXXXX --- a/stubdom/c/main.c +++ /dev/null @@ -XXX,XX +XXX,XX @@ -#include <stdio.h> -#include <unistd.h> - -int main(void) { - sleep(2); - printf("Hello, world!\n"); - return 0; -} diff --git a/stubdom/c/minios.cfg b/stubdom/c/minios.cfg deleted file mode 100644 index XXXXXXX..XXXXXXX --- a/stubdom/c/minios.cfg +++ /dev/null @@ -XXX,XX +XXX,XX @@ -CONFIG_LIBC=y -CONFIG_LWIP=y diff --git a/stubdom/configure b/stubdom/configure index XXXXXXX..XXXXXXX 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -XXX,XX +XXX,XX @@ debug xenstorepvh xenstore grub -c host_os host_vendor host_cpu @@ -XXX,XX +XXX,XX @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_c_stubdom enable_pv_grub enable_xenstore_stubdom enable_xenstorepvh_stubdom @@ -XXX,XX +XXX,XX @@ 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 @@ -XXX,XX +XXX,XX @@ 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 : diff --git a/stubdom/configure.ac b/stubdom/configure.ac index XXXXXXX..XXXXXXX 100644 --- a/stubdom/configure.ac +++ b/stubdom/configure.ac @@ -XXX,XX +XXX,XX @@ 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]) -- 2.54.0
Signed-off-by: Juergen Gross <jgross@suse.com> --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index XXXXXXX..XXXXXXX 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -XXX,XX +XXX,XX @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - The kexec "v1" interface, which was declared obsolete in Xen 4.4 (2013). The only known user was the classic-xen fork of Linux. This does not affect Xen kexec support in the kexec-tools package. + - The example stubdom "c-stubdom" has been removed. ## [4.22.0 UNRELEASED](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD -- 2.54.0