* [PATCH v3 0/8] Split off mini-os to a separate tree
@ 2015-02-25 11:21 Wei Liu
2015-02-25 11:21 ` [PATCH v3 1/8] stubdom: fix "make build" Wei Liu
` (9 more replies)
0 siblings, 10 replies; 21+ messages in thread
From: Wei Liu @ 2015-02-25 11:21 UTC (permalink / raw)
To: xen-devel
Cc: samuel.thibault, Wei Liu, ian.jackson, ian.campbell,
stefano.stabellini
This is v3 of my mini-os splitting off patch series.
I use following runes to split off mini-os:
git filter-branch --tag-name-filter cat \
--subdirectory-filter extras/mini-os/ -- --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 --aggressive
The tree can be found at:
git://xenbits.xen.org/people/liuw/mini-os.git master
The changeset used is f5d9868796e91bee70601805b9bfc1bb544b0586 which is
currently the HEAD of mater branch.
The Xen side patches can be pulled from:
git://xenbits.xen.org/people/liuw/xen.git wip.build-system-v3
Now mini-os builds on its own. I've also done some minor adjustments to
stubdom's build system, so that we can properly issue "make build-stubdom"
in Xen tree top level directory.
I also ran following tests:
1. ./configure
2. make -j16 dist
3. make -j16 distclean
and
1. ./configure --disable-stubdom
2. make -j16 dist
3. make -j16 distclean
They both passed.
Wei.
Wei Liu (8):
stubdom: fix "make build"
Makefile: refactor build/clean/distclean targets
stubdom: don't look for mini-os source file during configure
stubdom: no need to clean mini-os
git-checkout.sh: use "mkdir -p"
Mini-OS: standalone build
build system: stubdom targets now depends on mini-os target
Remove in-tree mini-os directory
.gitignore | 7 +-
Config.mk | 6 +
Makefile | 72 +-
extras/mini-os/COPYING | 36 -
extras/mini-os/Config.mk | 57 -
extras/mini-os/Makefile | 226 ---
extras/mini-os/README | 46 -
extras/mini-os/app.lds | 11 -
extras/mini-os/arch/arm/arm32.S | 294 ----
extras/mini-os/arch/arm/events.c | 31 -
extras/mini-os/arch/arm/hypercalls32.S | 64 -
extras/mini-os/arch/arm/minios-arm32.lds | 83 --
extras/mini-os/arch/arm/mm.c | 139 --
extras/mini-os/arch/arm/panic.c | 98 --
extras/mini-os/arch/arm/sched.c | 47 -
extras/mini-os/arch/arm/setup.c | 119 --
extras/mini-os/arch/arm/time.c | 136 --
extras/mini-os/arch/x86/Makefile | 31 -
extras/mini-os/arch/x86/arch.mk | 22 -
extras/mini-os/arch/x86/events.c | 35 -
extras/mini-os/arch/x86/ioremap.c | 75 -
extras/mini-os/arch/x86/iorw.c | 35 -
extras/mini-os/arch/x86/minios-x86_32.lds | 74 -
extras/mini-os/arch/x86/minios-x86_64.lds | 74 -
extras/mini-os/arch/x86/mm.c | 957 ------------
extras/mini-os/arch/x86/sched.c | 139 --
extras/mini-os/arch/x86/setup.c | 168 ---
extras/mini-os/arch/x86/time.c | 238 ---
extras/mini-os/arch/x86/traps.c | 333 -----
extras/mini-os/arch/x86/x86_32.S | 305 ----
extras/mini-os/arch/x86/x86_64.S | 383 -----
extras/mini-os/blkfront.c | 736 ----------
extras/mini-os/console/console.c | 164 ---
extras/mini-os/console/console.h | 2 -
extras/mini-os/console/xenbus.c | 195 ---
extras/mini-os/console/xencons_ring.c | 195 ---
extras/mini-os/daytime.c | 67 -
extras/mini-os/domain_config | 19 -
extras/mini-os/events.c | 269 ----
extras/mini-os/fbfront.c | 710 ---------
extras/mini-os/gntmap.c | 250 ----
extras/mini-os/gnttab.c | 196 ---
extras/mini-os/hypervisor.c | 132 --
extras/mini-os/include/arch/cc.h | 87 --
extras/mini-os/include/arch/perf.h | 15 -
extras/mini-os/include/arch/sys_arch.h | 35 -
extras/mini-os/include/arm/arch_endian.h | 7 -
extras/mini-os/include/arm/arch_limits.h | 9 -
extras/mini-os/include/arm/arch_mm.h | 38 -
extras/mini-os/include/arm/arch_sched.h | 19 -
extras/mini-os/include/arm/arch_spinlock.h | 36 -
extras/mini-os/include/arm/arm32/arch_wordsize.h | 1 -
extras/mini-os/include/arm/gic.h | 1 -
extras/mini-os/include/arm/hypercall-arm.h | 98 --
extras/mini-os/include/arm/os.h | 216 ---
extras/mini-os/include/arm/traps.h | 20 -
extras/mini-os/include/blkfront.h | 54 -
extras/mini-os/include/byteorder.h | 36 -
extras/mini-os/include/byteswap.h | 39 -
extras/mini-os/include/compiler.h | 10 -
extras/mini-os/include/console.h | 89 --
extras/mini-os/include/ctype.h | 60 -
extras/mini-os/include/endian.h | 19 -
extras/mini-os/include/err.h | 31 -
extras/mini-os/include/errno-base.h | 39 -
extras/mini-os/include/errno.h | 122 --
extras/mini-os/include/events.h | 59 -
extras/mini-os/include/fbfront.h | 46 -
extras/mini-os/include/fcntl.h | 99 --
extras/mini-os/include/gntmap.h | 35 -
extras/mini-os/include/gnttab.h | 17 -
extras/mini-os/include/hypervisor.h | 48 -
extras/mini-os/include/ioremap.h | 33 -
extras/mini-os/include/iorw.h | 16 -
extras/mini-os/include/kernel.h | 9 -
extras/mini-os/include/lib-gpl.h | 59 -
extras/mini-os/include/lib.h | 230 ---
extras/mini-os/include/linux/types.h | 5 -
extras/mini-os/include/lwipopts.h | 23 -
extras/mini-os/include/mm.h | 82 --
extras/mini-os/include/netfront.h | 24 -
extras/mini-os/include/pcifront.h | 29 -
extras/mini-os/include/posix/arpa/inet.h | 7 -
extras/mini-os/include/posix/dirent.h | 24 -
extras/mini-os/include/posix/err.h | 15 -
extras/mini-os/include/posix/fcntl.h | 11 -
extras/mini-os/include/posix/limits.h | 48 -
extras/mini-os/include/posix/net/if.h | 85 --
extras/mini-os/include/posix/netdb.h | 9 -
extras/mini-os/include/posix/netinet/in.h | 7 -
extras/mini-os/include/posix/netinet/tcp.h | 6 -
extras/mini-os/include/posix/poll.h | 1 -
extras/mini-os/include/posix/pthread.h | 64 -
extras/mini-os/include/posix/signal.h | 10 -
extras/mini-os/include/posix/stdlib.h | 8 -
extras/mini-os/include/posix/strings.h | 12 -
extras/mini-os/include/posix/sys/ioctl.h | 16 -
extras/mini-os/include/posix/sys/mman.h | 22 -
extras/mini-os/include/posix/sys/poll.h | 79 -
extras/mini-os/include/posix/sys/select.h | 7 -
extras/mini-os/include/posix/sys/socket.h | 31 -
extras/mini-os/include/posix/sys/stat.h | 7 -
extras/mini-os/include/posix/syslog.h | 37 -
extras/mini-os/include/posix/termios.h | 87 --
extras/mini-os/include/posix/time.h | 11 -
extras/mini-os/include/posix/unistd.h | 16 -
extras/mini-os/include/sched.h | 55 -
extras/mini-os/include/semaphore.h | 110 --
extras/mini-os/include/spinlock.h | 55 -
extras/mini-os/include/sys/lock.h | 52 -
extras/mini-os/include/sys/time.h | 47 -
extras/mini-os/include/time.h | 63 -
extras/mini-os/include/tpm_tis.h | 61 -
extras/mini-os/include/tpmback.h | 104 --
extras/mini-os/include/tpmfront.h | 97 --
extras/mini-os/include/types.h | 74 -
extras/mini-os/include/wait.h | 105 --
extras/mini-os/include/waittypes.h | 32 -
extras/mini-os/include/x86/arch_endian.h | 7 -
extras/mini-os/include/x86/arch_limits.h | 20 -
extras/mini-os/include/x86/arch_mm.h | 233 ---
extras/mini-os/include/x86/arch_sched.h | 25 -
extras/mini-os/include/x86/arch_spinlock.h | 94 --
extras/mini-os/include/x86/os.h | 572 --------
extras/mini-os/include/x86/traps.h | 78 -
extras/mini-os/include/x86/x86_32/arch_wordsize.h | 1 -
.../mini-os/include/x86/x86_32/hypercall-x86_32.h | 337 -----
extras/mini-os/include/x86/x86_64/arch_wordsize.h | 2 -
.../mini-os/include/x86/x86_64/hypercall-x86_64.h | 344 -----
extras/mini-os/include/xenbus.h | 120 --
extras/mini-os/include/xmalloc.h | 44 -
extras/mini-os/kernel.c | 198 ---
extras/mini-os/lib/ctype.c | 29 -
extras/mini-os/lib/math.c | 426 ------
extras/mini-os/lib/printf.c | 786 ----------
extras/mini-os/lib/stack_chk_fail.c | 8 -
extras/mini-os/lib/string.c | 228 ---
extras/mini-os/lib/sys.c | 1550 --------------------
extras/mini-os/lib/xmalloc.c | 319 ----
extras/mini-os/lib/xs.c | 194 ---
extras/mini-os/lock.c | 112 --
extras/mini-os/lwip-arch.c | 293 ----
extras/mini-os/lwip-net.c | 386 -----
extras/mini-os/main.c | 193 ---
extras/mini-os/minios.mk | 76 -
extras/mini-os/mm.c | 441 ------
extras/mini-os/netfront.c | 675 ---------
extras/mini-os/pcifront.c | 616 --------
extras/mini-os/sched.c | 304 ----
extras/mini-os/test.c | 577 --------
extras/mini-os/tpm_tis.c | 1523 -------------------
extras/mini-os/tpmback.c | 1136 --------------
extras/mini-os/tpmfront.c | 631 --------
extras/mini-os/xenbus/xenbus.c | 870 -----------
scripts/git-checkout.sh | 2 +-
stubdom/Makefile | 7 +-
stubdom/configure.ac | 2 +-
tools/misc/mktarball | 4 +-
158 files changed, 83 insertions(+), 24026 deletions(-)
delete mode 100644 extras/mini-os/COPYING
delete mode 100644 extras/mini-os/Config.mk
delete mode 100644 extras/mini-os/Makefile
delete mode 100644 extras/mini-os/README
delete mode 100644 extras/mini-os/app.lds
delete mode 100644 extras/mini-os/arch/arm/arm32.S
delete mode 100644 extras/mini-os/arch/arm/events.c
delete mode 100644 extras/mini-os/arch/arm/hypercalls32.S
delete mode 100755 extras/mini-os/arch/arm/minios-arm32.lds
delete mode 100644 extras/mini-os/arch/arm/mm.c
delete mode 100644 extras/mini-os/arch/arm/panic.c
delete mode 100644 extras/mini-os/arch/arm/sched.c
delete mode 100644 extras/mini-os/arch/arm/setup.c
delete mode 100644 extras/mini-os/arch/arm/time.c
delete mode 100644 extras/mini-os/arch/x86/Makefile
delete mode 100644 extras/mini-os/arch/x86/arch.mk
delete mode 100644 extras/mini-os/arch/x86/events.c
delete mode 100644 extras/mini-os/arch/x86/ioremap.c
delete mode 100644 extras/mini-os/arch/x86/iorw.c
delete mode 100644 extras/mini-os/arch/x86/minios-x86_32.lds
delete mode 100644 extras/mini-os/arch/x86/minios-x86_64.lds
delete mode 100644 extras/mini-os/arch/x86/mm.c
delete mode 100644 extras/mini-os/arch/x86/sched.c
delete mode 100644 extras/mini-os/arch/x86/setup.c
delete mode 100644 extras/mini-os/arch/x86/time.c
delete mode 100644 extras/mini-os/arch/x86/traps.c
delete mode 100644 extras/mini-os/arch/x86/x86_32.S
delete mode 100644 extras/mini-os/arch/x86/x86_64.S
delete mode 100644 extras/mini-os/blkfront.c
delete mode 100644 extras/mini-os/console/console.c
delete mode 100644 extras/mini-os/console/console.h
delete mode 100644 extras/mini-os/console/xenbus.c
delete mode 100644 extras/mini-os/console/xencons_ring.c
delete mode 100644 extras/mini-os/daytime.c
delete mode 100644 extras/mini-os/domain_config
delete mode 100644 extras/mini-os/events.c
delete mode 100644 extras/mini-os/fbfront.c
delete mode 100644 extras/mini-os/gntmap.c
delete mode 100644 extras/mini-os/gnttab.c
delete mode 100644 extras/mini-os/hypervisor.c
delete mode 100644 extras/mini-os/include/arch/cc.h
delete mode 100644 extras/mini-os/include/arch/perf.h
delete mode 100644 extras/mini-os/include/arch/sys_arch.h
delete mode 100644 extras/mini-os/include/arm/arch_endian.h
delete mode 100644 extras/mini-os/include/arm/arch_limits.h
delete mode 100644 extras/mini-os/include/arm/arch_mm.h
delete mode 100644 extras/mini-os/include/arm/arch_sched.h
delete mode 100755 extras/mini-os/include/arm/arch_spinlock.h
delete mode 100644 extras/mini-os/include/arm/arm32/arch_wordsize.h
delete mode 100644 extras/mini-os/include/arm/gic.h
delete mode 100644 extras/mini-os/include/arm/hypercall-arm.h
delete mode 100644 extras/mini-os/include/arm/os.h
delete mode 100644 extras/mini-os/include/arm/traps.h
delete mode 100644 extras/mini-os/include/blkfront.h
delete mode 100644 extras/mini-os/include/byteorder.h
delete mode 100644 extras/mini-os/include/byteswap.h
delete mode 100644 extras/mini-os/include/compiler.h
delete mode 100644 extras/mini-os/include/console.h
delete mode 100644 extras/mini-os/include/ctype.h
delete mode 100644 extras/mini-os/include/endian.h
delete mode 100644 extras/mini-os/include/err.h
delete mode 100644 extras/mini-os/include/errno-base.h
delete mode 100644 extras/mini-os/include/errno.h
delete mode 100644 extras/mini-os/include/events.h
delete mode 100644 extras/mini-os/include/fbfront.h
delete mode 100644 extras/mini-os/include/fcntl.h
delete mode 100644 extras/mini-os/include/gntmap.h
delete mode 100644 extras/mini-os/include/gnttab.h
delete mode 100644 extras/mini-os/include/hypervisor.h
delete mode 100644 extras/mini-os/include/ioremap.h
delete mode 100644 extras/mini-os/include/iorw.h
delete mode 100644 extras/mini-os/include/kernel.h
delete mode 100644 extras/mini-os/include/lib-gpl.h
delete mode 100644 extras/mini-os/include/lib.h
delete mode 100644 extras/mini-os/include/linux/types.h
delete mode 100644 extras/mini-os/include/lwipopts.h
delete mode 100644 extras/mini-os/include/mm.h
delete mode 100644 extras/mini-os/include/netfront.h
delete mode 100644 extras/mini-os/include/pcifront.h
delete mode 100644 extras/mini-os/include/posix/arpa/inet.h
delete mode 100644 extras/mini-os/include/posix/dirent.h
delete mode 100644 extras/mini-os/include/posix/err.h
delete mode 100644 extras/mini-os/include/posix/fcntl.h
delete mode 100644 extras/mini-os/include/posix/limits.h
delete mode 100644 extras/mini-os/include/posix/net/if.h
delete mode 100644 extras/mini-os/include/posix/netdb.h
delete mode 100644 extras/mini-os/include/posix/netinet/in.h
delete mode 100644 extras/mini-os/include/posix/netinet/tcp.h
delete mode 100644 extras/mini-os/include/posix/poll.h
delete mode 100644 extras/mini-os/include/posix/pthread.h
delete mode 100644 extras/mini-os/include/posix/signal.h
delete mode 100644 extras/mini-os/include/posix/stdlib.h
delete mode 100644 extras/mini-os/include/posix/strings.h
delete mode 100644 extras/mini-os/include/posix/sys/ioctl.h
delete mode 100644 extras/mini-os/include/posix/sys/mman.h
delete mode 100644 extras/mini-os/include/posix/sys/poll.h
delete mode 100644 extras/mini-os/include/posix/sys/select.h
delete mode 100644 extras/mini-os/include/posix/sys/socket.h
delete mode 100644 extras/mini-os/include/posix/sys/stat.h
delete mode 100644 extras/mini-os/include/posix/syslog.h
delete mode 100644 extras/mini-os/include/posix/termios.h
delete mode 100644 extras/mini-os/include/posix/time.h
delete mode 100644 extras/mini-os/include/posix/unistd.h
delete mode 100644 extras/mini-os/include/sched.h
delete mode 100644 extras/mini-os/include/semaphore.h
delete mode 100644 extras/mini-os/include/spinlock.h
delete mode 100644 extras/mini-os/include/sys/lock.h
delete mode 100644 extras/mini-os/include/sys/time.h
delete mode 100644 extras/mini-os/include/time.h
delete mode 100644 extras/mini-os/include/tpm_tis.h
delete mode 100644 extras/mini-os/include/tpmback.h
delete mode 100644 extras/mini-os/include/tpmfront.h
delete mode 100644 extras/mini-os/include/types.h
delete mode 100644 extras/mini-os/include/wait.h
delete mode 100644 extras/mini-os/include/waittypes.h
delete mode 100644 extras/mini-os/include/x86/arch_endian.h
delete mode 100644 extras/mini-os/include/x86/arch_limits.h
delete mode 100644 extras/mini-os/include/x86/arch_mm.h
delete mode 100644 extras/mini-os/include/x86/arch_sched.h
delete mode 100644 extras/mini-os/include/x86/arch_spinlock.h
delete mode 100644 extras/mini-os/include/x86/os.h
delete mode 100644 extras/mini-os/include/x86/traps.h
delete mode 100644 extras/mini-os/include/x86/x86_32/arch_wordsize.h
delete mode 100644 extras/mini-os/include/x86/x86_32/hypercall-x86_32.h
delete mode 100644 extras/mini-os/include/x86/x86_64/arch_wordsize.h
delete mode 100644 extras/mini-os/include/x86/x86_64/hypercall-x86_64.h
delete mode 100644 extras/mini-os/include/xenbus.h
delete mode 100644 extras/mini-os/include/xmalloc.h
delete mode 100644 extras/mini-os/kernel.c
delete mode 100644 extras/mini-os/lib/ctype.c
delete mode 100644 extras/mini-os/lib/math.c
delete mode 100644 extras/mini-os/lib/printf.c
delete mode 100644 extras/mini-os/lib/stack_chk_fail.c
delete mode 100644 extras/mini-os/lib/string.c
delete mode 100644 extras/mini-os/lib/sys.c
delete mode 100644 extras/mini-os/lib/xmalloc.c
delete mode 100644 extras/mini-os/lib/xs.c
delete mode 100644 extras/mini-os/lock.c
delete mode 100644 extras/mini-os/lwip-arch.c
delete mode 100644 extras/mini-os/lwip-net.c
delete mode 100644 extras/mini-os/main.c
delete mode 100644 extras/mini-os/minios.mk
delete mode 100644 extras/mini-os/mm.c
delete mode 100644 extras/mini-os/netfront.c
delete mode 100644 extras/mini-os/pcifront.c
delete mode 100644 extras/mini-os/sched.c
delete mode 100644 extras/mini-os/test.c
delete mode 100644 extras/mini-os/tpm_tis.c
delete mode 100644 extras/mini-os/tpmback.c
delete mode 100644 extras/mini-os/tpmfront.c
delete mode 100644 extras/mini-os/xenbus/xenbus.c
--
1.9.1
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v3 1/8] stubdom: fix "make build"
2015-02-25 11:21 [PATCH v3 0/8] Split off mini-os to a separate tree Wei Liu
@ 2015-02-25 11:21 ` Wei Liu
2015-02-25 11:21 ` [PATCH v3 2/8] Makefile: refactor build/clean/distclean targets Wei Liu
` (8 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Wei Liu @ 2015-02-25 11:21 UTC (permalink / raw)
To: xen-devel
Cc: samuel.thibault, Wei Liu, ian.jackson, ian.campbell,
stefano.stabellini
Cross compiling libxc requires some symlinks to exist.
Note that make -C tools/include requires running tools/configure. But at
least now the error message is much better than just a "file not found"
error.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jakcson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
stubdom/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/stubdom/Makefile b/stubdom/Makefile
index 8fb885a..58ca08c 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -333,6 +333,8 @@ $(TARGETS_MINIOS): mini-os-%:
.PHONY: libxc
libxc: libxc-$(XEN_TARGET_ARCH)/libxenctrl.a libxc-$(XEN_TARGET_ARCH)/libxenguest.a
libxc-$(XEN_TARGET_ARCH)/libxenctrl.a: cross-zlib
+ $(MAKE) -C $(XEN_ROOT)/tools/include
+ $(MAKE) DESTDIR= -C $(MINI_OS) links
CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= CONFIG_LIBXC_MINIOS=y -C libxc-$(XEN_TARGET_ARCH)
libxc-$(XEN_TARGET_ARCH)/libxenguest.a: libxc-$(XEN_TARGET_ARCH)/libxenctrl.a
--
1.9.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v3 2/8] Makefile: refactor build/clean/distclean targets
2015-02-25 11:21 [PATCH v3 0/8] Split off mini-os to a separate tree Wei Liu
2015-02-25 11:21 ` [PATCH v3 1/8] stubdom: fix "make build" Wei Liu
@ 2015-02-25 11:21 ` Wei Liu
2015-02-25 11:21 ` [PATCH v3 3/8] stubdom: don't look for mini-os source file during configure Wei Liu
` (7 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Wei Liu @ 2015-02-25 11:21 UTC (permalink / raw)
To: xen-devel
Cc: samuel.thibault, Wei Liu, ian.jackson, ian.campbell,
stefano.stabellini
Factor out per-subsystem build/clean/distclean-% targets, so that we can
build subsystems independently in top level directory.
The motive behind this is after splitting out mini-os from Xen tree,
stubdom is in effect a downstream of mini-os. I would like to have the
ability to build it independently and instrument OSSTest to test it.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
Makefile | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 44 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 6e9a4c7..ad6f917 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,9 @@ all: dist
SUBSYSTEMS?=xen tools stubdom docs
TARGS_DIST=$(patsubst %, dist-%, $(SUBSYSTEMS))
TARGS_INSTALL=$(patsubst %, install-%, $(SUBSYSTEMS))
+TARGS_BUILD=$(patsubst %, build-%, $(SUBSYSTEMS))
+TARGS_CLEAN=$(patsubst %, clean-%, $(SUBSYSTEMS))
+TARGS_DISTCLEAN=$(patsubst %, distclean-%, $(SUBSYSTEMS))
export XEN_ROOT=$(CURDIR)
include Config.mk
@@ -23,13 +26,25 @@ export DESTDIR
install: $(TARGS_INSTALL)
.PHONY: build
-build:
+build: $(TARGS_BUILD)
+
+.PHONY: build-xen
+build-xen:
$(MAKE) -C xen build
+
+.PHONY: build-tools
+build-tools:
$(MAKE) -C tools build
+
+.PHONY: build-stubdom
+build-stubdom:
$(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
# The test target is for unit tests that can run without an installation. Of
@@ -135,28 +150,52 @@ src-tarball: subtree-force-update-all
bash ./tools/misc/mktarball $(XEN_ROOT) $$(git describe)
.PHONY: clean
-clean::
+clean: $(TARGS_CLEAN)
+
+.PHONY: clean-xen
+clean-xen:
$(MAKE) -C xen clean
+
+.PHONY: clean-tools
+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
# clean, but blow away tarballs
.PHONY: distclean
-distclean:
+distclean: $(TARGS_DISTCLEAN)
rm -f config/Toplevel.mk
+ rm -rf dist
+ rm -rf config.log config.status config.cache autom4te.cache
+
+.PHONY: distclean-xen
+distclean-xen:
$(MAKE) -C xen distclean
+
+.PHONY: distclean-tools
+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
+
+.PHONY: distclean-docs
+distclean-docs:
$(MAKE) -C docs distclean
- rm -rf dist
- rm -rf config.log config.status config.cache autom4te.cache
# Linux name for GNU distclean
.PHONY: mrproper
--
1.9.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v3 3/8] stubdom: don't look for mini-os source file during configure
2015-02-25 11:21 [PATCH v3 0/8] Split off mini-os to a separate tree Wei Liu
2015-02-25 11:21 ` [PATCH v3 1/8] stubdom: fix "make build" Wei Liu
2015-02-25 11:21 ` [PATCH v3 2/8] Makefile: refactor build/clean/distclean targets Wei Liu
@ 2015-02-25 11:21 ` Wei Liu
2015-02-25 11:21 ` [PATCH v3 4/8] stubdom: no need to clean mini-os Wei Liu
` (6 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Wei Liu @ 2015-02-25 11:21 UTC (permalink / raw)
To: xen-devel
Cc: samuel.thibault, Wei Liu, ian.jackson, ian.campbell,
stefano.stabellini
Don't look for mini-os source file during configure. Mini-os source code
will be fetched during build.
Instead look for xenstore-minios.cfg.
Please rerun autogen.sh after applying this patch.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
Changes in v2:
1. Look for xenstore-minios.cfg.
---
stubdom/configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/stubdom/configure.ac b/stubdom/configure.ac
index 6468203..9fec853 100644
--- a/stubdom/configure.ac
+++ b/stubdom/configure.ac
@@ -4,7 +4,7 @@
AC_PREREQ([2.67])
AC_INIT([Xen Hypervisor Stub Domains], m4_esyscmd([../version.sh ../xen/Makefile]),
[xen-devel@lists.xen.org], [xen], [http://www.xen.org/])
-AC_CONFIG_SRCDIR([../extras/mini-os/kernel.c])
+AC_CONFIG_SRCDIR([xenstore-minios.cfg])
AC_CONFIG_FILES([../config/Stubdom.mk])
AC_CONFIG_AUX_DIR([../])
--
1.9.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v3 4/8] stubdom: no need to clean mini-os
2015-02-25 11:21 [PATCH v3 0/8] Split off mini-os to a separate tree Wei Liu
` (2 preceding siblings ...)
2015-02-25 11:21 ` [PATCH v3 3/8] stubdom: don't look for mini-os source file during configure Wei Liu
@ 2015-02-25 11:21 ` Wei Liu
2015-02-25 19:31 ` Samuel Thibault
2015-02-27 13:32 ` Ian Campbell
2015-02-25 11:21 ` [PATCH v3 5/8] git-checkout.sh: use "mkdir -p" Wei Liu
` (5 subsequent siblings)
9 siblings, 2 replies; 21+ messages in thread
From: Wei Liu @ 2015-02-25 11:21 UTC (permalink / raw)
To: xen-devel
Cc: samuel.thibault, Wei Liu, ian.jackson, ian.campbell,
stefano.stabellini
All objects are placed inside stubdom's directories, so there is no need
to enter mini-os and clean.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
stubdom/Makefile | 1 -
1 file changed, 1 deletion(-)
diff --git a/stubdom/Makefile b/stubdom/Makefile
index 58ca08c..6e6876b 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -504,7 +504,6 @@ clean:
rm -fr mini-os-$(XEN_TARGET_ARCH)-xenstore
rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpm
rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpmmgr
- $(MAKE) DESTDIR= -C $(MINI_OS) clean
$(MAKE) DESTDIR= -C caml clean
$(MAKE) DESTDIR= -C c clean
$(MAKE) -C vtpm clean
--
1.9.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v3 5/8] git-checkout.sh: use "mkdir -p"
2015-02-25 11:21 [PATCH v3 0/8] Split off mini-os to a separate tree Wei Liu
` (3 preceding siblings ...)
2015-02-25 11:21 ` [PATCH v3 4/8] stubdom: no need to clean mini-os Wei Liu
@ 2015-02-25 11:21 ` Wei Liu
2015-02-25 11:21 ` [PATCH v3 6/8] Mini-OS: standalone build Wei Liu
` (4 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Wei Liu @ 2015-02-25 11:21 UTC (permalink / raw)
To: xen-devel
Cc: samuel.thibault, Wei Liu, ian.jackson, ian.campbell,
stefano.stabellini
Otherwise mkdir extras/mini-os fails because extras doesn't exist.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
scripts/git-checkout.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/git-checkout.sh b/scripts/git-checkout.sh
index 15b3ce9..20ae31f 100755
--- a/scripts/git-checkout.sh
+++ b/scripts/git-checkout.sh
@@ -13,7 +13,7 @@ set -e
if test \! -d $DIR-remote; then
rm -rf $DIR-remote $DIR-remote.tmp
- mkdir $DIR-remote.tmp; rmdir $DIR-remote.tmp
+ mkdir -p $DIR-remote.tmp; rmdir $DIR-remote.tmp
$GIT clone $TREE $DIR-remote.tmp
if test "$TAG" ; then
cd $DIR-remote.tmp
--
1.9.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v3 6/8] Mini-OS: standalone build
2015-02-25 11:21 [PATCH v3 0/8] Split off mini-os to a separate tree Wei Liu
` (4 preceding siblings ...)
2015-02-25 11:21 ` [PATCH v3 5/8] git-checkout.sh: use "mkdir -p" Wei Liu
@ 2015-02-25 11:21 ` Wei Liu
2015-02-25 11:21 ` [PATCH v3] build system: stubdom targets now depends on mini-os target Wei Liu
` (3 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Wei Liu @ 2015-02-25 11:21 UTC (permalink / raw)
To: xen-devel
Cc: samuel.thibault, Wei Liu, ian.jackson, ian.campbell,
stefano.stabellini
In order to keep the tree bisectable all the changes are done in one
single commit.
Things done in this commit:
1. Import necessary .mk files from Xen.
2. Move all XEN_ related variables to MINIOS_ namespace.
3. Import Xen public header files.
4. Import BSD's list.h and helper script.
Mini-OS's vanilla Config.mk is modified to contain some macros copied
from Xen's Config.mk. It also contains compatibility handling logic for
Xen's stubdom build environment.
Files modified:
Config.mk
Makefile
arch/x86/Makefile
arch/x86/arch.mk
minios.mk
All other files are just imported from Xen.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
[ output trimmed ]
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v3] build system: stubdom targets now depends on mini-os target
2015-02-25 11:21 [PATCH v3 0/8] Split off mini-os to a separate tree Wei Liu
` (5 preceding siblings ...)
2015-02-25 11:21 ` [PATCH v3 6/8] Mini-OS: standalone build Wei Liu
@ 2015-02-25 11:21 ` Wei Liu
2015-02-27 13:31 ` Ian Campbell
2015-02-25 11:21 ` [PATCH v3 8/8] Remove in-tree mini-os directory Wei Liu
` (2 subsequent siblings)
9 siblings, 1 reply; 21+ messages in thread
From: Wei Liu @ 2015-02-25 11:21 UTC (permalink / raw)
To: xen-devel
Cc: samuel.thibault, Wei Liu, ian.jackson, ian.campbell,
stefano.stabellini
Provide mini-os url and revision in Config.mk
Make stubdom targets depend on mini-os-dir target. Make
subtree-force-update{,-all} depend on mini-os-dir-force-update.
Also make mktarball script generate mini-os archive.
Original mini-os directory is renamed to mini-os-intree to help reduce
patch length. That directory will be deleted in a separate patch.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
Changes in v3:
1. Put mini-os targets in main Makefile.
2. Stubdom clean and distclean don't depend on mini-os-dir.
Changes in v2:
1. Use hash in Config.mk.
---
.gitignore | 6 ++----
Config.mk | 6 ++++++
Makefile | 24 ++++++++++++++++++----
[rename output trimmed ]
stubdom/Makefile | 4 ++++
tools/misc/mktarball | 4 +++-
226 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/.gitignore b/.gitignore
index cdbdca7..4979018 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,10 +46,8 @@ docs/man1/
docs/man5/
docs/pdf/
docs/txt/
-extras/mini-os/include/mini-os
-extras/mini-os/include/x86/mini-os
-extras/mini-os/include/list.h
-extras/mini-os/mini-os*
+extras/mini-os
+extras/mini-os-remote
install/*
stubdom/autom4te.cache/
stubdom/binutils-*
diff --git a/Config.mk b/Config.mk
index d12ad91..127fd1b 100644
--- a/Config.mk
+++ b/Config.mk
@@ -245,14 +245,20 @@ OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git
QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-unstable.git
QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-unstable.git
SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git
+MINIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/mini-os.git
else
OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git
QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git
QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git
SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
+MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
endif
OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423
QEMU_UPSTREAM_REVISION ?= master
+MINIOS_UPSTREAM_REVISION ?= f5d9868796e91bee70601805b9bfc1bb544b0586
+# Thu Jan 29 19:10:04 2015 +0000
+# Mini-OS: standalone build
+
SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5
# Thu May 22 16:59:16 2014 -0400
# python3 fixes for vgabios and csm builds.
diff --git a/Makefile b/Makefile
index ad6f917..e8a75ff 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,22 @@ TARGS_DISTCLEAN=$(patsubst %, distclean-%, $(SUBSYSTEMS))
export XEN_ROOT=$(CURDIR)
include Config.mk
+.PHONY: mini-os-dir
+mini-os-dir:
+ GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh \
+ $(MINIOS_UPSTREAM_URL) \
+ $(MINIOS_UPSTREAM_REVISION) \
+ $(XEN_ROOT)/extras/mini-os
+
+.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
+
SUBARCH := $(subst x86_32,i386,$(XEN_TARGET_ARCH))
export XEN_TARGET_ARCH SUBARCH
export DESTDIR
@@ -37,7 +53,7 @@ build-tools:
$(MAKE) -C tools build
.PHONY: build-stubdom
-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
@@ -84,7 +100,7 @@ install-tools:
$(MAKE) -C tools install
.PHONY: install-stubdom
-install-stubdom: install-tools
+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
@@ -125,11 +141,11 @@ rpmball: dist
bash ./tools/misc/mkrpm $(XEN_ROOT) $$($(MAKE) -C xen xenversion --no-print-directory)
.PHONY: subtree-force-update
-subtree-force-update:
+subtree-force-update: mini-os-dir-force-update
$(MAKE) -C tools subtree-force-update
.PHONY: subtree-force-update-all
-subtree-force-update-all:
+subtree-force-update-all: mini-os-dir-force-update
$(MAKE) -C tools subtree-force-update-all
# Make a source tarball, including qemu sub-trees.
[ rename output trimmed ]
diff --git a/stubdom/Makefile b/stubdom/Makefile
index 6e6876b..1a1f263 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -1,6 +1,10 @@
XEN_ROOT = $(CURDIR)/..
MINI_OS = $(XEN_ROOT)/extras/mini-os
+ifeq ($(wildcard $(MINI_OS)/Config.mk),)
+$(error Please run `make mini-os-dir' in top-level directory)
+endif
+
export XEN_OS=MiniOS
export stubdom=y
diff --git a/tools/misc/mktarball b/tools/misc/mktarball
index aad1096..73282b5 100755
--- a/tools/misc/mktarball
+++ b/tools/misc/mktarball
@@ -6,7 +6,7 @@
set -ex
function git_archive_into {
- mkdir "$2"
+ mkdir -p "$2"
git --git-dir="$1"/.git \
archive --format=tar HEAD | \
@@ -33,6 +33,8 @@ git_archive_into $xen_root/tools/qemu-xen-dir-remote $tdir/xen-$desc/tools/qemu-
git_archive_into $xen_root/tools/qemu-xen-traditional-dir-remote $tdir/xen-$desc/tools/qemu-xen-traditional
+git_archive_into $xen_root/extras/mini-os-remote $tdir/xen-$desc/extras/mini-os
+
GZIP=-9v tar cz -f $xen_root/dist/xen-$desc.tar.gz -C $tdir xen-$desc
echo "Source tarball in $xen_root/dist/xen-$desc.tar.gz"
--
1.9.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v3 8/8] Remove in-tree mini-os directory
2015-02-25 11:21 [PATCH v3 0/8] Split off mini-os to a separate tree Wei Liu
` (6 preceding siblings ...)
2015-02-25 11:21 ` [PATCH v3] build system: stubdom targets now depends on mini-os target Wei Liu
@ 2015-02-25 11:21 ` Wei Liu
2015-02-27 13:38 ` [PATCH v3 0/8] Split off mini-os to a separate tree Ian Campbell
2015-02-27 16:37 ` Ian Campbell
9 siblings, 0 replies; 21+ messages in thread
From: Wei Liu @ 2015-02-25 11:21 UTC (permalink / raw)
To: xen-devel
Cc: samuel.thibault, Wei Liu, ian.jackson, ian.campbell,
stefano.stabellini
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
[ output trimmed ]
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 4/8] stubdom: no need to clean mini-os
2015-02-25 11:21 ` [PATCH v3 4/8] stubdom: no need to clean mini-os Wei Liu
@ 2015-02-25 19:31 ` Samuel Thibault
2015-02-27 13:32 ` Ian Campbell
1 sibling, 0 replies; 21+ messages in thread
From: Samuel Thibault @ 2015-02-25 19:31 UTC (permalink / raw)
To: Wei Liu; +Cc: stefano.stabellini, ian.jackson, ian.campbell, xen-devel
Wei Liu, le Wed 25 Feb 2015 11:21:27 +0000, a écrit :
> All objects are placed inside stubdom's directories, so there is no need
> to enter mini-os and clean.
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
> ---
> stubdom/Makefile | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/stubdom/Makefile b/stubdom/Makefile
> index 58ca08c..6e6876b 100644
> --- a/stubdom/Makefile
> +++ b/stubdom/Makefile
> @@ -504,7 +504,6 @@ clean:
> rm -fr mini-os-$(XEN_TARGET_ARCH)-xenstore
> rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpm
> rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpmmgr
> - $(MAKE) DESTDIR= -C $(MINI_OS) clean
> $(MAKE) DESTDIR= -C caml clean
> $(MAKE) DESTDIR= -C c clean
> $(MAKE) -C vtpm clean
> --
> 1.9.1
>
--
Samuel
> C'est vrai. FreeBSD pourrait être bien s'il avait une licence
> correcte.
Oh, mon troll-ô-meter vient d'exploser...
-+- OR in Guide du linuxien pervers - "Bien regler son troll-ô-meter"
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3] build system: stubdom targets now depends on mini-os target
2015-02-25 11:21 ` [PATCH v3] build system: stubdom targets now depends on mini-os target Wei Liu
@ 2015-02-27 13:31 ` Ian Campbell
0 siblings, 0 replies; 21+ messages in thread
From: Ian Campbell @ 2015-02-27 13:31 UTC (permalink / raw)
To: Wei Liu; +Cc: samuel.thibault, stefano.stabellini, ian.jackson, xen-devel
On Wed, 2015-02-25 at 11:21 +0000, Wei Liu wrote:
> Provide mini-os url and revision in Config.mk
>
> Make stubdom targets depend on mini-os-dir target. Make
> subtree-force-update{,-all} depend on mini-os-dir-force-update.
>
> Also make mktarball script generate mini-os archive.
>
> Original mini-os directory is renamed to mini-os-intree to help reduce
> patch length. That directory will be deleted in a separate patch.
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 4/8] stubdom: no need to clean mini-os
2015-02-25 11:21 ` [PATCH v3 4/8] stubdom: no need to clean mini-os Wei Liu
2015-02-25 19:31 ` Samuel Thibault
@ 2015-02-27 13:32 ` Ian Campbell
1 sibling, 0 replies; 21+ messages in thread
From: Ian Campbell @ 2015-02-27 13:32 UTC (permalink / raw)
To: Wei Liu; +Cc: samuel.thibault, stefano.stabellini, ian.jackson, xen-devel
On Wed, 2015-02-25 at 11:21 +0000, Wei Liu wrote:
> All objects are placed inside stubdom's directories, so there is no need
> to enter mini-os and clean.
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 0/8] Split off mini-os to a separate tree
2015-02-25 11:21 [PATCH v3 0/8] Split off mini-os to a separate tree Wei Liu
` (7 preceding siblings ...)
2015-02-25 11:21 ` [PATCH v3 8/8] Remove in-tree mini-os directory Wei Liu
@ 2015-02-27 13:38 ` Ian Campbell
2015-02-27 13:50 ` Wei Liu
2015-02-27 16:37 ` Ian Campbell
9 siblings, 1 reply; 21+ messages in thread
From: Ian Campbell @ 2015-02-27 13:38 UTC (permalink / raw)
To: Wei Liu; +Cc: samuel.thibault, stefano.stabellini, ian.jackson, xen-devel
On Wed, 2015-02-25 at 11:21 +0000, Wei Liu wrote:
> git://xenbits.xen.org/people/liuw/xen.git wip.build-system-v3
I think the series is now fully acked. Please could you rebase -i and
add the acks and push this as v4 without changing the base commit, i.e.
not pulling it up to current master or staging, leave it at
cb34a7c8d741aa447d79e1b01d71168a4088a4d7.
Not rebasing means you do not need to retest etc and I can just git pull
the result.
Ian.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 0/8] Split off mini-os to a separate tree
2015-02-27 13:38 ` [PATCH v3 0/8] Split off mini-os to a separate tree Ian Campbell
@ 2015-02-27 13:50 ` Wei Liu
2015-02-27 14:46 ` Ian Campbell
0 siblings, 1 reply; 21+ messages in thread
From: Wei Liu @ 2015-02-27 13:50 UTC (permalink / raw)
To: Ian Campbell
Cc: samuel.thibault, stefano.stabellini, Wei Liu, ian.jackson,
xen-devel
On Fri, Feb 27, 2015 at 01:38:58PM +0000, Ian Campbell wrote:
> On Wed, 2015-02-25 at 11:21 +0000, Wei Liu wrote:
> > git://xenbits.xen.org/people/liuw/xen.git wip.build-system-v3
>
> I think the series is now fully acked. Please could you rebase -i and
> add the acks and push this as v4 without changing the base commit, i.e.
> not pulling it up to current master or staging, leave it at
> cb34a7c8d741aa447d79e1b01d71168a4088a4d7.
>
> Not rebasing means you do not need to retest etc and I can just git pull
> the result.
>
git://xenbits.xen.org/people/liuw/xen.git wip.build-system-v4
Wei.
> Ian.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 0/8] Split off mini-os to a separate tree
2015-02-27 13:50 ` Wei Liu
@ 2015-02-27 14:46 ` Ian Campbell
2015-02-27 14:58 ` Wei Liu
0 siblings, 1 reply; 21+ messages in thread
From: Ian Campbell @ 2015-02-27 14:46 UTC (permalink / raw)
To: Wei Liu; +Cc: samuel.thibault, stefano.stabellini, ian.jackson, xen-devel
On Fri, 2015-02-27 at 13:50 +0000, Wei Liu wrote:
> On Fri, Feb 27, 2015 at 01:38:58PM +0000, Ian Campbell wrote:
> > On Wed, 2015-02-25 at 11:21 +0000, Wei Liu wrote:
> > > git://xenbits.xen.org/people/liuw/xen.git wip.build-system-v3
> >
> > I think the series is now fully acked. Please could you rebase -i and
> > add the acks and push this as v4 without changing the base commit, i.e.
> > not pulling it up to current master or staging, leave it at
> > cb34a7c8d741aa447d79e1b01d71168a4088a4d7.
> >
> > Not rebasing means you do not need to retest etc and I can just git pull
> > the result.
> >
>
> git://xenbits.xen.org/people/liuw/xen.git wip.build-system-v4
Thanks. I'm going to commit this after my current test run with the OVMF
update completes.
Please can you confirm the precise changeset ID you expect me to find at
git://xenbits.xen.org/people/liuw/mini-os.git master
and to push to git://xenbits.xen.org/people/mini-os.git master as part
of this.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 0/8] Split off mini-os to a separate tree
2015-02-27 14:46 ` Ian Campbell
@ 2015-02-27 14:58 ` Wei Liu
2015-02-27 15:05 ` Ian Campbell
0 siblings, 1 reply; 21+ messages in thread
From: Wei Liu @ 2015-02-27 14:58 UTC (permalink / raw)
To: Ian Campbell
Cc: samuel.thibault, stefano.stabellini, Wei Liu, ian.jackson,
xen-devel
On Fri, Feb 27, 2015 at 02:46:58PM +0000, Ian Campbell wrote:
> On Fri, 2015-02-27 at 13:50 +0000, Wei Liu wrote:
> > On Fri, Feb 27, 2015 at 01:38:58PM +0000, Ian Campbell wrote:
> > > On Wed, 2015-02-25 at 11:21 +0000, Wei Liu wrote:
> > > > git://xenbits.xen.org/people/liuw/xen.git wip.build-system-v3
> > >
> > > I think the series is now fully acked. Please could you rebase -i and
> > > add the acks and push this as v4 without changing the base commit, i.e.
> > > not pulling it up to current master or staging, leave it at
> > > cb34a7c8d741aa447d79e1b01d71168a4088a4d7.
> > >
> > > Not rebasing means you do not need to retest etc and I can just git pull
> > > the result.
> > >
> >
> > git://xenbits.xen.org/people/liuw/xen.git wip.build-system-v4
>
> Thanks. I'm going to commit this after my current test run with the OVMF
> update completes.
>
> Please can you confirm the precise changeset ID you expect me to find at
> git://xenbits.xen.org/people/liuw/mini-os.git master
f5d9868796e91bee70601805b9bfc1bb544b0586
> and to push to git://xenbits.xen.org/people/mini-os.git master as part
^^^^^^
You don't need "people" I think?
> of this.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 0/8] Split off mini-os to a separate tree
2015-02-27 14:58 ` Wei Liu
@ 2015-02-27 15:05 ` Ian Campbell
2015-02-27 16:10 ` Wei Liu
0 siblings, 1 reply; 21+ messages in thread
From: Ian Campbell @ 2015-02-27 15:05 UTC (permalink / raw)
To: Wei Liu; +Cc: samuel.thibault, stefano.stabellini, ian.jackson, xen-devel
On Fri, 2015-02-27 at 14:58 +0000, Wei Liu wrote:
> On Fri, Feb 27, 2015 at 02:46:58PM +0000, Ian Campbell wrote:
> > On Fri, 2015-02-27 at 13:50 +0000, Wei Liu wrote:
> > > On Fri, Feb 27, 2015 at 01:38:58PM +0000, Ian Campbell wrote:
> > > > On Wed, 2015-02-25 at 11:21 +0000, Wei Liu wrote:
> > > > > git://xenbits.xen.org/people/liuw/xen.git wip.build-system-v3
> > > >
> > > > I think the series is now fully acked. Please could you rebase -i and
> > > > add the acks and push this as v4 without changing the base commit, i.e.
> > > > not pulling it up to current master or staging, leave it at
> > > > cb34a7c8d741aa447d79e1b01d71168a4088a4d7.
> > > >
> > > > Not rebasing means you do not need to retest etc and I can just git pull
> > > > the result.
> > > >
> > >
> > > git://xenbits.xen.org/people/liuw/xen.git wip.build-system-v4
> >
> > Thanks. I'm going to commit this after my current test run with the OVMF
> > update completes.
> >
> > Please can you confirm the precise changeset ID you expect me to find at
> > git://xenbits.xen.org/people/liuw/mini-os.git master
>
> f5d9868796e91bee70601805b9bfc1bb544b0586
Thanks.
> > and to push to git://xenbits.xen.org/people/mini-os.git master as part
> ^^^^^^
> You don't need "people" I think?
Correct, I removed one too few path elements. It's
git://xenbits.xen.org/mini-os.git.
Ian.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 0/8] Split off mini-os to a separate tree
2015-02-27 15:05 ` Ian Campbell
@ 2015-02-27 16:10 ` Wei Liu
0 siblings, 0 replies; 21+ messages in thread
From: Wei Liu @ 2015-02-27 16:10 UTC (permalink / raw)
To: Ian Campbell
Cc: samuel.thibault, stefano.stabellini, Wei Liu, ian.jackson,
xen-devel
On Fri, Feb 27, 2015 at 03:05:00PM +0000, Ian Campbell wrote:
> On Fri, 2015-02-27 at 14:58 +0000, Wei Liu wrote:
> > On Fri, Feb 27, 2015 at 02:46:58PM +0000, Ian Campbell wrote:
> > > On Fri, 2015-02-27 at 13:50 +0000, Wei Liu wrote:
> > > > On Fri, Feb 27, 2015 at 01:38:58PM +0000, Ian Campbell wrote:
> > > > > On Wed, 2015-02-25 at 11:21 +0000, Wei Liu wrote:
> > > > > > git://xenbits.xen.org/people/liuw/xen.git wip.build-system-v3
> > > > >
> > > > > I think the series is now fully acked. Please could you rebase -i and
> > > > > add the acks and push this as v4 without changing the base commit, i.e.
> > > > > not pulling it up to current master or staging, leave it at
> > > > > cb34a7c8d741aa447d79e1b01d71168a4088a4d7.
> > > > >
> > > > > Not rebasing means you do not need to retest etc and I can just git pull
> > > > > the result.
> > > > >
> > > >
> > > > git://xenbits.xen.org/people/liuw/xen.git wip.build-system-v4
> > >
> > > Thanks. I'm going to commit this after my current test run with the OVMF
> > > update completes.
> > >
> > > Please can you confirm the precise changeset ID you expect me to find at
> > > git://xenbits.xen.org/people/liuw/mini-os.git master
> >
> > f5d9868796e91bee70601805b9bfc1bb544b0586
>
> Thanks.
>
> > > and to push to git://xenbits.xen.org/people/mini-os.git master as part
> > ^^^^^^
> > You don't need "people" I think?
>
> Correct, I removed one too few path elements. It's
> git://xenbits.xen.org/mini-os.git.
>
I've force-pushed to my mini-os.git tree. Please now use the new hash
55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d and push it to the official
tree.
I've pushed to wip.build-system-v5, which contains 1) result of
./autogen.sh, 2) latest mini-os tree hash.
Wei.
> Ian.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 0/8] Split off mini-os to a separate tree
2015-02-25 11:21 [PATCH v3 0/8] Split off mini-os to a separate tree Wei Liu
` (8 preceding siblings ...)
2015-02-27 13:38 ` [PATCH v3 0/8] Split off mini-os to a separate tree Ian Campbell
@ 2015-02-27 16:37 ` Ian Campbell
2015-02-27 17:07 ` Ian Campbell
9 siblings, 1 reply; 21+ messages in thread
From: Ian Campbell @ 2015-02-27 16:37 UTC (permalink / raw)
To: Wei Liu; +Cc: samuel.thibault, stefano.stabellini, ian.jackson, xen-devel
On Wed, 2015-02-25 at 11:21 +0000, Wei Liu wrote:
> This is v3 of my mini-os splitting off patch series.
As xen@xenbits I ran:
$ mkdir ~/git/mini-os.git
$ cd ~/git/mini-os.git
$ git init --bare
Initialized empty Git repository in /home/xen/git/mini-os.git/
$ chgrp -R xenmaint .
$ find . -type d -exec chmod g+s {} \;
$ git config --add receive.denyNonFastForwards true
$ git config --add receive.unpackLimit 10000
$ git config --add gc.autopacklimit 25
(the last three are due to what is in xen.git/config)
Then on the machine where I usually do committing stuff I did:
$ git clone git://xenbits.xen.org/mini-os.git mini-os.git
Cloning into 'mini-os.git'...
warning: You appear to have cloned an empty repository.
$ git fetch git://xenbits.xen.org/people/liuw/mini-os.git master
remote: Counting objects: 3325, done.
remote: Compressing objects: 100% (954/954), done.
remote: Total 3325 (delta 2308), reused 3291 (delta 2282)
Receiving objects: 100% (3325/3325), 962.22 KiB | 451 KiB/s, done.
Resolving deltas: 100% (2308/2308), done.
From git://xenbits.xen.org/people/liuw/mini-os
* branch master -> FETCH_HEAD
$ git push --dry-run origin f5d9868796e91bee70601805b9bfc1bb544b0586:refs/heads/master
To ssh://xenbits.xen.org/home/xen/git/mini-os.git
* [new branch] f5d9868796e91bee70601805b9bfc1bb544b0586 -> master
However having merged wip.build-system-v4 I discovered that autogen.sh
needed to have been run half way up the merged branch.
Wei fixed this up and produced a new people/liuw/mini-os.git and
wip.build-system-v5, see <20150227161058.GE29195@zion.uk.xensource.com>.
So in mini-os.git:
$ git fetch git://xenbits.xen.org/people/liuw/mini-os.git master
remote: Counting objects: 99, done.
remote: Compressing objects: 100% (71/71), done.
remote: Total 90 (delta 19), reused 84 (delta 15)
Unpacking objects: 100% (90/90), done.
From git://xenbits.xen.org/people/liuw/mini-os
* branch master -> FETCH_HEAD
$ git rev-parse FETCH_HEAD
55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d
$ git push --dry-run origin +55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d:refs/heads/master
To ssh://xenbits.xen.org/home/xen/git/mini-os.git
+ f5d9868...55f7cd7 55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d -> master (forced update)
$ git push origin +55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d:refs/heads/master
Counting objects: 99, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (70/70), done.
Writing objects: 100% (90/90), 183.78 KiB, done.
Total 90 (delta 19), reused 86 (delta 16)
To ssh://xenbits.xen.org/home/xen/git/mini-os.git
+ f5d9868...55f7cd7 55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d -> master (forced update)
This required me to temporarily disable receive.denyNonFastForward on
the xenbits repo. It is re-enabled now.
Having done that I pulled
git://xenbits.xen.org/people/liuw/xen.git wip.build-system-v5
into my staging branch, build tested it and pushed it back out to the
xen.git#staging branch.
Phew!
Ian.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 0/8] Split off mini-os to a separate tree
2015-02-27 16:37 ` Ian Campbell
@ 2015-02-27 17:07 ` Ian Campbell
2015-03-02 10:56 ` Ian Campbell
0 siblings, 1 reply; 21+ messages in thread
From: Ian Campbell @ 2015-02-27 17:07 UTC (permalink / raw)
To: Wei Liu; +Cc: samuel.thibault, xen-devel, ian.jackson, stefano.stabellini
On Fri, 2015-02-27 at 16:37 +0000, Ian Campbell wrote:
> On Wed, 2015-02-25 at 11:21 +0000, Wei Liu wrote:
> > This is v3 of my mini-os splitting off patch series.
>
> As xen@xenbits I ran:
> $ mkdir ~/git/mini-os.git
> $ cd ~/git/mini-os.git
> $ git init --bare
> Initialized empty Git repository in /home/xen/git/mini-os.git/
> $ chgrp -R xenmaint .
> $ find . -type d -exec chmod g+s {} \;
> $ git config --add receive.denyNonFastForwards true
> $ git config --add receive.unpackLimit 10000
> $ git config --add gc.autopacklimit 25
This omitted setting up the mails to xen-staging@lists.xensource.com on
push.
Following Ian's advice to look at ~xen/release-checklist on xenbits I
have now:
xen@xenbits:~/HG/patchbot$ echo 55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d >> mini-os--master.patchbot-reported-heads
edited versions to add:
/home/xen/git mini-os.git#master xen-changelog@lists.xensource.com xen-devel@lists.xensource.com
and committed that change to the git repo in cwd.
Ian.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 0/8] Split off mini-os to a separate tree
2015-02-27 17:07 ` Ian Campbell
@ 2015-03-02 10:56 ` Ian Campbell
0 siblings, 0 replies; 21+ messages in thread
From: Ian Campbell @ 2015-03-02 10:56 UTC (permalink / raw)
To: Wei Liu; +Cc: samuel.thibault, stefano.stabellini, ian.jackson, xen-devel
On Fri, 2015-02-27 at 17:07 +0000, Ian Campbell wrote:
> On Fri, 2015-02-27 at 16:37 +0000, Ian Campbell wrote:
> > On Wed, 2015-02-25 at 11:21 +0000, Wei Liu wrote:
> > > This is v3 of my mini-os splitting off patch series.
> >
> > As xen@xenbits I ran:
> > $ mkdir ~/git/mini-os.git
> > $ cd ~/git/mini-os.git
> > $ git init --bare
> > Initialized empty Git repository in /home/xen/git/mini-os.git/
> > $ chgrp -R xenmaint .
> > $ find . -type d -exec chmod g+s {} \;
> > $ git config --add receive.denyNonFastForwards true
> > $ git config --add receive.unpackLimit 10000
> > $ git config --add gc.autopacklimit 25
>
> This omitted setting up the mails to xen-staging@lists.xensource.com on
> push.
... and omitted making xenbits.xen.org/git-http/mini-os.git as well as
pushing the tags.
I have now run "git update-server-info" in the mini-os.git and done:
$ cd /var/xenbits-www/html/git-http
$ ln -sf /home/xen/git/mini-os.git .
I've also pushed the tags below, omitting a small number of unusual
looking ones namely:
xen-beta1
xen-ia64-stable
xen-latest-semistable
xen-latest-stable
xen-semistable
xen-sparse-tree-deprecated
xen-split-1.0
xen-split-1.1
Ian.
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2015-03-02 10:56 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-25 11:21 [PATCH v3 0/8] Split off mini-os to a separate tree Wei Liu
2015-02-25 11:21 ` [PATCH v3 1/8] stubdom: fix "make build" Wei Liu
2015-02-25 11:21 ` [PATCH v3 2/8] Makefile: refactor build/clean/distclean targets Wei Liu
2015-02-25 11:21 ` [PATCH v3 3/8] stubdom: don't look for mini-os source file during configure Wei Liu
2015-02-25 11:21 ` [PATCH v3 4/8] stubdom: no need to clean mini-os Wei Liu
2015-02-25 19:31 ` Samuel Thibault
2015-02-27 13:32 ` Ian Campbell
2015-02-25 11:21 ` [PATCH v3 5/8] git-checkout.sh: use "mkdir -p" Wei Liu
2015-02-25 11:21 ` [PATCH v3 6/8] Mini-OS: standalone build Wei Liu
2015-02-25 11:21 ` [PATCH v3] build system: stubdom targets now depends on mini-os target Wei Liu
2015-02-27 13:31 ` Ian Campbell
2015-02-25 11:21 ` [PATCH v3 8/8] Remove in-tree mini-os directory Wei Liu
2015-02-27 13:38 ` [PATCH v3 0/8] Split off mini-os to a separate tree Ian Campbell
2015-02-27 13:50 ` Wei Liu
2015-02-27 14:46 ` Ian Campbell
2015-02-27 14:58 ` Wei Liu
2015-02-27 15:05 ` Ian Campbell
2015-02-27 16:10 ` Wei Liu
2015-02-27 16:37 ` Ian Campbell
2015-02-27 17:07 ` Ian Campbell
2015-03-02 10:56 ` Ian Campbell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.