Splitting off stubdom to a different tree
RFC PATCH 1/1 Splitting off stubdom to a different tree
Hi all
This is a very RFC seris for splitting off stubdom from xen.git.
It's RFC because:
1. There are some open questions -- see individual commits.
2. I haven't tested it, everything should compile though.
3. I'm not entirely sure about the arrangement between toolstack and stubdom is correct.
4. COPYING and possible other documents are missing, though I provide a README to tell people how to build.
5. All three build systems (xen, mini-os and stubdom) are still quite entangled. Making completely clean cut require non-trivial amount of effort.
To make every commit bisectable requires quite a bit effort. I don't think it is worth it. I would rather use a merge commit or squash everything into a single commit when people are happy with the changes.
We also need to teach osstest to use the new tree.
Note that I only CC people in this cover letter. Patches will follow and be threaded to this cover leter.
Wei.
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
cover xen: split stubdom from xen.git
git://xenbits.xen.org/people/liuw/xen.git wip.split-stubdom-v1
Wei Liu (6):
config: don't hard-code mini-os path
tools: use "?=" to set XEN_ROOT in Makefile
libxc: use $XEN_ROOT to reference libelf in xen
libxl: generate and install stubdompath.sh
Unhook stubdom from build system
Remove stubdom directory
.gitignore | 1 + Makefile | 55 +- autogen.sh | 3 - config/MiniOS.mk | 2 +- config/Stubdom.mk.in | 39 - configure | 75 - configure.ac | 18 - m4/stubdom.m4 | 96 - stubdom/Makefile | 646 --- stubdom/c/Makefile | 13 - stubdom/c/main.c | 8 - stubdom/c/minios.cfg | 0 stubdom/caml/Makefile | 24 - stubdom/caml/hello.ml | 4 - stubdom/caml/main-caml.c | 42 - stubdom/caml/minios.cfg | 0 stubdom/configure | 4800 -------------------- stubdom/configure.ac | 82 - stubdom/grub.patches/00cvs | 1382 ------ stubdom/grub.patches/10graphics.diff | 2297 ---------- stubdom/grub.patches/11graphics-keyboard.diff | 13 - stubdom/grub.patches/20print_func.diff | 80 - stubdom/grub.patches/30savedefault.diff | 186 - stubdom/grub.patches/40ext3_256byte_inode.diff | 114 - stubdom/grub.patches/50fs_fulldisk.diff | 72 - stubdom/grub.patches/60ext4.diff | 474 -- stubdom/grub.patches/61btrfs.diff | 3510 -------------- stubdom/grub.patches/70compiler_warnings.diff | 45 - stubdom/grub.patches/99minios | 1570 ------- stubdom/grub/Makefile | 86 - stubdom/grub/boot-x86_32.S | 112 - stubdom/grub/boot-x86_64.S | 108 - stubdom/grub/config.h | 12 - stubdom/grub/kexec.c | 439 -- stubdom/grub/mini-os.c | 771 ---- stubdom/grub/mini-os.h | 7 - stubdom/grub/minios.cfg | 3 - stubdom/grub/osdep.h | 30 - stubdom/ioemu-minios.cfg | 3 - stubdom/libpci.config.h | 5 - stubdom/libpci.config.mak | 7 - stubdom/lwip.dhcp_create_request-hwaddr_len.patch | 13 - stubdom/lwip.patch-cvs | 2398 ---------- stubdom/newlib-chk.patch | 155 - .../newlib-stdint-size_max-fix-from-1.17.0.patch | 16 - stubdom/newlib.patch | 727 --- stubdom/ocaml.patch | 19 - stubdom/pciutils.patch | 298 -- stubdom/polarssl.patch | 64 - stubdom/stubdom-dm | 182 - stubdom/tpmemu-0.7.4.patch | 12 - stubdom/vtpm-bufsize.patch | 13 - stubdom/vtpm-cmake-Wextra.patch | 21 - stubdom/vtpm-deepquote-anyloc.patch | 127 - stubdom/vtpm-deepquote.patch | 187 - stubdom/vtpm-locality.patch | 50 - stubdom/vtpm-parent-sign-ek.patch | 196 - stubdom/vtpm/Makefile | 34 - stubdom/vtpm/minios.cfg | 14 - stubdom/vtpm/vtpm.c | 504 -- stubdom/vtpm/vtpm.h | 36 - stubdom/vtpm/vtpm_cmd.c | 302 -- stubdom/vtpm/vtpm_cmd.h | 31 - stubdom/vtpm/vtpm_pcrs.c | 43 - stubdom/vtpm/vtpm_pcrs.h | 53 - stubdom/vtpm/vtpmblk.c | 353 -- stubdom/vtpm/vtpmblk.h | 31 - stubdom/vtpmmgr/Makefile | 36 - stubdom/vtpmmgr/calc.pl | 97 - stubdom/vtpmmgr/common_types.h | 9 - stubdom/vtpmmgr/disk_crypto.c | 231 - stubdom/vtpmmgr/disk_crypto.h | 17 - stubdom/vtpmmgr/disk_format.h | 193 - stubdom/vtpmmgr/disk_io.c | 125 - stubdom/vtpmmgr/disk_io.h | 25 - stubdom/vtpmmgr/disk_read.c | 619 --- stubdom/vtpmmgr/disk_tpm.c | 297 -- stubdom/vtpmmgr/disk_tpm.h | 29 - stubdom/vtpmmgr/disk_write.c | 419 -- stubdom/vtpmmgr/endian_int.h | 72 - stubdom/vtpmmgr/init.c | 790 ---- stubdom/vtpmmgr/log.c | 151 - stubdom/vtpmmgr/log.h | 87 - stubdom/vtpmmgr/manage-vtpmmgr.pl | 160 - stubdom/vtpmmgr/marshal.h | 851 ---- stubdom/vtpmmgr/mgmt_authority.c | 396 -- stubdom/vtpmmgr/mgmt_authority.h | 11 - stubdom/vtpmmgr/minios.cfg | 14 - stubdom/vtpmmgr/tcg.h | 751 --- stubdom/vtpmmgr/tpm.c | 904 ---- stubdom/vtpmmgr/tpm.h | 184 - stubdom/vtpmmgr/tpm2.c | 455 -- stubdom/vtpmmgr/tpm2.h | 104 - stubdom/vtpmmgr/tpm2_marshal.h | 673 --- stubdom/vtpmmgr/tpm2_types.h | 969 ---- stubdom/vtpmmgr/tpmrsa.c | 199 - stubdom/vtpmmgr/tpmrsa.h | 69 - stubdom/vtpmmgr/uuid.h | 50 - stubdom/vtpmmgr/vtpm_cmd_handler.c | 882 ---- stubdom/vtpmmgr/vtpm_disk.c | 237 - stubdom/vtpmmgr/vtpm_disk.h | 233 - stubdom/vtpmmgr/vtpm_manager.h | 470 -- stubdom/vtpmmgr/vtpmmgr.c | 127 - stubdom/vtpmmgr/vtpmmgr.h | 116 - stubdom/xenstore-minios.cfg | 7 - tools/Makefile | 2 +- tools/blktap2/Makefile | 2 +- tools/blktap2/drivers/Makefile | 2 +- tools/blktap2/lvm/Makefile | 2 +- tools/blktap2/vhd/Makefile | 2 +- tools/blktap2/vhd/lib/Makefile | 2 +- tools/console/Makefile | 2 +- tools/console/testsuite/Makefile | 2 +- tools/debugger/gdbsx/Makefile | 2 +- tools/debugger/gdbsx/gx/Makefile | 2 +- tools/debugger/gdbsx/xg/Makefile | 2 +- tools/debugger/kdd/Makefile | 2 +- tools/examples/Makefile | 2 +- tools/firmware/Makefile | 2 +- tools/firmware/etherboot/Makefile | 2 +- tools/firmware/hvmloader/Makefile | 2 +- tools/firmware/hvmloader/acpi/Makefile | 2 +- tools/firmware/rombios/32bit/Makefile | 2 +- tools/firmware/rombios/32bit/tcgbios/Makefile | 2 +- tools/firmware/rombios/Makefile | 2 +- tools/flask/Makefile | 2 +- tools/flask/policy/Makefile | 2 +- tools/flask/utils/Makefile | 2 +- tools/helpers/Makefile | 2 +- tools/hotplug/FreeBSD/Makefile | 2 +- tools/hotplug/Linux/Makefile | 2 +- tools/hotplug/Linux/systemd/Makefile | 2 +- tools/hotplug/Makefile | 2 +- tools/hotplug/NetBSD/Makefile | 2 +- tools/hotplug/common/Makefile | 2 +- tools/include/Makefile | 2 +- tools/include/xen-foreign/Makefile | 2 +- tools/libfsimage/Makefile | 2 +- tools/libfsimage/common/Makefile | 2 +- tools/libfsimage/ext2fs-lib/Makefile | 2 +- tools/libfsimage/ext2fs/Makefile | 2 +- tools/libfsimage/fat/Makefile | 2 +- tools/libfsimage/iso9660/Makefile | 2 +- tools/libfsimage/reiserfs/Makefile | 2 +- tools/libfsimage/ufs/Makefile | 2 +- tools/libfsimage/xfs/Makefile | 2 +- tools/libfsimage/zfs/Makefile | 2 +- tools/libs/Makefile | 2 +- tools/libs/call/Makefile | 2 +- tools/libs/evtchn/Makefile | 2 +- tools/libs/foreignmemory/Makefile | 2 +- tools/libs/gnttab/Makefile | 2 +- tools/libs/toollog/Makefile | 2 +- tools/libvchan/Makefile | 2 +- tools/libxc/Makefile | 6 +- tools/libxl/Makefile | 11 +- tools/memshr/Makefile | 2 +- tools/misc/Makefile | 2 +- tools/ocaml/Makefile | 2 +- tools/ocaml/libs/Makefile | 2 +- tools/ocaml/libs/eventchn/Makefile | 2 +- tools/ocaml/libs/mmap/Makefile | 2 +- tools/ocaml/libs/xb/Makefile | 2 +- tools/ocaml/libs/xc/Makefile | 2 +- tools/ocaml/libs/xentoollog/Makefile | 2 +- tools/ocaml/libs/xl/Makefile | 2 +- tools/ocaml/libs/xs/Makefile | 2 +- tools/ocaml/test/Makefile | 2 +- tools/ocaml/xenstored/Makefile | 2 +- tools/pygrub/Makefile | 2 +- tools/python/Makefile | 2 +- tools/tests/Makefile | 2 +- tools/tests/mce-test/tools/Makefile | 2 +- tools/tests/mem-sharing/Makefile | 2 +- tools/tests/regression/Makefile | 2 +- tools/tests/vhpet/Makefile | 2 +- tools/tests/x86_emulator/Makefile | 2 +- tools/tests/xen-access/Makefile | 2 +- tools/xcutils/Makefile | 2 +- tools/xenbackendd/Makefile | 2 +- tools/xenmon/Makefile | 2 +- tools/xenpaging/Makefile | 2 +- tools/xenpmd/Makefile | 2 +- tools/xenstat/Makefile | 2 +- tools/xenstat/libxenstat/Makefile | 2 +- tools/xenstat/xentop/Makefile | 2 +- tools/xenstore/Makefile | 2 +- tools/xentrace/Makefile | 2 +- 188 files changed, 97 insertions(+), 34254 deletions(-) delete mode 100644 config/Stubdom.mk.in delete mode 100644 m4/stubdom.m4 delete mode 100644 stubdom/Makefile delete mode 100644 stubdom/c/Makefile delete mode 100644 stubdom/c/main.c delete mode 100644 stubdom/c/minios.cfg delete mode 100644 stubdom/caml/Makefile delete mode 100644 stubdom/caml/hello.ml delete mode 100644 stubdom/caml/main-caml.c delete mode 100644 stubdom/caml/minios.cfg delete mode 100755 stubdom/configure delete mode 100644 stubdom/configure.ac delete mode 100644 stubdom/grub.patches/00cvs delete mode 100644 stubdom/grub.patches/10graphics.diff delete mode 100644 stubdom/grub.patches/11graphics-keyboard.diff delete mode 100644 stubdom/grub.patches/20print_func.diff delete mode 100644 stubdom/grub.patches/30savedefault.diff delete mode 100644 stubdom/grub.patches/40ext3_256byte_inode.diff delete mode 100644 stubdom/grub.patches/50fs_fulldisk.diff delete mode 100644 stubdom/grub.patches/60ext4.diff delete mode 100644 stubdom/grub.patches/61btrfs.diff delete mode 100644 stubdom/grub.patches/70compiler_warnings.diff delete mode 100644 stubdom/grub.patches/99minios delete mode 100644 stubdom/grub/Makefile delete mode 100644 stubdom/grub/boot-x86_32.S delete mode 100644 stubdom/grub/boot-x86_64.S delete mode 100644 stubdom/grub/config.h delete mode 100644 stubdom/grub/kexec.c delete mode 100644 stubdom/grub/mini-os.c delete mode 100644 stubdom/grub/mini-os.h delete mode 100644 stubdom/grub/minios.cfg delete mode 100644 stubdom/grub/osdep.h delete mode 100644 stubdom/ioemu-minios.cfg delete mode 100644 stubdom/libpci.config.h delete mode 100644 stubdom/libpci.config.mak delete mode 100644 stubdom/lwip.dhcp_create_request-hwaddr_len.patch delete mode 100644 stubdom/lwip.patch-cvs delete mode 100644 stubdom/newlib-chk.patch delete mode 100644 stubdom/newlib-stdint-size_max-fix-from-1.17.0.patch delete mode 100644 stubdom/newlib.patch delete mode 100644 stubdom/ocaml.patch delete mode 100644 stubdom/pciutils.patch delete mode 100644 stubdom/polarssl.patch delete mode 100644 stubdom/stubdom-dm delete mode 100644 stubdom/tpmemu-0.7.4.patch delete mode 100644 stubdom/vtpm-bufsize.patch delete mode 100644 stubdom/vtpm-cmake-Wextra.patch delete mode 100644 stubdom/vtpm-deepquote-anyloc.patch delete mode 100644 stubdom/vtpm-deepquote.patch delete mode 100644 stubdom/vtpm-locality.patch delete mode 100644 stubdom/vtpm-parent-sign-ek.patch delete mode 100644 stubdom/vtpm/Makefile delete mode 100644 stubdom/vtpm/minios.cfg delete mode 100644 stubdom/vtpm/vtpm.c delete mode 100644 stubdom/vtpm/vtpm.h delete mode 100644 stubdom/vtpm/vtpm_cmd.c delete mode 100644 stubdom/vtpm/vtpm_cmd.h delete mode 100644 stubdom/vtpm/vtpm_pcrs.c delete mode 100644 stubdom/vtpm/vtpm_pcrs.h delete mode 100644 stubdom/vtpm/vtpmblk.c delete mode 100644 stubdom/vtpm/vtpmblk.h delete mode 100644 stubdom/vtpmmgr/Makefile delete mode 100755 stubdom/vtpmmgr/calc.pl delete mode 100644 stubdom/vtpmmgr/common_types.h delete mode 100644 stubdom/vtpmmgr/disk_crypto.c delete mode 100644 stubdom/vtpmmgr/disk_crypto.h delete mode 100644 stubdom/vtpmmgr/disk_format.h delete mode 100644 stubdom/vtpmmgr/disk_io.c delete mode 100644 stubdom/vtpmmgr/disk_io.h delete mode 100644 stubdom/vtpmmgr/disk_read.c delete mode 100644 stubdom/vtpmmgr/disk_tpm.c delete mode 100644 stubdom/vtpmmgr/disk_tpm.h delete mode 100644 stubdom/vtpmmgr/disk_write.c delete mode 100644 stubdom/vtpmmgr/endian_int.h delete mode 100644 stubdom/vtpmmgr/init.c delete mode 100644 stubdom/vtpmmgr/log.c delete mode 100644 stubdom/vtpmmgr/log.h delete mode 100755 stubdom/vtpmmgr/manage-vtpmmgr.pl delete mode 100644 stubdom/vtpmmgr/marshal.h delete mode 100644 stubdom/vtpmmgr/mgmt_authority.c delete mode 100644 stubdom/vtpmmgr/mgmt_authority.h delete mode 100644 stubdom/vtpmmgr/minios.cfg delete mode 100644 stubdom/vtpmmgr/tcg.h delete mode 100644 stubdom/vtpmmgr/tpm.c delete mode 100644 stubdom/vtpmmgr/tpm.h delete mode 100644 stubdom/vtpmmgr/tpm2.c delete mode 100644 stubdom/vtpmmgr/tpm2.h delete mode 100644 stubdom/vtpmmgr/tpm2_marshal.h delete mode 100644 stubdom/vtpmmgr/tpm2_types.h delete mode 100644 stubdom/vtpmmgr/tpmrsa.c delete mode 100644 stubdom/vtpmmgr/tpmrsa.h delete mode 100644 stubdom/vtpmmgr/uuid.h delete mode 100644 stubdom/vtpmmgr/vtpm_cmd_handler.c delete mode 100644 stubdom/vtpmmgr/vtpm_disk.c delete mode 100644 stubdom/vtpmmgr/vtpm_disk.h delete mode 100644 stubdom/vtpmmgr/vtpm_manager.h delete mode 100644 stubdom/vtpmmgr/vtpmmgr.c delete mode 100644 stubdom/vtpmmgr/vtpmmgr.h delete mode 100644 stubdom/xenstore-minios.cfg
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 1/6 config: don't hard-code mini-os path
--- config/MiniOS.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
config/MiniOS.mk +1 -1
@@ -1,5 +1,5 @@ include $(XEN_ROOT)/config/StdGNU.mk -include $(XEN_ROOT)/extras/mini-os/Config.mk +include $(MINI_OS)/Config.mk CFLAGS += $(DEF_CFLAGS) $(ARCH_CFLAGS) CPPFLAGS += $(DEF_CPPFLAGS) $(ARCH_CPPFLAGS) $(extra_incl) ASFLAGS += $(DEF_ASFLAGS) $(ARCH_ASFLAGS)
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 2/6 tools: use "?=" to set XEN_ROOT in Makefile
In reply to Wei LiuThis is because when doing a stubdom build using $(CURDIR) to refer to XEN_ROOT is wrong. Instead, when make enters directories of interest, XEN_ROOT is already. So use "?=" is the right choice.
While in theory I can only fix up the places needed (a few libraries), do this for all Makefiles under tools to keep things consistent.
Done by:
find tools -name Makefile -exec sed -i 's/^\(.*XEN_ROOT\s*\)=\(.*\)$/\1 ?= \2/g' {} \;
--- tools/Makefile | 2 +- tools/blktap2/Makefile | 2 +- tools/blktap2/drivers/Makefile | 2 +- tools/blktap2/lvm/Makefile | 2 +- tools/blktap2/vhd/Makefile | 2 +- tools/blktap2/vhd/lib/Makefile | 2 +- tools/console/Makefile | 2 +- tools/console/testsuite/Makefile | 2 +- tools/debugger/gdbsx/Makefile | 2 +- tools/debugger/gdbsx/gx/Makefile | 2 +- tools/debugger/gdbsx/xg/Makefile | 2 +- tools/debugger/kdd/Makefile | 2 +- tools/examples/Makefile | 2 +- tools/firmware/Makefile | 2 +- tools/firmware/etherboot/Makefile | 2 +- tools/firmware/hvmloader/Makefile | 2 +- tools/firmware/hvmloader/acpi/Makefile | 2 +- tools/firmware/rombios/32bit/Makefile | 2 +- tools/firmware/rombios/32bit/tcgbios/Makefile | 2 +- tools/firmware/rombios/Makefile | 2 +- tools/flask/Makefile | 2 +- tools/flask/policy/Makefile | 2 +- tools/flask/utils/Makefile | 2 +- tools/helpers/Makefile | 2 +- tools/hotplug/FreeBSD/Makefile | 2 +- tools/hotplug/Linux/Makefile | 2 +- tools/hotplug/Linux/systemd/Makefile | 2 +- tools/hotplug/Makefile | 2 +- tools/hotplug/NetBSD/Makefile | 2 +- tools/hotplug/common/Makefile | 2 +- tools/include/Makefile | 2 +- tools/include/xen-foreign/Makefile | 2 +- tools/libfsimage/Makefile | 2 +- tools/libfsimage/common/Makefile | 2 +- tools/libfsimage/ext2fs-lib/Makefile | 2 +- tools/libfsimage/ext2fs/Makefile | 2 +- tools/libfsimage/fat/Makefile | 2 +- tools/libfsimage/iso9660/Makefile | 2 +- tools/libfsimage/reiserfs/Makefile | 2 +- tools/libfsimage/ufs/Makefile | 2 +- tools/libfsimage/xfs/Makefile | 2 +- tools/libfsimage/zfs/Makefile | 2 +- tools/libs/Makefile | 2 +- tools/libs/call/Makefile | 2 +- tools/libs/evtchn/Makefile | 2 +- tools/libs/foreignmemory/Makefile | 2 +- tools/libs/gnttab/Makefile | 2 +- tools/libs/toollog/Makefile | 2 +- tools/libvchan/Makefile | 2 +- tools/libxc/Makefile | 2 +- tools/libxl/Makefile | 2 +- tools/memshr/Makefile | 2 +- tools/misc/Makefile | 2 +- tools/ocaml/Makefile | 2 +- tools/ocaml/libs/Makefile | 2 +- tools/ocaml/libs/eventchn/Makefile | 2 +- tools/ocaml/libs/mmap/Makefile | 2 +- tools/ocaml/libs/xb/Makefile | 2 +- tools/ocaml/libs/xc/Makefile | 2 +- tools/ocaml/libs/xentoollog/Makefile | 2 +- tools/ocaml/libs/xl/Makefile | 2 +- tools/ocaml/libs/xs/Makefile | 2 +- tools/ocaml/test/Makefile | 2 +- tools/ocaml/xenstored/Makefile | 2 +- tools/pygrub/Makefile | 2 +- tools/python/Makefile | 2 +- tools/tests/Makefile | 2 +- tools/tests/mce-test/tools/Makefile | 2 +- tools/tests/mem-sharing/Makefile | 2 +- tools/tests/regression/Makefile | 2 +- tools/tests/vhpet/Makefile | 2 +- tools/tests/x86_emulator/Makefile | 2 +- tools/tests/xen-access/Makefile | 2 +- tools/xcutils/Makefile | 2 +- tools/xenbackendd/Makefile | 2 +- tools/xenmon/Makefile | 2 +- tools/xenpaging/Makefile | 2 +- tools/xenpmd/Makefile | 2 +- tools/xenstat/Makefile | 2 +- tools/xenstat/libxenstat/Makefile | 2 +- tools/xenstat/xentop/Makefile | 2 +- tools/xenstore/Makefile | 2 +- tools/xentrace/Makefile | 2 +- 83 files changed, 83 insertions(+), 83 deletions(-)
tools/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/.. +XEN_ROOT ?= $(CURDIR)/.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y :=
tools/blktap2/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += $(CFLAGS_libxenctrl)
tools/blktap2/drivers/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT=$(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. BLKTAP_ROOT= .. include $(XEN_ROOT)/tools/Rules.mk
tools/blktap2/lvm/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. BLKTAP_ROOT := .. include $(XEN_ROOT)/tools/Rules.mk
tools/blktap2/vhd/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT=$(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. BLKTAP_ROOT := .. include $(XEN_ROOT)/tools/Rules.mk
tools/blktap2/vhd/lib/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT=$(CURDIR)/../../../.. +XEN_ROOT ?= $(CURDIR)/../../../.. BLKTAP_ROOT := ../.. include $(XEN_ROOT)/tools/Rules.mk
tools/console/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT=$(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror
tools/console/testsuite/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk LDFLAGS=-static
tools/debugger/gdbsx/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include ./Rules.mk .PHONY: all
tools/debugger/gdbsx/gx/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../../.. +XEN_ROOT ?= $(CURDIR)/../../../.. include ../Rules.mk GX_OBJS := gx_comm.o gx_main.o gx_utils.o gx_local.o
tools/debugger/gdbsx/xg/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../../.. +XEN_ROOT ?= $(CURDIR)/../../../.. include ../Rules.mk XG_HDRS := xg_public.h
tools/debugger/kdd/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror
tools/examples/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk # Xen configuration dir and configs to go there.
tools/firmware/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk # hvmloader is a 32-bit protected mode binary.
tools/firmware/etherboot/Makefile +1 -1
@@ -1,6 +1,6 @@ override XEN_TARGET_ARCH = x86_32 -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk include Config
tools/firmware/hvmloader/Makefile +1 -1
@@ -17,7 +17,7 @@ # this program; If not, see <http://www.gnu.org/licenses/>. # -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/firmware/Rules.mk SUBDIRS := acpi
tools/firmware/hvmloader/acpi/Makefile +1 -1
@@ -14,7 +14,7 @@ # this program; If not, see <http://www.gnu.org/licenses/>. # -XEN_ROOT = $(CURDIR)/../../../.. +XEN_ROOT ?= $(CURDIR)/../../../.. include $(XEN_ROOT)/tools/firmware/Rules.mk C_SRC = build.c dsdt_anycpu.c dsdt_15cpu.c static_tables.c dsdt_anycpu_qemu_xen.c
tools/firmware/rombios/32bit/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../../.. +XEN_ROOT ?= $(CURDIR)/../../../.. include $(XEN_ROOT)/tools/firmware/Rules.mk TARGET = 32bitbios_flat.h
tools/firmware/rombios/32bit/tcgbios/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../../../.. +XEN_ROOT ?= $(CURDIR)/../../../../.. include $(XEN_ROOT)/tools/firmware/Rules.mk TARGET = tcgbiosext.o
tools/firmware/rombios/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS := 32bit
tools/flask/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y := utils
tools/flask/policy/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT=$(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk ########################################
tools/flask/utils/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT=$(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror
tools/helpers/Makefile +1 -1
@@ -2,7 +2,7 @@ # tools/helpers/Makefile # -XEN_ROOT = $(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk PROGS += xen-init-dom0
tools/hotplug/FreeBSD/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk # Xen script dir and scripts to go there.
tools/hotplug/Linux/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk # Init scripts.
tools/hotplug/Linux/systemd/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../../.. +XEN_ROOT ?= $(CURDIR)/../../../.. include $(XEN_ROOT)/tools/Rules.mk XEN_SYSTEMD_MODULES = xen.conf
tools/hotplug/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y := common
tools/hotplug/NetBSD/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk # Xen script dir and scripts to go there.
tools/hotplug/common/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk HOTPLUGPATH="hotplugpath.sh"
tools/include/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk # Relative to $(XEN_ROOT)/xen/xsm/flask
tools/include/xen-foreign/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT=$(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk ROOT = $(XEN_ROOT)/xen/include/public
tools/libfsimage/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y = common ufs reiserfs iso9660 fat zfs
tools/libfsimage/common/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/libfsimage/Rules.mk MAJOR = 1.0
tools/libfsimage/ext2fs-lib/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. LIB_SRCS-y = ext2fs-lib.c
tools/libfsimage/ext2fs/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. LIB_SRCS-y = fsys_ext2fs.c
tools/libfsimage/fat/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. LIB_SRCS-y = fsys_fat.c
tools/libfsimage/iso9660/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. LIB_SRCS-y = fsys_iso9660.c
tools/libfsimage/reiserfs/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. LIB_SRCS-y = fsys_reiserfs.c
tools/libfsimage/ufs/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. LIB_SRCS-y = fsys_ufs.c
tools/libfsimage/xfs/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. LIB_SRCS-y = fsys_xfs.c
tools/libfsimage/zfs/Makefile +1 -1
@@ -21,7 +21,7 @@ # Use is subject to license terms. # -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. CFLAGS += -DFSYS_ZFS -DFSIMAGE -I$(XEN_ROOT)/tools/libfsimage/zfs LIB_SRCS-y = zfs_lzjb.c zfs_sha256.c zfs_fletcher.c fsi_zfs.c fsys_zfs.c
tools/libs/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y :=
tools/libs/call/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1
tools/libs/evtchn/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1
tools/libs/foreignmemory/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1
tools/libs/gnttab/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1
tools/libs/toollog/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1
tools/libvchan/Makefile +1 -1
@@ -2,7 +2,7 @@ # tools/libvchan/Makefile # -XEN_ROOT = $(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk LIBVCHAN_OBJS = init.o io.o
tools/libxc/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 4.6
tools/libxl/Makefile +1 -1
@@ -2,7 +2,7 @@ # tools/libxl/Makefile # -XEN_ROOT = $(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 4.6
tools/memshr/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk LIBMEMSHR-BUILD := libmemshr.a
tools/misc/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT=$(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror
tools/ocaml/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS := libs
tools/ocaml/libs/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS= \
tools/ocaml/libs/eventchn/Makefile +1 -1
@@ -1,5 +1,5 @@ TOPLEVEL=$(CURDIR)/../.. -XEN_ROOT=$(TOPLEVEL)/../.. +XEN_ROOT ?= $(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make CFLAGS += $(CFLAGS_libxenevtchn) $(CFLAGS_xeninclude)
tools/ocaml/libs/mmap/Makefile +1 -1
@@ -1,5 +1,5 @@ TOPLEVEL=$(CURDIR)/../.. -XEN_ROOT=$(TOPLEVEL)/../.. +XEN_ROOT ?= $(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make OBJS = xenmmap
tools/ocaml/libs/xb/Makefile +1 -1
@@ -1,5 +1,5 @@ TOPLEVEL=$(CURDIR)/../.. -XEN_ROOT=$(TOPLEVEL)/../.. +XEN_ROOT ?= $(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make CFLAGS += -I../mmap
tools/ocaml/libs/xc/Makefile +1 -1
@@ -1,5 +1,5 @@ TOPLEVEL=$(CURDIR)/../.. -XEN_ROOT=$(TOPLEVEL)/../.. +XEN_ROOT ?= $(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make CFLAGS += -I../mmap $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
tools/ocaml/libs/xentoollog/Makefile +1 -1
@@ -1,5 +1,5 @@ TOPLEVEL=$(CURDIR)/../.. -XEN_ROOT=$(TOPLEVEL)/../.. +XEN_ROOT ?= $(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make # allow mixed declarations and code
tools/ocaml/libs/xl/Makefile +1 -1
@@ -1,5 +1,5 @@ TOPLEVEL=$(CURDIR)/../.. -XEN_ROOT=$(TOPLEVEL)/../.. +XEN_ROOT ?= $(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make # ignore unused generated functions and allow mixed declarations and code
tools/ocaml/libs/xs/Makefile +1 -1
@@ -1,5 +1,5 @@ TOPLEVEL=$(CURDIR)/../.. -XEN_ROOT=$(TOPLEVEL)/../.. +XEN_ROOT ?= $(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make OCAMLINCLUDE += -I ../xb/
tools/ocaml/test/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. OCAML_TOPLEVEL = $(CURDIR)/.. include $(OCAML_TOPLEVEL)/common.make
tools/ocaml/xenstored/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. OCAML_TOPLEVEL = $(CURDIR)/.. include $(OCAML_TOPLEVEL)/common.make
tools/pygrub/Makefile +1 -1
@@ -1,5 +1,5 @@ -XEN_ROOT = $(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk PY_CFLAGS = $(CFLAGS) $(PY_NOOPT_CFLAGS) $(APPEND_LDFLAGS)
tools/python/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk .PHONY: all
tools/tests/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += $(CFLAGS_libxenctrl)
tools/tests/mce-test/tools/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT=$(CURDIR)/../../../.. +XEN_ROOT ?= $(CURDIR)/../../../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror
tools/tests/mem-sharing/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT=$(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror
tools/tests/regression/Makefile +1 -1
@@ -5,7 +5,7 @@ # To run this, at least the basic build / development environment must # be installed (gcc, ...) # -XEN_ROOT=$(PWD)/../../.. +XEN_ROOT ?= $(PWD)/../../.. REG_TEST_DIR=$(PWD) PYTHON_VERSIONS=python-2.3 python-2.4 python-2.5 python-2.6 python-3.1
tools/tests/vhpet/Makefile +1 -1
@@ -1,5 +1,5 @@ -XEN_ROOT=$(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk TARGET := test_vhpet
tools/tests/x86_emulator/Makefile +1 -1
@@ -1,5 +1,5 @@ -XEN_ROOT=$(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk TARGET := test_x86_emulator
tools/tests/xen-access/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT=$(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror
tools/xcutils/Makefile +1 -1
@@ -8,7 +8,7 @@ # Copyright (C) 2005 by Christian Limpach # -XEN_ROOT = $(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk PROGRAMS = readnotes lsevtchn
tools/xenbackendd/Makefile +1 -1
@@ -9,7 +9,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -XEN_ROOT=$(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror
tools/xenmon/Makefile +1 -1
@@ -10,7 +10,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -XEN_ROOT=$(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror
tools/xenpaging/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT=$(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk # xenpaging.c and file_ops.c incorrectly use libxc internals
tools/xenpmd/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT=$(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror
tools/xenstat/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT = $(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS :=
tools/xenstat/libxenstat/Makefile +1 -1
@@ -12,7 +12,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Lesser General Public License for more details. -XEN_ROOT=$(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk LDCONFIG=ldconfig
tools/xenstat/xentop/Makefile +1 -1
@@ -10,7 +10,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -XEN_ROOT=$(CURDIR)/../../.. +XEN_ROOT ?= $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk ifneq ($(XENSTAT_XENTOP),y)
tools/xenstore/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT=$(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 3.0
tools/xentrace/Makefile +1 -1
@@ -1,4 +1,4 @@ -XEN_ROOT=$(CURDIR)/../.. +XEN_ROOT ?= $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 3/6 libxc: use $XEN_ROOT to reference libelf in xen
In reply to Wei LiuStubdom needs to compile and link libelf in xen. Using relative path breaks that.
--- tools/libxc/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/libxc/Makefile +2 -2
@@ -68,8 +68,8 @@ else GUEST_SRCS-y += xc_nomigrate.c endif -vpath %.c ../../xen/common/libelf -CFLAGS += -I../../xen/common/libelf +vpath %.c $(XEN_ROOT)/xen/common/libelf +CFLAGS += -I$(XEN_ROOT)/xen/common/libelf ELF_SRCS-y += libelf-tools.c libelf-loader.c ELF_SRCS-y += libelf-dominfo.c
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 4/6 libxl: generate and install stubdompath.sh
In reply to Wei LiuIt's a script used by libxl to launch stubdom. This is split off from stubdom build system.
--- .gitignore | 1 + tools/libxl/Makefile | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-)
.gitignore +1 -0
@@ -170,6 +170,7 @@ tools/libxl/libxlu_cfg_y.output tools/libxl/*.pc tools/libxl/*.pc.in tools/libxl/xl +tools/libxl/stubdompath.sh tools/libxl/testenum tools/libxl/testenum.c tools/libxl/tmp.*
tools/libxl/Makefile +8 -1
@@ -25,6 +25,11 @@ ifeq ($(CONFIG_REMUS_NETBUF),y) LIBXL_LIBS += $(LIBNL3_LIBS) endif +# Script used to launch stubdom +STUBDOMPATH="stubdompath.sh" +genpath-target = $(call buildmakevars2file,$(STUBDOMPATH)) +$(eval $(genpath-target)) + CFLAGS_LIBXL += $(CFLAGS_libxentoollog) CFLAGS_LIBXL += $(CFLAGS_libxenevtchn) CFLAGS_LIBXL += $(CFLAGS_libxenctrl)
@@ -223,7 +228,7 @@ _libxl_type%.h _libxl_type%_json.h _libxl_type%_private.h _libxl_type%.c: libxl_ $(call move-if-changed,__libxl_type$*_json.h,_libxl_type$*_json.h) $(call move-if-changed,__libxl_type$*.c,_libxl_type$*.c) -libxenlight.so: libxenlight.so.$(MAJOR) +libxenlight.so: libxenlight.so.$(MAJOR) $(STUBDOMPATH) $(SYMLINK_SHLIB) $< $@ libxenlight.so.$(MAJOR): libxenlight.so.$(MAJOR).$(MINOR)
@@ -268,6 +273,7 @@ $(PKG_CONFIG): % : %.in Makefile .PHONY: install install: all + $(INSTALL_DATA) $(STUBDOMPATH) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(libdir) $(INSTALL_DIR) $(DESTDIR)$(includedir)
@@ -296,6 +302,7 @@ clean: $(RM) -f testidl.c.new testidl.c *.api-ok $(RM) -f xenlight.pc $(RM) -f xlutil.pc + $(RM) -f $(STUBDOMPATH) distclean: clean $(RM) -f xenlight.pc.in xlutil.pc.in
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 5/6 Unhook stubdom from build system
In reply to Wei Liu---
I've run autogen.sh and commit configure change as well.
--- Makefile | 55 ++---------------------------- autogen.sh | 3 -- config/Stubdom.mk.in | 39 --------------------- configure | 75 ---------------------------------------- configure.ac | 18 ---------- m4/stubdom.m4 | 96 ---------------------------------------------------- 6 files changed, 2 insertions(+), 284 deletions(-) delete mode 100644 config/Stubdom.mk.in delete mode 100644 m4/stubdom.m4
Makefile +2 -53
@@ -7,7 +7,7 @@ all: dist -include config/Toplevel.mk -SUBSYSTEMS?=xen tools stubdom docs +SUBSYSTEMS?=xen tools docs TARGS_DIST=$(patsubst %, dist-%, $(SUBSYSTEMS)) TARGS_INSTALL=$(patsubst %, install-%, $(SUBSYSTEMS)) TARGS_BUILD=$(patsubst %, build-%, $(SUBSYSTEMS))
@@ -17,24 +17,6 @@ TARGS_DISTCLEAN=$(patsubst %, distclean-%, $(SUBSYSTEMS)) export XEN_ROOT=$(CURDIR) include Config.mk -.PHONY: mini-os-dir -mini-os-dir: - if [ ! -d $(XEN_ROOT)/extras/mini-os ]; then \ - GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh \ - $(MINIOS_UPSTREAM_URL) \ - $(MINIOS_UPSTREAM_REVISION) \ - $(XEN_ROOT)/extras/mini-os ; \ - fi - -.PHONY: mini-os-dir-force-update -mini-os-dir-force-update: mini-os-dir - set -ex; \ - if [ "$(MINIOS_UPSTREAM_REVISION)" ]; then \ - cd extras/mini-os-remote; \ - $(GIT) fetch origin; \ - $(GIT) reset --hard $(MINIOS_UPSTREAM_REVISION); \ - fi - export XEN_TARGET_ARCH export DESTDIR
@@ -53,13 +35,6 @@ build-xen: build-tools: $(MAKE) -C tools build -.PHONY: build-stubdom -build-stubdom: mini-os-dir - $(MAKE) -C stubdom build -ifeq (x86_64,$(XEN_TARGET_ARCH)) - XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom pv-grub -endif - .PHONY: build-docs build-docs: $(MAKE) -C docs build
@@ -86,10 +61,9 @@ dist-%: install-% @: # do nothing # Legacy dist targets -.PHONY: xen tools stubdom docs +.PHONY: xen tools docs xen: dist-xen tools: dist-tools -stubdom: dist-stubdom docs: dist-docs .PHONY: install-xen
@@ -100,13 +74,6 @@ install-xen: install-tools: $(MAKE) -C tools install -.PHONY: install-stubdom -install-stubdom: install-tools mini-os-dir - $(MAKE) -C stubdom install -ifeq (x86_64,$(XEN_TARGET_ARCH)) - XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub -endif - .PHONY: tools/firmware/seabios-dir-force-update tools/firmware/seabios-dir-force-update: $(MAKE) -C tools/firmware seabios-dir-force-update
@@ -177,13 +144,6 @@ clean-xen: clean-tools: $(MAKE) -C tools clean -.PHONY: clean-stubdom -clean-stubdom: - $(MAKE) -C stubdom crossclean -ifeq (x86_64,$(XEN_TARGET_ARCH)) - XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom crossclean -endif - .PHONY: clean-docs clean-docs: $(MAKE) -C docs clean
@@ -203,14 +163,6 @@ distclean-xen: distclean-tools: $(MAKE) -C tools distclean -.PHONY: distclean-stubdom -distclean-stubdom: - $(MAKE) -C stubdom distclean -ifeq (x86_64,$(XEN_TARGET_ARCH)) - XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom distclean -endif - rm -rf extras/mini-os extras/mini-os-remote - .PHONY: distclean-docs distclean-docs: $(MAKE) -C docs distclean
@@ -225,7 +177,6 @@ help: @echo ' install - build and install everything' @echo ' install-xen - build and install the Xen hypervisor' @echo ' install-tools - build and install the control tools' - @echo ' install-stubdom - build and install the stubdomain images' @echo ' install-docs - build and install user documentation' @echo '' @echo 'Local dist targets:'
@@ -233,14 +184,12 @@ help: @echo ' world - clean everything then make dist' @echo ' dist-xen - build Xen hypervisor and install into local dist' @echo ' dist-tools - build the tools and install into local dist' - @echo ' dist-stubdom - build the stubdomain images and install into local dist' @echo ' dist-docs - build user documentation and install into local dist' @echo '' @echo 'Building targets:' @echo ' build - build everything' @echo ' build-xen - build Xen hypervisor' @echo ' build-tools - build the tools' - @echo ' build-stubdom - build the stubdomain images' @echo ' build-docs - build user documentation' @echo '' @echo 'Cleaning targets:'
autogen.sh +0 -3
@@ -4,9 +4,6 @@ autoconf -f autoconf -f autoheader ) -( cd stubdom - autoconf -f -) ( cd docs autoconf -f )
config/Stubdom.mk.in deleted +0 -39
@@ -1,39 +0,0 @@ --include $(XEN_ROOT)/config/Paths.mk - -# Path Programs -CMAKE := @CMAKE@ -FETCHER := @FETCHER@ - -# A debug build of stubdom? //FIXME: Someone make this do something -debug := @debug@ - -STUBDOM_TARGETS := @STUBDOM_TARGETS@ -STUBDOM_BUILD := @STUBDOM_BUILD@ -STUBDOM_INSTALL := @STUBDOM_INSTALL@ - -ZLIB_VERSION := @ZLIB_VERSION@ -ZLIB_URL := @ZLIB_URL@ - -LIBPCI_VERSION := @LIBPCI_VERSION@ -LIBPCI_URL := @LIBPCI_URL@ - -NEWLIB_VERSION := @NEWLIB_VERSION@ -NEWLIB_URL := @NEWLIB_URL@ - -LWIP_VERSION := @LWIP_VERSION@ -LWIP_URL := @LWIP_URL@ - -GRUB_VERSION := @GRUB_VERSION@ -GRUB_URL := @GRUB_URL@ - -OCAML_VERSION := @OCAML_VERSION@ -OCAML_URL := @OCAML_URL@ - -GMP_VERSION := @GMP_VERSION@ -GMP_URL := @GMP_URL@ - -POLARSSL_VERSION := @POLARSSL_VERSION@ -POLARSSL_URL := @POLARSSL_URL@ - -TPMEMU_VERSION := @TPMEMU_VERSION@ -TPMEMU_URL := @TPMEMU_URL@
configure +0 -75
111 lines not on this page · raw message
configure.ac +0 -18
@@ -18,26 +18,8 @@ m4_include([m4/paths.m4]) AX_XEN_EXPAND_CONFIG() -dnl mini-os is only ported to certain platforms -case "$host_cpu" in - i[[3456]]86|x86_64) - arch_enable_stubdom=y - ;; - *) - arch_enable_stubdom=n - ;; -esac - -dnl Stubdomains need some work in order to compile on FreeBSD -case "$host_os" in - freebsd*) - arch_enable_stubdom=n - ;; -esac - AX_SUBSYSTEM_DEFAULT_ENABLE([xen]) AX_SUBSYSTEM_DEFAULT_ENABLE([tools]) -AX_SUBSYSTEM_CONDITIONAL([stubdom], $arch_enable_stubdom) AX_SUBSYSTEM_DEFAULT_ENABLE([docs]) AX_SUBSYSTEM_FINISH
m4/stubdom.m4 deleted +0 -96
96 lines not on this page · raw message
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 6/6 Remove stubdom directory
In reply to Wei Liu[...]
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
cover mini-os: split stubdom from xen.git
In reply to Wei Liugit://xenbits.xen.org/people/liuw/mini-os.git wip.split-stubdom-v1
Wei Liu (2):
Config.mk: use MINI_OS if specified
Makefile: introduce STUBDOM_ROOT
Config.mk | 4 ++++ Makefile | 13 +++++++------ 2 files changed, 11 insertions(+), 6 deletions(-)
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 1/2 Config.mk: use MINI_OS if specified
--- Config.mk | 4 ++++ 1 file changed, 4 insertions(+)
Config.mk +4 -0
@@ -31,6 +31,10 @@ MINI-OS_ROOT=$(XEN_ROOT)/extras/mini-os else MINI-OS_ROOT=$(TOPLEVEL_DIR) endif +# It is also possible that mini-os is specified directly. +ifneq ($(MINI_OS),) +MINI-OS_ROOT=$(MINI_OS) +endif export MINI-OS_ROOT ifneq ($(XEN_TARGET_ARCH),)
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 2/2 Makefile: introduce STUBDOM_ROOT
In reply to Wei Liu--- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
Makefile +7 -6
@@ -163,14 +163,15 @@ endif OBJS := $(filter-out $(OBJ_DIR)/lwip%.o $(LWO), $(OBJS)) +STUBDOM_ROOT ?= $(XEN_ROOT)/stubdom ifeq ($(libc),y) ifeq ($(CONFIG_XC),y) -APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/toollog -whole-archive -lxentoollog -no-whole-archive -APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/evtchn -whole-archive -lxenevtchn -no-whole-archive -APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/gnttab -whole-archive -lxengnttab -no-whole-archive -APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/call -whole-archive -lxencall -no-whole-archive -APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/foreignmemory -whole-archive -lxenforeignmemory -no-whole-archive -APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libxc-$(MINIOS_TARGET_ARCH) -whole-archive -lxenguest -lxenctrl -no-whole-archive +APP_LDLIBS += -L$(STUBDOM_ROOT)/libs-$(MINIOS_TARGET_ARCH)/toollog -whole-archive -lxentoollog -no-whole-archive +APP_LDLIBS += -L$(STUBDOM_ROOT)/libs-$(MINIOS_TARGET_ARCH)/evtchn -whole-archive -lxenevtchn -no-whole-archive +APP_LDLIBS += -L$(STUBDOM_ROOT)/libs-$(MINIOS_TARGET_ARCH)/gnttab -whole-archive -lxengnttab -no-whole-archive +APP_LDLIBS += -L$(STUBDOM_ROOT)/libs-$(MINIOS_TARGET_ARCH)/call -whole-archive -lxencall -no-whole-archive +APP_LDLIBS += -L$(STUBDOM_ROOT)/libs-$(MINIOS_TARGET_ARCH)/foreignmemory -whole-archive -lxenforeignmemory -no-whole-archive +APP_LDLIBS += -L$(STUBDOM_ROOT)/libxc-$(MINIOS_TARGET_ARCH) -whole-archive -lxenguest -lxenctrl -no-whole-archive endif APP_LDLIBS += -lpci APP_LDLIBS += -lz
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
cover stubdom: split stubdom from xen.git
In reply to Wei LiuThe base tree is prepared by:
#!/bin/sh
set -ex
git filter-branch --tag-name-filter cat \
--subdirectory-filter stubdom/ -- --all
# There is already a tag name 4.3.0-rc2 which points to the same commit.
git tag -d xen-4.3.0-rc2
# Add xen- prefix to all tags
for t in `git tag`; do git tag "xen-$t" "$t"; git tag -d "$t" ; done
git gc --aggressiveThese are the patches built on top of the base tree.
The branch can be found at
git://xenbits.xen.org/people/liuw/stubdom.git wip.split-stubdom-v1
Wei.
Wei Liu (14):
Import more files from xen.git
Makefile: introduce dist target
Add a gitignore
Makefile: require XEN_ROOT and MINI_OS to be defined
Makefile: replace MINI_OS with MINIOS_ROOT
pciutils: don't use hard-coded XEN_ROOT
grub: don't use hard-coded XEN_ROOT
Makefile: export STUBDOM_ROOT
Makefile: delete STUBDOMPATH target
Makefile: require QEMU_ROOT to be defined
Makefile: always include Config.mk from xen source tree
Makefile: delete ioemu directory in clean target
Makefile: fix removing *.mk
Add README file
.gitignore | 74 +++ Makefile | 95 ++- README | 16 + autogen.sh | 2 + config.guess | 1530 +++++++++++++++++++++++++++++++++++++++++++ config.sub | 1782 ++++++++++++++++++++++++++++++++++++++++++++++++++ config/Paths.mk.in | 56 ++ config/Stubdom.mk.in | 39 ++ configure | 189 +++++- configure.ac | 19 +- grub/Makefile | 1 - install.sh | 35 + m4/depends.m4 | 15 + m4/features.m4 | 21 + m4/fetcher.m4 | 14 + m4/path_or_fail.m4 | 6 + m4/paths.m4 | 137 ++++ m4/stubdom.m4 | 96 +++ pciutils.patch | 3 +- 19 files changed, 4057 insertions(+), 73 deletions(-) create mode 100644 .gitignore create mode 100644 README create mode 100755 autogen.sh create mode 100755 config.guess create mode 100755 config.sub create mode 100644 config/Paths.mk.in create mode 100644 config/Stubdom.mk.in create mode 100644 install.sh create mode 100644 m4/depends.m4 create mode 100644 m4/features.m4 create mode 100644 m4/fetcher.m4 create mode 100644 m4/path_or_fail.m4 create mode 100644 m4/paths.m4 create mode 100644 m4/stubdom.m4
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 1/14 Import more files from xen.git
Imported from top level build system in xen.git. Modify them to work with stubdom build environment.
---
I've committed configure changes in this patch, feel free to drop that and regenerate while committing.
Not sure what the version number of stubdom.git should be. Previously it used the Xen version. Now I just define it as 1.0. This needs to be sorted out.
The package name is left as "xen" because it is used to generate installation path.
--- Makefile | 4 +- autogen.sh | 2 + config.guess | 1530 +++++++++++++++++++++++++++++++++++++++++++ config.sub | 1782 ++++++++++++++++++++++++++++++++++++++++++++++++++ config/Paths.mk.in | 56 ++ config/Stubdom.mk.in | 39 ++ configure | 189 +++++- configure.ac | 19 +- install.sh | 35 + m4/depends.m4 | 15 + m4/features.m4 | 21 + m4/fetcher.m4 | 14 + m4/path_or_fail.m4 | 6 + m4/paths.m4 | 137 ++++ m4/stubdom.m4 | 96 +++ 15 files changed, 3931 insertions(+), 14 deletions(-) create mode 100755 autogen.sh create mode 100755 config.guess create mode 100755 config.sub create mode 100644 config/Paths.mk.in create mode 100644 config/Stubdom.mk.in create mode 100644 install.sh create mode 100644 m4/depends.m4 create mode 100644 m4/features.m4 create mode 100644 m4/fetcher.m4 create mode 100644 m4/path_or_fail.m4 create mode 100644 m4/paths.m4 create mode 100644 m4/stubdom.m4
Makefile +3 -1
@@ -4,6 +4,8 @@ MINI_OS = $(XEN_ROOT)/extras/mini-os export XEN_ROOT export XEN_OS=MiniOS +export DISTDIR=$(STUBDOM_ROOT)/dist + export stubdom=y export debug=y
@@ -14,7 +16,7 @@ ifeq (,$(findstring clean,$(MAKECMDGOALS))) include $(XEN_ROOT)/Config.mk endif --include $(XEN_ROOT)/config/Stubdom.mk +-include config/Stubdom.mk GNU_TARGET_ARCH:=$(XEN_TARGET_ARCH) ifeq ($(XEN_TARGET_ARCH),x86_32)
autogen.sh new file +2 -0
@@ -0,0 +1,2 @@ +#!/bin/sh -e +autoconf -f
config.guess new file +1530 -0
1,530 lines not on this page · raw message
config.sub new file +1782 -0
1,452 lines not on this page · raw message
config/Paths.mk.in new file +56 -0
56 lines not on this page · raw message
configure +184 -5
189 lines not on this page · raw message
m4/paths.m4 new file +137 -0
137 lines not on this page · raw message
m4/stubdom.m4 new file +96 -0
96 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
Part of the diff is not shown here. View the raw message.
RFC PATCH 2/14 Makefile: introduce dist target
In reply to Wei Liu--- Makefile | 4 ++++ 1 file changed, 4 insertions(+)
Makefile +4 -0
@@ -642,6 +642,10 @@ downloadclean: patchclean distclean: downloadclean rm -rf config.log config.status config.cache autom4te.cache ../config/Stubdom.mk +.PHONY: dist +dist: DESTDIR=$(DISTDIR)/install +dist: install + ifeq (,$(findstring clean,$(MAKECMDGOALS))) $(XEN_ROOT)/config/Stubdom.mk: $(error You have to run ./configure before building or installing stubdom)
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 3/14 Add a gitignore
In reply to Wei Liu--- .gitignore | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 .gitignore
.gitignore new file +74 -0
@@ -0,0 +1,74 @@ +.hg +*.orig +*~ +*.swp +*.o +*.d +*.opic +*.a +*.so +*.so.[0-9]* +*.bin +*.bak +*.tmp +*.spot +*.spit +*.gcno +*.gcda +*.py[ocd] +TAGS +GTAGS +GRTAGS +GPATH +GSYMS +tags +cscope.files +cscope.in.out +cscope.out +cscope.po.out +.config + +dist +*.tar.gz + +autom4te.cache/ +config.log +config.status +config.cache +config/Toplevel.mk +config/Paths.mk +config/Stubdom.mk + +build-* +dist/* +install/* +cross-root-* +gcc-* +gmp-* +grub-* +include +ioemu +ioemu/ +libs-* +libxc-* +libxencall-* +libxenevtchn-* +libxenforeignmemory-* +libxengnttab-* +libxentoollog-* +lwip-* +lwip/ +mini-os-* +mk-headers-* +newlib-1.* +newlib-x86* +ocaml-* +pciutils-* +polarssl-* +stubdompath.sh +tpm_emulator-* +vtpm/vtpm_manager.h +xenstore +zlib-* + +.git
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 4/14 Makefile: require XEN_ROOT and MINI_OS to be defined
In reply to Wei Liu--- Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
Makefile +7 -5
@@ -1,5 +1,10 @@ -XEN_ROOT = $(CURDIR)/.. -MINI_OS = $(XEN_ROOT)/extras/mini-os +ifeq (,$(XEN_ROOT)) + $(error Please define XEN_ROOT environment variable) +endif + +ifeq (,$(MINI_OS)) + $(error Please define MINI_OS environment variable) +endif export XEN_ROOT export XEN_OS=MiniOS
@@ -10,9 +15,6 @@ export stubdom=y export debug=y ifeq (,$(findstring clean,$(MAKECMDGOALS))) - ifeq ($(wildcard $(MINI_OS)/Config.mk),) - $(error Please run `make mini-os-dir' in top-level directory) - endif include $(XEN_ROOT)/Config.mk endif
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 5/14 Makefile: replace MINI_OS with MINIOS_ROOT
In reply to Wei LiuThis is more in line with how other repositories are named.
Also export MINI_OS with the same value to be backward compatible.
--- Makefile | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
Makefile +15 -14
@@ -2,10 +2,11 @@ ifeq (,$(XEN_ROOT)) $(error Please define XEN_ROOT environment variable) endif -ifeq (,$(MINI_OS)) - $(error Please define MINI_OS environment variable) +ifeq (,$(MINIOS_ROOT)) + $(error Please define MINIOS_ROOT environment variable) endif +export MINI_OS=$(MINIOS_ROOT) export XEN_ROOT export XEN_OS=MiniOS
@@ -48,7 +49,7 @@ $(call cc-options-add,TARGET_CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) GCC_INSTALL = $(shell LANG=C gcc -print-search-dirs | sed -n -e 's/install: \(.*\)/\1/p') TARGET_CPPFLAGS += -U __linux__ -U __FreeBSD__ -U __sun__ TARGET_CPPFLAGS += -nostdinc -TARGET_CPPFLAGS += -isystem $(MINI_OS)/include/posix +TARGET_CPPFLAGS += -isystem $(MINIOS_ROOT)/include/posix TARGET_CPPFLAGS += -isystem $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include TARGET_CPPFLAGS += -isystem $(GCC_INSTALL)include TARGET_CPPFLAGS += -isystem $(CURDIR)/lwip-$(XEN_TARGET_ARCH)/src/include
@@ -140,7 +141,7 @@ $(LIBPCI_STAMPFILE): pciutils-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE) $(ZLIB_STAM chmod u+w lib/config.h && \ echo '#define PCILIB_VERSION "$(LIBPCI_VERSION)"' >> lib/config.h && \ ln -sf ../../libpci.config.mak lib/config.mk && \ - $(MAKE) DESTDIR= CC="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -I$(call realpath,$(MINI_OS)/include)" lib/libpci.a && \ + $(MAKE) DESTDIR= CC="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -I$(call realpath,$(MINIOS_ROOT)/include)" lib/libpci.a && \ $(INSTALL_DATA) lib/libpci.a $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib/ && \ $(INSTALL_DIR) $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include/pci && \ $(INSTALL_DATA) lib/config.h lib/header.h lib/pci.h lib/types.h $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include/pci/ \
@@ -202,7 +203,7 @@ POLARSSL_STAMPFILE=$(CROSS_ROOT)/$(GNU_TARGET_ARCH)-xen-elf/lib/libpolarssl.a cross-polarssl: $(POLARSSL_STAMPFILE) $(POLARSSL_STAMPFILE): polarssl-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE) lwip-$(XEN_TARGET_ARCH) ( cd $</library && \ - make CC="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -I $(realpath $(MINI_OS)/include)" && \ + make CC="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -I $(realpath $(MINIOS_ROOT)/include)" && \ mkdir -p $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include && \ cp -r ../include/* $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include && \ mkdir -p $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib && \
@@ -359,13 +360,13 @@ mk-headers-$(XEN_TARGET_ARCH): $(IOEMU_LINKFARM_TARGET) ln -sf $(XEN_ROOT)/tools/xenstore/*.h . && \ ln -sf $(XEN_ROOT)/tools/xenstore/include/*.h include/ && \ ln -sf $(XEN_ROOT)/tools/xenstore/Makefile . ) - $(MAKE) DESTDIR= -C $(MINI_OS) links + $(MAKE) DESTDIR= -C $(MINIOS_ROOT) links touch mk-headers-$(XEN_TARGET_ARCH) TARGETS_MINIOS=$(addprefix mini-os-$(XEN_TARGET_ARCH)-,$(TARGETS)) $(TARGETS_MINIOS): mini-os-%: [ -d $@ ] || \ - for i in $$(cd $(MINI_OS) ; find . -type d) ; do \ + for i in $$(cd $(MINIOS_ROOT) ; find . -type d) ; do \ mkdir -p $@/$$i ; \ done
@@ -507,31 +508,31 @@ xenstore: $(CROSS_ROOT) .PHONY: ioemu-stubdom ioemu-stubdom: APP_OBJS=$(CURDIR)/ioemu/i386-stubdom/qemu.a $(CURDIR)/ioemu/i386-stubdom/libqemu.a $(CURDIR)/ioemu/libqemu_common.a ioemu-stubdom: mini-os-$(XEN_TARGET_ARCH)-ioemu lwip-$(XEN_TARGET_ARCH) libxc ioemu - DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/ioemu-minios.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) APP_OBJS="$(APP_OBJS)" + DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/ioemu-minios.cfg" $(MAKE) DESTDIR= -C $(MINIOS_ROOT) OBJ_DIR=$(CURDIR)/$< LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) APP_OBJS="$(APP_OBJS)" .PHONY: caml-stubdom caml-stubdom: mini-os-$(XEN_TARGET_ARCH)-caml lwip-$(XEN_TARGET_ARCH) libxc cross-ocaml caml - DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/caml/minios.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) APP_OBJS="$(CURDIR)/caml/main-caml.o $(CURDIR)/caml/caml.o $(CAMLLIB)/libasmrun.a" + DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/caml/minios.cfg" $(MAKE) DESTDIR= -C $(MINIOS_ROOT) OBJ_DIR=$(CURDIR)/$< LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) APP_OBJS="$(CURDIR)/caml/main-caml.o $(CURDIR)/caml/caml.o $(CAMLLIB)/libasmrun.a" .PHONY: c-stubdom c-stubdom: mini-os-$(XEN_TARGET_ARCH)-c lwip-$(XEN_TARGET_ARCH) libxc 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 + DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/c/minios.cfg" $(MAKE) DESTDIR= -C $(MINIOS_ROOT) 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" + DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/vtpm/minios.cfg" $(MAKE) -C $(MINIOS_ROOT) OBJ_DIR=$(CURDIR)/$< APP_OBJS="$(CURDIR)/vtpm/vtpm.a" APP_LDLIBS="-ltpm -ltpm_crypto -lgmp -lpolarssl" .PHONY: vtpmmgr-stubdom vtpmmgr-stubdom: mini-os-$(XEN_TARGET_ARCH)-vtpmmgr vtpmmgr - DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/vtpmmgr/minios.cfg" $(MAKE) -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS="$(CURDIR)/vtpmmgr/vtpmmgr.a" APP_LDLIBS="-lm -lpolarssl" + DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/vtpmmgr/minios.cfg" $(MAKE) -C $(MINIOS_ROOT) OBJ_DIR=$(CURDIR)/$< APP_OBJS="$(CURDIR)/vtpmmgr/vtpmmgr.a" APP_LDLIBS="-lm -lpolarssl" .PHONY: pv-grub pv-grub: mini-os-$(XEN_TARGET_ARCH)-grub libxc grub - DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/grub/minios.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/grub-$(XEN_TARGET_ARCH)/main.a + DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/grub/minios.cfg" $(MAKE) DESTDIR= -C $(MINIOS_ROOT) OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/grub-$(XEN_TARGET_ARCH)/main.a .PHONY: xenstore-stubdom xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore libxc xenstore - DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/xenstore-minios.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/xenstore/xenstored.a + DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/xenstore-minios.cfg" $(MAKE) DESTDIR= -C $(MINIOS_ROOT) OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/xenstore/xenstored.a ######### # install
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 6/14 pciutils: don't use hard-coded XEN_ROOT
In reply to Wei Liu--- pciutils.patch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
pciutils.patch +1 -2
@@ -33,12 +33,11 @@ diff -urN pciutils-2.2.9.orig/lib/access.c pciutils-2.2.9/lib/access.c + pm_dump, pm_linux_sysfs, pm_minios; --- pciutils-2.2.9.orig/lib/Makefile 2007-10-19 13:41:34.000000000 +0100 +++ pciutils-2.2.9/lib/Makefile 2008-07-01 12:13:14.400525000 +0100 -@@ -46,6 +46,12 @@ +@@ -46,6 +46,11 @@ PCILIB=libpciutils.a endif +ifdef PCI_OS_MINIOS -+XEN_ROOT=$(CURDIR)/../../.. +include $(XEN_ROOT)/Config.mk +OBJS += minios.o +endif
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 7/14 grub: don't use hard-coded XEN_ROOT
In reply to Wei Liu--- grub/Makefile | 1 - 1 file changed, 1 deletion(-)
grub/Makefile +0 -1
@@ -1,4 +1,3 @@ -XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/Config.mk vpath %.c ../grub-upstream
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 8/14 Makefile: export STUBDOM_ROOT
In reply to Wei LiuMini-os needs to know where the libraries are when linking. Export a new environment variable called STBUDOM_ROOT so that mini-os knows the location of libraries.
---
This needs to be used in conjunction with the patch to mini-os.git.
--- Makefile | 1 + 1 file changed, 1 insertion(+)
Makefile +1 -0
@@ -7,6 +7,7 @@ ifeq (,$(MINIOS_ROOT)) endif export MINI_OS=$(MINIOS_ROOT) +export STUBDOM_ROOT=$(CURDIR) export XEN_ROOT export XEN_OS=MiniOS
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 9/14 Makefile: delete STUBDOMPATH target
In reply to Wei LiuIt is used to generate a script used by toolstack to launch stubdom. It relies paths generated when building Xen, so it should be part of xen.git.
--- Makefile | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
Makefile +2 -12
@@ -62,16 +62,10 @@ TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib TARGETS=$(STUBDOM_TARGETS) -STUBDOMPATH="stubdompath.sh" -genpath-target = $(call buildmakevars2file,$(STUBDOMPATH)) -$(eval $(genpath-target)) - .PHONY: all all: build ifeq ($(STUBDOM_SUPPORTED),1) -build: $(STUBDOMPATH) $(STUBDOM_BUILD) -else -build: $(STUBDOMPATH) +build: $(STUBDOM_BUILD) endif ##############
@@ -540,15 +534,12 @@ xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore libxc xenstore ######### ifeq ($(STUBDOM_SUPPORTED),1) -install: $(STUBDOMPATH) $(STUBDOM_INSTALL) -else -install: $(STUBDOMPATH) +install: $(STUBDOM_INSTALL) endif install-ioemu: ioemu-stubdom $(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC_BIN)" $(INSTALL_PROG) stubdom-dm "$(DESTDIR)$(LIBEXEC_BIN)" - $(INSTALL_DATA) stubdompath.sh "$(DESTDIR)$(LIBEXEC_BIN)" $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz"
@@ -591,7 +582,6 @@ clean: $(MAKE) -C vtpm clean $(MAKE) -C vtpmmgr clean rm -fr grub-$(XEN_TARGET_ARCH) - rm -f $(STUBDOMPATH) [ ! -e libs-$(XEN_TARGET_ARCH)/toollog/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/toollog clean [ ! -e libs-$(XEN_TARGET_ARCH)/evtchn/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/evtchn clean [ ! -e libs-$(XEN_TARGET_ARCH)/gnttab/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/gnttab clean
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
Re: [PATCH RFC v1 09/14] Makefile: delete STUBDOMPATH target
Makefile TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib · line 68
Quoted 2 lines · Wei Liu
Makefile +1
-1-build: $(STUBDOMPATH) +build: $(STUBDOM_BUILD)
Wei,
in original code, in stubdom/vtpm and stubdom/vtpmmgr, the code style is inconsistent and ugly. Do you have any plan to fix them? :)
btw, if the others(or me) want to fix the code style, how to fix it? send out a big patch? Any suggestions? Thanks.:)
Quan
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Re: [PATCH RFC v1 09/14] Makefile: delete STUBDOMPATH target
Quoted 8 lines · Quan
Makefile TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib · line 68
Quoted 2 lines · Wei Liu
Makefile +1
-1-build: $(STUBDOMPATH) +build: $(STUBDOM_BUILD)Wei,
in original code, in stubdom/vtpm and stubdom/vtpmmgr, the code style is inconsistent and ugly. Do you have any plan to fix them? :)
No, I don't.
Quoted 3 lines
btw, if the others(or me) want to fix the code style, how to fix it? send out a big patch? Any suggestions? Thanks.:)
I personally prefer small patches in a series, but I don't object to having large patch(es) either. At the end of the day, I think Daniel's opinion matters most. After a plan is agreed upon, you can then provide a branch for us to pull in. Note that upstream don't test vtpm in any fashion so you do need to run your tests.
The only thing that matters to me is that when you will do it -- you will need to patch a different tree after I split off stubdom. In order to minimise the fuss one of us will need to wait for the other.
Wei.
Quoted 5 lines
Quan
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Re: [PATCH RFC v1 09/14] Makefile: delete STUBDOMPATH target
Quoted 10 lines · Wei Liu
Quoted 7 lines · Quan
Makefile TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib · line 68
Quoted 2 lines · Wei Liu
Makefile +1
-1-build: $(STUBDOMPATH) +build: $(STUBDOM_BUILD)Wei,
in original code, in stubdom/vtpm and stubdom/vtpmmgr, the code style is inconsistent and ugly.I personally prefer small patches in a series, but I don't object to having large patch(es) either.
ok. I think so too. It may be one file per patch.
Quoted 2 lines
At the end of the day, I think Daniel's opinion matters most. After a plan is agreed upon, you can then provide a branch for us to pull in.
I think I am not authorized to branch, could you provide a branch and tell me how to commit to that branch? Sorry, I am unfamiliar with the upstream process.
Quoted 3 lines
Note
that upstream don't test vtpm in any fashion so you do need to run your tests.
I will test it. I think I hope Daniel could help my patches.
btw, I have made a quick patch to fix the seal/unseal issue. I will send out later.
Quoted 4 lines
The only thing that matters to me is that when you will do it -- you will need to patch a different tree after I split off stubdom. In order to minimise the fuss one of us will need to wait for the other.
Once you have done, please let me know.
Quan
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Re: [PATCH RFC v1 09/14] Makefile: delete STUBDOMPATH target
Quoted 12 lines · Quan
Quoted 10 lines · Wei Liu
Quoted 7 lines · Quan
Makefile TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib · line 68
Quoted 2 lines · Wei Liu
Makefile +1
-1-build: $(STUBDOMPATH) +build: $(STUBDOM_BUILD)Wei,
in original code, in stubdom/vtpm and stubdom/vtpmmgr, the code style is inconsistent and ugly.I personally prefer small patches in a series, but I don't object to having large patch(es) either.
Quoted 9 lines
ok. I think so too. It may be one file per patch.
Quoted 2 lines
At the end of the day, I think Daniel's opinion matters most. After a plan is agreed upon, you can then provide a branch for us to pull in.
I think I am not authorized to branch, could you provide a branch and tell me how to commit to that branch? Sorry, I am unfamiliar with the upstream process.
Oh, you don't need to branch on the main tree (xen.git or future stubdom.git). You can just do the following:
$ git clone xen.git # or stubdom.git $ cd xen.git # or stubdom.git $ git branch wip.vtpm-coding-style-fix-v1 ... do work, commit as you go alone ... $ git push $some_public_remote wip.vtpm-coding-style-fix-v1 ... post your patch series on xen-devel, along with the git repository and branch
When your patches are all acked by Daniel, you can then fold all the tags into your own branch (wip.vtpm-coding-style-fix-v$X-acked) and prod committers to pull from that branch.
Quoted 11 lines
Quoted 3 lines
Note
that upstream don't test vtpm in any fashion so you do need to run your tests.I will test it. I think I hope Daniel could help my patches.
btw, I have made a quick patch to fix the seal/unseal issue. I will send out later.Quoted 4 lines
The only thing that matters to me is that when you will do it -- you will need to patch a different tree after I split off stubdom. In order to minimise the fuss one of us will need to wait for the other.
Once you have done, please let me know.
OK, I will try to sort it out within April. Feel free to ping me if I drop the ball.
Wei.
Quoted 1 line
Quan
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Re: [PATCH RFC v1 09/14] Makefile: delete STUBDOMPATH target
Quoted 39 lines
-----Original Message-----
From: Xen-devel [mailto:[email protected]] On Behalf Of Wei Liu
Sent: Friday, April 01, 2016 6:03 PM
To: Xu, Quan
Cc: Xen-devel; Daniel De Graaf; Wei Liu
Subject: Re: [Xen-devel] [PATCH RFC v1 09/14]Makefile: delete STUBDOMPATH targetQuoted 13 lines · Quan
Quoted 11 lines · Wei Liu
Quoted 7 lines · Quan
Makefile TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib · line 68
Quoted 2 lines · Wei Liu
Makefile +1
-1-build: $(STUBDOMPATH) +build: $(STUBDOM_BUILD)Wei,
in original code, in stubdom/vtpm and stubdom/vtpmmgr, the code style is inconsistent and ugly.I personally prefer small patches in a series, but I don't object to having large
patch(es) either.Quoted 7 lines
ok. I think so too. It may be one file per patch.
Quoted 2 lines
At the end of the day, I think Daniel's opinion matters most. After a plan is agreed upon, you can then provide a branch for us to pull in.
I think I am not authorized to branch, could you provide a branch and tell me
how to commit to that branch?
Quoted 2 lines
Sorry, I am unfamiliar with the upstream process.
Oh, you don't need to branch on the main tree (xen.git or future stubdom.git). You can just do the following:
Quoted 8 lines
$ git clone xen.git # or stubdom.git $ cd xen.git # or stubdom.git $ git branch wip.vtpm-coding-style-fix-v1 ... do work, commit as you go alone ... $ git push $some_public_remote wip.vtpm-coding-style-fix-v1 ... post your patch series on xen-devel, along with the git repository and branch
Wei,
When I tried to follow above steps, I got:
error: Cannot access URL http://xenbits.xen.org/git-http/xen.git/, return code 22
fatal: git-http-push failed
could you help me?
Quan
Quoted 20 lines
When your patches are all acked by Daniel, you can then fold all the tags into your own branch (wip.vtpm-coding-style-fix-v$X-acked)
and prod committers to pull from that branch.Quoted 2 lines
Quoted 2 lines
Note
that upstream don't test vtpm in any fashion so you do need to run yourtests.
Quoted 3 lines
Quoted 1 line
I will test it. I think I hope Daniel could help my patches. btw, I have made a quick patch to fix the seal/unseal issue. I will send out
later.
Quoted 6 lines
Quoted 5 lines
The only thing that matters to me is that when you will do it -- you will need to patch a different tree after I split off stubdom. In order to minimise the fuss one of us will need to wait for the other.
Once you have done, please let me know.
OK, I will try to sort it out within April. Feel free to ping me if I drop the ball.
Quoted 8 lines
Wei.
Quoted 1 line
Quan
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Re: [PATCH RFC v1 09/14] Makefile: delete STUBDOMPATH target
Quoted 48 lines · Quan
Quoted 39 lines
-----Original Message-----
From: Xen-devel [mailto:[email protected]] On Behalf Of Wei Liu
Sent: Friday, April 01, 2016 6:03 PM
To: Xu, Quan
Cc: Xen-devel; Daniel De Graaf; Wei Liu
Subject: Re: [Xen-devel] [PATCH RFC v1 09/14]Makefile: delete STUBDOMPATH targetQuoted 13 lines · Quan
Quoted 11 lines · Wei Liu
Quoted 7 lines · Quan
Makefile TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib · line 68
Quoted 2 lines · Wei Liu
Makefile +1
-1-build: $(STUBDOMPATH) +build: $(STUBDOM_BUILD)Wei,
in original code, in stubdom/vtpm and stubdom/vtpmmgr, the code style is inconsistent and ugly.I personally prefer small patches in a series, but I don't object to having large
patch(es) either.Quoted 7 lines
ok. I think so too. It may be one file per patch.
Quoted 2 lines
At the end of the day, I think Daniel's opinion matters most. After a plan is agreed upon, you can then provide a branch for us to pull in.
I think I am not authorized to branch, could you provide a branch and tell me
how to commit to that branch?
Quoted 2 lines
Sorry, I am unfamiliar with the upstream process.
Oh, you don't need to branch on the main tree (xen.git or future stubdom.git). You can just do the following:
Quoted 8 lines
$ git clone xen.git # or stubdom.git $ cd xen.git # or stubdom.git $ git branch wip.vtpm-coding-style-fix-v1 ... do work, commit as you go alone ... $ git push $some_public_remote wip.vtpm-coding-style-fix-v1 ... post your patch series on xen-devel, along with the git repository and branch
Quoted 7 lines
Wei,
When I tried to follow above steps, I got:
error: Cannot access URL http://xenbits.xen.org/git-http/xen.git/, return code 22
fatal: git-http-push failed
could you help me?
You shouldn't push to the official xen.git. You can push to other public git repository hosting service like bitbucket or github.
Wei.
Quoted 34 lines
Quan
Quoted 28 lines
When your patches are all acked by Daniel, you can then fold all the tags into your own branch (wip.vtpm-coding-style-fix-v$X-acked)
and prod committers to pull from that branch.Quoted 2 lines
Quoted 2 lines
Note
that upstream don't test vtpm in any fashion so you do need to run yourtests.
Quoted 3 lines
Quoted 1 line
I will test it. I think I hope Daniel could help my patches. btw, I have made a quick patch to fix the seal/unseal issue. I will send out
later.
Quoted 6 lines
Quoted 5 lines
The only thing that matters to me is that when you will do it -- you will need to patch a different tree after I split off stubdom. In order to minimise the fuss one of us will need to wait for the other.
Once you have done, please let me know.
OK, I will try to sort it out within April. Feel free to ping me if I drop the ball.
Wei.
Quoted 1 line
Quan
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Re: [PATCH RFC v1 09/14] Makefile: delete STUBDOMPATH target
In reply to Wei LiuQuoted 44 lines · Wei Liu
Quoted 12 lines · Quan
Quoted 10 lines · Wei Liu
Quoted 7 lines · Quan
Makefile TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib · line 68
Quoted 2 lines · Wei Liu
Makefile +1
-1-build: $(STUBDOMPATH) +build: $(STUBDOM_BUILD)Wei,
in original code, in stubdom/vtpm and stubdom/vtpmmgr, the code style is inconsistent and ugly.I personally prefer small patches in a series, but I don't object to having large patch(es) either.
Quoted 9 lines
ok. I think so too. It may be one file per patch.
Quoted 2 lines
At the end of the day, I think Daniel's opinion matters most. After a plan is agreed upon, you can then provide a branch for us to pull in.
I think I am not authorized to branch, could you provide a branch and tell me how to commit to that branch? Sorry, I am unfamiliar with the upstream process.
Oh, you don't need to branch on the main tree (xen.git or future stubdom.git). You can just do the following:
$ git clone xen.git # or stubdom.git $ cd xen.git # or stubdom.git $ git branch wip.vtpm-coding-style-fix-v1 ... do work, commit as you go alone ... $ git push $some_public_remote wip.vtpm-coding-style-fix-v1 ... post your patch series on xen-devel, along with the git repository and branchWhen your patches are all acked by Daniel, you can then fold all the tags into your own branch (wip.vtpm-coding-style-fix-v$X-acked) and prod committers to pull from that branch.
Quoted 6 lines
Quoted 3 lines
Note
that upstream don't test vtpm in any fashion so you do need to run your tests.I will test it. I think I hope Daniel could help my patches.
btw, I have made a quick patch to fix the seal/unseal issue. I will send out later.
Quoted 9 lines
Quoted 5 lines
Quoted 4 lines
The only thing that matters to me is that when you will do it -- you will need to patch a different tree after I split off stubdom. In order to minimise the fuss one of us will need to wait for the other.
Once you have done, please let me know.
OK, I will try to sort it out within April. Feel free to ping me if I drop the ball.
OK, so the plan has become a bit more complicated. I'm still trying to work out everything -- I've collected some opinions during hackathon and people seemed to be of the opinion that things can be done a bit differently. I don't expect to have everything ready in April. So if you want to work on vtpm code, please let me know.
Wei.
Quoted 3 lines
Wei.
Quoted 1 line
Quan
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Re: [PATCH RFC v1 09/14] Makefile: delete STUBDOMPATH target
In reply to Wei LiuWei,
I have spent a lot of days to clean up the code of vtpm / vtpmmgr. but there are tricky issue to boot domu on TPM2.0.. So I am afraid I can't finish it as today is my last working day at intel.
Now, these patch are on https://github.com/virt2x/vtpm2vtpmmgr
Sorry for that.
Quan
Quoted 56 lines · Wei Liu
Quoted 13 lines · Quan
Quoted 11 lines · Wei Liu
Quoted 7 lines · Quan
Makefile TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib · line 68
Quoted 2 lines · Wei Liu
Makefile +1
-1-build: $(STUBDOMPATH) +build: $(STUBDOM_BUILD)Wei,
in original code, in stubdom/vtpm and stubdom/vtpmmgr, the code style is inconsistent and ugly.I personally prefer small patches in a series, but I don't object to having large
patch(es) either.Quoted 7 lines
ok. I think so too. It may be one file per patch.
Quoted 2 lines
At the end of the day, I think Daniel's opinion matters most. After a plan is agreed upon, you can then provide a branch for us to pull in.
I think I am not authorized to branch, could you provide a branch and tell me
how to commit to that branch?
Quoted 2 lines
Sorry, I am unfamiliar with the upstream process.
Oh, you don't need to branch on the main tree (xen.git or future stubdom.git). You can just do the following:
$ git clone xen.git # or stubdom.git $ cd xen.git # or stubdom.git $ git branch wip.vtpm-coding-style-fix-v1 ... do work, commit as you go alone ... $ git push $some_public_remote wip.vtpm-coding-style-fix-v1 ... post your patch series on xen-devel, along with the git repository and branchWhen your patches are all acked by Daniel, you can then fold all the tags into your own branch (wip.vtpm-coding-style-fix-v$X-acked)
and prod committers to pull from that branch.Quoted 2 lines
Quoted 2 lines
Note
that upstream don't test vtpm in any fashion so you do need to run yourtests.
Quoted 3 lines
Quoted 1 line
I will test it. I think I hope Daniel could help my patches. btw, I have made a quick patch to fix the seal/unseal issue. I will send out
later.
Quoted 6 lines
Quoted 5 lines
The only thing that matters to me is that when you will do it -- you will need to patch a different tree after I split off stubdom. In order to minimise the fuss one of us will need to wait for the other.
Once you have done, please let me know.
OK, I will try to sort it out within April. Feel free to ping me if I drop the ball.
Quoted 8 lines
Wei.
Quoted 1 line
Quan
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel
Re: [PATCH RFC v1 09/14] Makefile: delete STUBDOMPATH target
Quoted 6 lines · Quan
Wei,
I have spent a lot of days to clean up the code of vtpm / vtpmmgr. but there are tricky issue to boot domu on TPM2.0.. So I am afraid I can't finish it as today is my last working day at intel.Now, these patch are on https://github.com/virt2x/vtpm2vtpmmgr
Sorry for that.
No need to be sorry. Thanks for letting us know.
Last but not least, thanks for your contribution to Xen and all the best with your new journey!
Wei.
Quoted 67 lines
Quan
Quoted 64 lines · Wei Liu
Quoted 13 lines · Quan
Quoted 11 lines · Wei Liu
Quoted 7 lines · Quan
Makefile TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib · line 68
Quoted 2 lines · Wei Liu
Makefile +1
-1-build: $(STUBDOMPATH) +build: $(STUBDOM_BUILD)Wei,
in original code, in stubdom/vtpm and stubdom/vtpmmgr, the code style is inconsistent and ugly.I personally prefer small patches in a series, but I don't object to having large
patch(es) either.Quoted 7 lines
ok. I think so too. It may be one file per patch.
Quoted 2 lines
At the end of the day, I think Daniel's opinion matters most. After a plan is agreed upon, you can then provide a branch for us to pull in.
I think I am not authorized to branch, could you provide a branch and tell me
how to commit to that branch?
Quoted 2 lines
Sorry, I am unfamiliar with the upstream process.
Oh, you don't need to branch on the main tree (xen.git or future stubdom.git). You can just do the following:
$ git clone xen.git # or stubdom.git $ cd xen.git # or stubdom.git $ git branch wip.vtpm-coding-style-fix-v1 ... do work, commit as you go alone ... $ git push $some_public_remote wip.vtpm-coding-style-fix-v1 ... post your patch series on xen-devel, along with the git repository and branchWhen your patches are all acked by Daniel, you can then fold all the tags into your own branch (wip.vtpm-coding-style-fix-v$X-acked)
and prod committers to pull from that branch.Quoted 2 lines
Quoted 2 lines
Note
that upstream don't test vtpm in any fashion so you do need to run yourtests.
Quoted 3 lines
Quoted 1 line
I will test it. I think I hope Daniel could help my patches. btw, I have made a quick patch to fix the seal/unseal issue. I will send out
later.
Quoted 6 lines
Quoted 5 lines
The only thing that matters to me is that when you will do it -- you will need to patch a different tree after I split off stubdom. In order to minimise the fuss one of us will need to wait for the other.
Once you have done, please let me know.
OK, I will try to sort it out within April. Feel free to ping me if I drop the ball.
Wei.
Quoted 1 line
Quan
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel
RFC PATCH 10/14 Makefile: require QEMU_ROOT to be defined
In reply to Wei LiuDon't tread into xen.git and clone one there.
--- Makefile | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-)
Makefile +5 -22
@@ -6,6 +6,10 @@ ifeq (,$(MINIOS_ROOT)) $(error Please define MINIOS_ROOT environment variable) endif +ifeq (,$(QEMU_ROOT)) + $(error Please define QEMU_ROOT environment variable) +endif + export MINI_OS=$(MINIOS_ROOT) export STUBDOM_ROOT=$(CURDIR) export XEN_ROOT
@@ -272,36 +276,15 @@ $(OCAML_STAMPFILE): ocaml-$(XEN_TARGET_ARCH)/.dirstamp .PHONY: $(CROSS_ROOT) $(CROSS_ROOT): cross-newlib cross-zlib cross-libpci -QEMU_ROOT := $(shell if [ -d "$(QEMU_TRADITIONAL_LOC)" ]; then echo "$(QEMU_TRADITIONAL_LOC)"; else echo .; fi) +export QEMU_ROOT ifneq ($(filter ioemu,$(STUBDOM_TARGETS)),) IOEMU_LINKFARM_TARGET := ioemu/linkfarm.stamp endif -ifeq ($(QEMU_ROOT),.) -$(XEN_ROOT)/tools/qemu-xen-traditional-dir: - $(MAKE) DESTDIR= -C $(XEN_ROOT)/tools qemu-xen-traditional-dir-find - -ioemu/linkfarm.stamp: $(XEN_ROOT)/tools/qemu-xen-traditional-dir - mkdir -p ioemu - set -e; \ - $(buildmakevars2shellvars); \ - cd ioemu; \ - src="$$XEN_ROOT/tools/qemu-xen-traditional-dir"; export src; \ - (cd $$src && find * -type d -print) | xargs mkdir -p; \ - (cd $$src && find * ! -type l -type f $(addprefix ! -name , \ - '*.[oda1]' 'config-*' config.mak qemu-dm qemu-img-xen \ - '*.html' '*.pod' \ - )) | \ - while read f; do rm -f "$$f"; ln -s "$$src/$$f" "$$f"; done - touch ioemu/linkfarm.stamp -else -export QEMU_ROOT - ioemu/linkfarm.stamp: mkdir -p ioemu touch ioemu/linkfarm.stamp -endif mk-headers-$(XEN_TARGET_ARCH): $(IOEMU_LINKFARM_TARGET) $(MAKE) -C $(XEN_ROOT)/tools/include
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 11/14 Makefile: always include Config.mk from xen source tree
In reply to Wei LiuIt contains various definitions needed in make clean.
--- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
Makefile +1 -3
@@ -20,9 +20,7 @@ export DISTDIR=$(STUBDOM_ROOT)/dist export stubdom=y export debug=y -ifeq (,$(findstring clean,$(MAKECMDGOALS))) - include $(XEN_ROOT)/Config.mk -endif +include $(XEN_ROOT)/Config.mk -include config/Stubdom.mk
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 12/14 Makefile: delete ioemu directory in clean target
In reply to Wei LiuAfter we mandate an external QEMU tree there will only be object files in ioemu directory. Just delete the whole directory in make clean.
--- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
@@ -569,7 +569,7 @@ clean: [ ! -e libs-$(XEN_TARGET_ARCH)/call/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/call clean [ ! -e libs-$(XEN_TARGET_ARCH)/foreignmemory/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/foreignmemory clean [ ! -e libxc-$(XEN_TARGET_ARCH)/Makefile ] || $(MAKE) DESTDIR= -C libxc-$(XEN_TARGET_ARCH) clean - -[ ! -d ioemu ] || $(MAKE) DESTDIR= -C ioemu clean + rm -rf ioemu -[ ! -d xenstore ] || $(MAKE) DESTDIR= -C xenstore clean # clean the cross-compilation result
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 13/14 Makefile: fix removing *.mk
In reply to Wei LiuNow we have at least two mk files generated, fix the path and use glob.
--- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
@@ -615,7 +615,7 @@ downloadclean: patchclean .PHONY: distclean distclean: downloadclean - rm -rf config.log config.status config.cache autom4te.cache ../config/Stubdom.mk + rm -rf config.log config.status config.cache autom4te.cache config/*.mk .PHONY: dist dist: DESTDIR=$(DISTDIR)/install
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
RFC PATCH 14/14 Add README file
In reply to Wei Liu---
Not sure what I should put in here other than building.
And we also need COPYING file.
--- README | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 README
README new file +16 -0
@@ -0,0 +1,16 @@ +How to build +------------ + +Please first clone xen.git, mini-os.git and qemu-xen-traditional.git +to suitable locations. + +Then + +export XEN_ROOT=/path/to/xen.git +export MINIOS_ROOT=/path/to/mini-os.git +export QEMU_TRAD_ROOT=/path/to/qemu-xen-traditional.git +./configure +make dist + +You should find all generated files under dist/ directory. +
Signature · 7 lines
2.1.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
Re: [PATCH RFC v1 14/14] Add README file
Quoted 22 lines · Wei Liu
Signed-off-by Wei Liu <[email protected]>---
Not sure what I should put in here other than building.And we also need COPYING file.
--- README | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 READMEREADME new file +6
-0@@ -0,0 +1,16 @@ +How to build +------------ + +Please first clone xen.git, mini-os.git and qemu-xen-traditional.git +to suitable locations. +
README line 16
Quoted 10 lines
README new file +10
-0+Then + +export XEN_ROOT=/path/to/xen.git +export MINIOS_ROOT=/path/to/mini-os.git +export QEMU_TRAD_ROOT=/path/to/qemu-xen-traditional.git +./configure +make dist + +You should find all generated files under dist/ directory. +
I realise I should add more information on how to build 32 bit and 64 bit stubdom here. I will update it in next iteration.
Wei.
Quoted 3 lines
Signature · 1 line
2.1.4
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Hello,
Quoted 1 line · Wei Liu, on Thu 10 Mar 2016 16:46:39 +0000, wrote:
1. There are some open questions -- see individual commits.
Not sure I have seen them all, but here are some bits of answers:
- Not sure what the version number of stubdom.git should be.
Indeed. I don't really have an opinion on this, I'd let Xen maintainer choose.
- (README file in stubdom.git) Not sure what I should put in here other than building.
stubdom/ used to have a README file, which is now in docs/misc/stubdom.txt, which should probably be moved to stubdom.git.
Samuel
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Quoted 12 lines · Samuel Thibault
Hello,
Quoted 1 line · Wei Liu, on Thu 10 Mar 2016 16:46:39 +0000, wrote:
1. There are some open questions -- see individual commits.
Not sure I have seen them all, but here are some bits of answers:
- Not sure what the version number of stubdom.git should be.
Indeed. I don't really have an opinion on this, I'd let Xen maintainer choose.
I think we can go with the Xen version number. Stubdom is tightly coupled with Xen at the moment.
Quoted 6 lines
- (README file in stubdom.git) Not sure what I should put in here other than building.
stubdom/ used to have a README file, which is now in
docs/misc/stubdom.txt, which should probably be moved to stubdom.git.
Thanks. I will move it there, too.
Wei.
Quoted 1 line
Samuel
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
So if nobody objects to this move I will try to clean this series up and teach OSSTest to use the new tree.
Hopefully I will get everything in shape and this series can be merged once next development window opens.
Wei.
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Quoted 3 lines · Wei Liu
So if nobody objects to this move I will try to clean this series up and teach OSSTest to use the new tree.
Surprisingly this version works almost out-of-box for me. I've added more documents to construct various v2 branches.
In the meantime, I will move on to write some osstest patches.
Wei.
Quoted 4 lines
Hopefully I will get everything in shape and this series can be merged once next development window opens.
Wei.
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel