mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
Branch Xen 4.9: Make staging be an unstable branch
Config.mk
MINIOS_UPSTREAM_REVISION } changed from tag to equivalent
QEMU_TRADITIONAL_REVISION } specific commit hash
QEMU_UPSTREAM_REVISION now tracking master again
README, xen/Makefile
Update version number
*/configure
Reran autoconf; only change is version number
tools/Rules.mk, xen/Kconfig.debug
Enable debug.
Reverts 229ff3125b "Use non-debug build for Xen 4.9".
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
This commit is contained in:
Ian Jackson authored and Ian Jackson committed
1 parent
876800d5f9
commit
b3bbdc96e0
9 files changed
+49
-49
No files matched your search
@@ -268,8 +268,8 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
|
||||
MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
|
||||
endif
|
||||
OVMF_UPSTREAM_REVISION ?= 5920a9d16b1ab887c2858224316a98e961d71b05
|
||||
QEMU_UPSTREAM_REVISION ?= qemu-xen-4.9.0-rc1
|
||||
MINIOS_UPSTREAM_REVISION ?= xen-4.9.0-rc1.2
|
||||
QEMU_UPSTREAM_REVISION ?= master
|
||||
MINIOS_UPSTREAM_REVISION ?= ca013fa9baf92f47469ba1f2e1aaa31c41d8a0bb
|
||||
# Tue Dec 13 15:02:02 2016 +0000
|
||||
# build: prepend OBJ_DIR to linker script
|
||||
|
||||
@@ -280,7 +280,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.10.0
|
||||
ETHERBOOT_NICS ?= rtl8139 8086100e
|
||||
|
||||
|
||||
QEMU_TRADITIONAL_REVISION ?= xen-4.9.0-rc1
|
||||
QEMU_TRADITIONAL_REVISION ?= 8051789e982499050680a26febeada7467e18a8d
|
||||
# Thu Mar 9 11:14:55 2017 +0000
|
||||
# cirrus/vnc: zap drop bitblit support from console code.
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
#################################
|
||||
__ __ _ _ ___
|
||||
\ \/ /___ _ __ | || | / _ \ _ __ ___
|
||||
\ // _ \ '_ \ | || || (_) |_____| '__/ __|
|
||||
/ \ __/ | | | |__ _\__, |_____| | | (__
|
||||
/_/\_\___|_| |_| |_|(_)/_/ |_| \___|
|
||||
|
||||
__ __ _ _ _ ___
|
||||
\ \/ /___ _ __ | || | / |/ _ \ _ __ _ __ ___
|
||||
\ // _ \ '_ \ | || |_ | | | | |_____| '_ \| '__/ _ \
|
||||
/ \ __/ | | | |__ _|| | |_| |_____| |_) | | | __/
|
||||
/_/\_\___|_| |_| |_|(_)_|\___/ | .__/|_| \___|
|
||||
|_|
|
||||
#################################
|
||||
|
||||
http://www.xen.org/
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for Xen Hypervisor 4.9.
|
||||
# Generated by GNU Autoconf 2.69 for Xen Hypervisor 4.10.
|
||||
#
|
||||
# Report bugs to <xen-devel@lists.xen.org>.
|
||||
#
|
||||
@@ -579,8 +579,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='Xen Hypervisor'
|
||||
PACKAGE_TARNAME='xen'
|
||||
PACKAGE_VERSION='4.9'
|
||||
PACKAGE_STRING='Xen Hypervisor 4.9'
|
||||
PACKAGE_VERSION='4.10'
|
||||
PACKAGE_STRING='Xen Hypervisor 4.10'
|
||||
PACKAGE_BUGREPORT='xen-devel@lists.xen.org'
|
||||
PACKAGE_URL='http://www.xen.org/'
|
||||
|
||||
@@ -1222,7 +1222,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures Xen Hypervisor 4.9 to adapt to many kinds of systems.
|
||||
\`configure' configures Xen Hypervisor 4.10 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -1287,7 +1287,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of Xen Hypervisor 4.9:";;
|
||||
short | recursive ) echo "Configuration of Xen Hypervisor 4.10:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1383,7 +1383,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
Xen Hypervisor configure 4.9
|
||||
Xen Hypervisor configure 4.10
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@@ -1400,7 +1400,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by Xen Hypervisor $as_me 4.9, which was
|
||||
It was created by Xen Hypervisor $as_me 4.10, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@@ -2828,7 +2828,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by Xen Hypervisor $as_me 4.9, which was
|
||||
This file was extended by Xen Hypervisor $as_me 4.10, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -2882,7 +2882,7 @@ _ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
Xen Hypervisor config.status 4.9
|
||||
Xen Hypervisor config.status 4.10
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
Vendored
+9
-9
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for Xen Hypervisor Documentation 4.9.
|
||||
# Generated by GNU Autoconf 2.69 for Xen Hypervisor Documentation 4.10.
|
||||
#
|
||||
# Report bugs to <xen-devel@lists.xen.org>.
|
||||
#
|
||||
@@ -579,8 +579,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='Xen Hypervisor Documentation'
|
||||
PACKAGE_TARNAME='xen'
|
||||
PACKAGE_VERSION='4.9'
|
||||
PACKAGE_STRING='Xen Hypervisor Documentation 4.9'
|
||||
PACKAGE_VERSION='4.10'
|
||||
PACKAGE_STRING='Xen Hypervisor Documentation 4.10'
|
||||
PACKAGE_BUGREPORT='xen-devel@lists.xen.org'
|
||||
PACKAGE_URL='http://www.xen.org/'
|
||||
|
||||
@@ -1212,7 +1212,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures Xen Hypervisor Documentation 4.9 to adapt to many kinds of systems.
|
||||
\`configure' configures Xen Hypervisor Documentation 4.10 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -1273,7 +1273,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of Xen Hypervisor Documentation 4.9:";;
|
||||
short | recursive ) echo "Configuration of Xen Hypervisor Documentation 4.10:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1370,7 +1370,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
Xen Hypervisor Documentation configure 4.9
|
||||
Xen Hypervisor Documentation configure 4.10
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@@ -1387,7 +1387,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by Xen Hypervisor Documentation $as_me 4.9, which was
|
||||
It was created by Xen Hypervisor Documentation $as_me 4.10, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@@ -2838,7 +2838,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by Xen Hypervisor Documentation $as_me 4.9, which was
|
||||
This file was extended by Xen Hypervisor Documentation $as_me 4.10, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -2892,7 +2892,7 @@ _ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
Xen Hypervisor Documentation config.status 4.9
|
||||
Xen Hypervisor Documentation config.status 4.10
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
Vendored
+9
-9
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for Xen Hypervisor Stub Domains 4.9.
|
||||
# Generated by GNU Autoconf 2.69 for Xen Hypervisor Stub Domains 4.10.
|
||||
#
|
||||
# Report bugs to <xen-devel@lists.xen.org>.
|
||||
#
|
||||
@@ -579,8 +579,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='Xen Hypervisor Stub Domains'
|
||||
PACKAGE_TARNAME='xen'
|
||||
PACKAGE_VERSION='4.9'
|
||||
PACKAGE_STRING='Xen Hypervisor Stub Domains 4.9'
|
||||
PACKAGE_VERSION='4.10'
|
||||
PACKAGE_STRING='Xen Hypervisor Stub Domains 4.10'
|
||||
PACKAGE_BUGREPORT='xen-devel@lists.xen.org'
|
||||
PACKAGE_URL='http://www.xen.org/'
|
||||
|
||||
@@ -1250,7 +1250,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures Xen Hypervisor Stub Domains 4.9 to adapt to many kinds of systems.
|
||||
\`configure' configures Xen Hypervisor Stub Domains 4.10 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -1315,7 +1315,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of Xen Hypervisor Stub Domains 4.9:";;
|
||||
short | recursive ) echo "Configuration of Xen Hypervisor Stub Domains 4.10:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1425,7 +1425,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
Xen Hypervisor Stub Domains configure 4.9
|
||||
Xen Hypervisor Stub Domains configure 4.10
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@@ -1480,7 +1480,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by Xen Hypervisor Stub Domains $as_me 4.9, which was
|
||||
It was created by Xen Hypervisor Stub Domains $as_me 4.10, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@@ -4178,7 +4178,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by Xen Hypervisor Stub Domains $as_me 4.9, which was
|
||||
This file was extended by Xen Hypervisor Stub Domains $as_me 4.10, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -4232,7 +4232,7 @@ _ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
Xen Hypervisor Stub Domains config.status 4.9
|
||||
Xen Hypervisor Stub Domains config.status 4.10
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@ CFLAGS_xeninclude = -I$(XEN_INCLUDE)
|
||||
XENSTORE_XENSTORED ?= y
|
||||
|
||||
# A debug build of tools?
|
||||
debug ?= n
|
||||
debug ?= y
|
||||
debug_symbols ?= $(debug)
|
||||
|
||||
# Set CONFIG_GOLANG=y in .config (or in make) to build golang
|
||||
|
||||
Vendored
+9
-9
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for Xen Hypervisor Tools 4.9.
|
||||
# Generated by GNU Autoconf 2.69 for Xen Hypervisor Tools 4.10.
|
||||
#
|
||||
# Report bugs to <xen-devel@lists.xen.org>.
|
||||
#
|
||||
@@ -580,8 +580,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='Xen Hypervisor Tools'
|
||||
PACKAGE_TARNAME='xen'
|
||||
PACKAGE_VERSION='4.9'
|
||||
PACKAGE_STRING='Xen Hypervisor Tools 4.9'
|
||||
PACKAGE_VERSION='4.10'
|
||||
PACKAGE_STRING='Xen Hypervisor Tools 4.10'
|
||||
PACKAGE_BUGREPORT='xen-devel@lists.xen.org'
|
||||
PACKAGE_URL='http://www.xen.org/'
|
||||
|
||||
@@ -1394,7 +1394,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures Xen Hypervisor Tools 4.9 to adapt to many kinds of systems.
|
||||
\`configure' configures Xen Hypervisor Tools 4.10 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -1459,7 +1459,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of Xen Hypervisor Tools 4.9:";;
|
||||
short | recursive ) echo "Configuration of Xen Hypervisor Tools 4.10:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1649,7 +1649,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
Xen Hypervisor Tools configure 4.9
|
||||
Xen Hypervisor Tools configure 4.10
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@@ -2064,7 +2064,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by Xen Hypervisor Tools $as_me 4.9, which was
|
||||
It was created by Xen Hypervisor Tools $as_me 4.10, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@@ -10228,7 +10228,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by Xen Hypervisor Tools $as_me 4.9, which was
|
||||
This file was extended by Xen Hypervisor Tools $as_me 4.10, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -10291,7 +10291,7 @@ _ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
Xen Hypervisor Tools config.status 4.9
|
||||
Xen Hypervisor Tools config.status 4.10
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ menu "Debugging Options"
|
||||
|
||||
config DEBUG
|
||||
bool "Developer Checks"
|
||||
default n
|
||||
default y
|
||||
---help---
|
||||
If you say Y here this will enable developer checks such as asserts
|
||||
and extra printks. This option is intended for development purposes
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
# This is the correct place to edit the build version.
|
||||
# All other places this is stored (eg. compile.h) should be autogenerated.
|
||||
export XEN_VERSION = 4
|
||||
export XEN_SUBVERSION = 9
|
||||
export XEN_EXTRAVERSION ?= -rc$(XEN_VENDORVERSION)
|
||||
export XEN_SUBVERSION = 10
|
||||
export XEN_EXTRAVERSION ?= -pre$(XEN_VENDORVERSION)
|
||||
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
|
||||
-include xen-version
|
||||
|
||||
|
||||