|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen master] Merge branch 'wip.build-system-v5' of git://xenbits.xen.org/people/liuw/xen into staging
commit 226db8c65525e341bd94f5359b1d48aa81b9057f
Merge: d568f5b668b19b8f257dc60eb3252b74bf70ec10
7280bb923ad9853f541207f8e1aa1b4f1c513c91
Author: Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Fri Feb 27 16:20:27 2015 +0000
Commit: Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Fri Feb 27 16:20:27 2015 +0000
Merge branch 'wip.build-system-v5' of git://xenbits.xen.org/people/liuw/xen
into staging
Conflicts:
Config.mk
ijc -- resolved trivial conflict with 6dacedd707c2 "tools: update
seabios rel-1.8.0"
.gitignore | 7 +-
Config.mk | 6 +
Makefile | 71 +-
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 | 2 +-
stubdom/configure.ac | 2 +-
tools/misc/mktarball | 4 +-
159 files changed, 83 insertions(+), 24027 deletions(-)
diff --cc Config.mk
index 811485a,109f1f1..c0c0775
--- a/Config.mk
+++ b/Config.mk
@@@ -250,12 -251,17 +251,17 @@@ OVMF_UPSTREAM_URL ?= git://xenbits.xen.
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
+OVMF_UPSTREAM_REVISION ?= a065efc7c7ce8bb3e5cb3e463099d023d4a92927
QEMU_UPSTREAM_REVISION ?= master
+ MINIOS_UPSTREAM_REVISION ?= 55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d
+ # 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.
+SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0
+# Wed Feb 18 12:49:59 2015 -0500
+# docs: Note v1.8.0 release
ETHERBOOT_NICS ?= rtl8139 8086100e
--
generated by git-patchbot for /home/xen/git/xen.git#master
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |