Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.

fix xen build #691

Merged
merged 1 commit into from
Dec 13, 2017
Merged

fix xen build #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion cmd/hyperd/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ else
XEN_BUILD_TAG=
endif

if WITH_XEN490
XEN490_BUILD_TAG=with_xen490
else
XEN490_BUILD_TAG=
endif

if WITH_LIBVIRT
LIBVIRT_BUILD_TAG=with_libvirt
else
Expand All @@ -20,7 +26,7 @@ else
BTRFS_BUILD_TAG=exclude_graphdriver_btrfs
endif

HYPER_BULD_TAGS=$(XEN_BUILD_TAG) $(LIBVIRT_BUILD_TAG) $(BTRFS_BUILD_TAG) libdm_no_deferred_remove
HYPER_BULD_TAGS=$(XEN_BUILD_TAG) $(XEN490_BUILD_TAG) $(LIBVIRT_BUILD_TAG) $(BTRFS_BUILD_TAG) libdm_no_deferred_remove

all-local: build-hyperd
clean-local:
Expand Down
12 changes: 12 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,23 @@ if test "x$with_xen" != "xno" ; then
fi
fi

XEN_REQUIRED="4.5.0"
XENPV_REQUIRED="4.9.0"

if test "$with_xen" = yes; then
PKG_CHECK_MODULES([xen_4_5], [xenlight >= $XEN_REQUIRED], [with_xen=yes], [with_xen=no])
PKG_CHECK_MODULES([xen_4_9], [xenlight >= $XENPV_REQUIRED], [with_xen490=yes], [with_xen490=no])
fi

if test "x$with_xen" != "xno" ; then
AC_DEFINE_UNQUOTED([WITH_XEN], 1, [run hyperd with xen])
fi
if test "$with_xen490" = yes ; then
AC_DEFINE_UNQUOTED([WITH_XEN490], 1, [run hyperd with xen 4.9 or above])
fi

AM_CONDITIONAL([WITH_XEN], [test "x$with_xen" == "xyes"])
AM_CONDITIONAL([WITH_XEN490], [test "x$with_xen490" == "xyes"])

AC_ARG_WITH([btrfs],
[AS_HELP_STRING([--without-btrfs],
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/hyperhq/runv/hypervisor/xen/xen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/hyperhq/runv/hypervisor/xenpv/xenpv.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/hyperhq/runv/hypervisor/xenpv/xenpv_unsupported.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion vendor/github.com/hyperhq/runv/lib/runvxenlight/xenlight-runv.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/github.com/hyperhq/runv/lib/runvxenlight/xenlight.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

114 changes: 57 additions & 57 deletions vendor/vendor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1568,186 +1568,186 @@
"checksumSHA1": "2rOMU1jsBgWtKRLFh+tEYa0vaL8=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/api",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "wFyDRfp6kJA2BShtXVWPeGyj+Ps=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/driverloader",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "aHQAAMaJml761CWlShRPE0Mwml0=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/factory",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "3fMRgjly6yNBVu+dK3+VAkA2Ijg=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/factory/base",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "J0IhP6X/2ANAFulzfrZS3iPvlHE=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/factory/cache",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "UHG4MbKQ0dmsey/0GCGJ1mKZXGs=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/factory/direct",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "bGB2GrgGdR8tyqF7GM8t48txGrc=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/factory/multi",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "+8eZZ1W/dXadDmGjxRlMVyWgBt0=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/factory/single",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "QZkg1cUoP5dQS+rUuxdK5i/ODpc=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/factory/template",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "8rV+9nt3qhy4XEpGjbRmEtr2la0=",
"path": "github.com/hyperhq/runv/hyperstart/api/grpc",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "sJ5xs77rBgllVL/MD/bvI+b7/h4=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/hyperstart/api/json",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "JsbbJ+k0/ea1iGwAen6FTk/X+K4=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/hyperstart/libhyperstart",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "GlObnSRNDebB/k2EGy41DJtaBxo=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/hypervisor",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "DaLJKlWX3iOBTKB3MkUkjpAukjQ=",
"path": "github.com/hyperhq/runv/hypervisor/kvmtool",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "okA/7FuYR2LuVKwcL9CqPA3KG24=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/hypervisor/libvirt",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "0F/kCIv6AEoMgspdc8M2HQ/E9kI=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/hypervisor/network",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "YAUAfc2PYReSINQp6X3xClJJpgs=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/hypervisor/network/ipallocator",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "HyVxv1kfjeTv7d8Hdp+SeKilCNM=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/hypervisor/qemu",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "VmDDbCJSPMIWY5lXZpnvhDg37ZU=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/hypervisor/types",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "J/CY70dnKlroX0gdp+tsm03Js74=",
"checksumSHA1": "XRLDHlpB5V/bio+COzUlE5koWOc=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/hypervisor/xen",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "mAwQvTLUddHCvhQqcjZL7B6LLAQ=",
"checksumSHA1": "lNqKiyZqBLPCiMEn0YPqenJNxmE=",
"path": "github.com/hyperhq/runv/hypervisor/xenpv",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "M1iIBMiWpEau3FlsFo7cLaFnrzw=",
"checksumSHA1": "MCx6951ORoC7keC+BCd0lKz043o=",
"path": "github.com/hyperhq/runv/lib/runvxenlight",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "d0GuiUdHWWWsd8l8cfzAntU8AYw=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/lib/telnet",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "EG1PoTyBE8u4bZvfCt7wKvqc6bU=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/lib/term",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "mH0iqGEPUDRfFqRvSwtB4/gmPek=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/lib/utils",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "qVEK/HSC/OfWvcecGBs5N7BPlvg=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/lib/vsock",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"checksumSHA1": "QM2n1Mp0ZueSkAuMQvOF2kih9L8=",
"comment": "v0.8.0-21-g2ff5bd5",
"path": "github.com/hyperhq/runv/template",
"revision": "b761a8c0aba5abc5aa672a327d97d001c17f62fa",
"revisionTime": "2017-11-09T04:03:45Z"
"revision": "d5f31bde39e8c8f2de5d176421b7b18313828345",
"revisionTime": "2017-12-13T06:53:04Z"
},
{
"comment": "0.2.2-6-g50d4dbd",
Expand Down