Merge pull request #1250 from kinvolk/krnowak/update-xenstore

app-emulation/xenstore: Update to 4.14.2
This commit is contained in:
Krzesimir Nowak 2021-09-03 14:28:15 +02:00 committed by GitHub
commit 61df4384ec
4 changed files with 95 additions and 41 deletions

View File

@ -1 +1 @@
DIST xen-4.4.0.tar.gz 18116578 SHA256 6910a504fe2ffe8db0e7a44756ce1c4c95e1ccbef942a1fc8da27aced5aac021 SHA512 84bc293415b8ce9686240b0145a92be190cdd7032c66b5b07906baacbfeb33ad1e6148336e951fd4506b7f4e0b250937c702226c0207d7088a50e643bedabd17 WHIRLPOOL 87886cc83bf1eaaf5dd5b67d7cc82823d98dd9b4b47c0a178ea70ee2367c1a4a142aa66df13f58603840d0e310fb5c09dc0d5b87f6361c934e1c83c95d09d406
DIST xen-4.14.2.tar.gz 39973157 BLAKE2B db5d3570f79e0fd97872f5e5dd57a4eb39e005728387bfef3b51fabe1c693cfd8108d09b1026f5a5a7eb79de71be6f4af36d252f7e0b35a65a1567b7949e3e29 SHA512 83c9333b70dbee3e29c6bf08e5ad030676e6c4a32b976f3f5e6a8f8d0dd9e4898bac88dd8e1c9d2ad3509cebb5d212e1745f9392a469d7afeb841d79801ccf39

View File

@ -1,30 +1,18 @@
# Prefix and install folder
prefix := /usr
PREFIX := $(prefix)
exec_prefix := ${prefix}
libdir := ${exec_prefix}/lib
LIBDIR := $(libdir)
# A debug build of tools?
debug := n
# Tools path
BISON :=
FLEX :=
PYTHON :=
PYTHON := # overridden in ebuild
PYTHON_PATH :=
PERL :=
CURL_CONFIG :=
XML2_CONFIG :=
PY_NOOPT_CFLAGS :=
PERL := # overridden in ebuild
BASH :=
XGETTTEXT :=
AS86 :=
LD86 :=
BCC :=
IASL :=
AWK := # overridden in ebuild
FETCHER :=
SEABIOS_PATH :=
OVMF_PATH :=
# Extra folder for libs/includes
PREPEND_INCLUDES :=
@ -38,30 +26,47 @@ PTHREAD_LIBS :=
PTYFUNCS_LIBS :=
LIBNL3_LIBS :=
LIBNL3_CFLAGS :=
XEN_TOOLS_RPATH := n
# Download GIT repositories via HTTP or GIT's own protocol?
# GIT's protocol is faster and more robust, when it works at all (firewalls
# may block it). We make it the default, but if your GIT repository downloads
# fail or hang, please specify GIT_HTTP=y in your environment.
GIT_HTTP := n
# fail or hang, please pass --enable-githttp to configure.
GIT_HTTP ?= n
# Optional components
XENSTAT_XENTOP := n
LIBXENAPI_BINDINGS := n
OCAML_TOOLS := n
FLASK_POLICY := n
FLASK_POLICY := y # TODO
CONFIG_OVMF := n
CONFIG_ROMBIOS := n
CONFIG_SEABIOS := n
CONFIG_IPXE := n
CONFIG_QEMU_TRAD := n
CONFIG_QEMU_XEN := n
CONFIG_XEND := n
CONFIG_BLKTAP1 := n
CONFIG_QEMUU_EXTRA_ARGS :=
CONFIG_LIBNL := n
CONFIG_GOLANG := n
CONFIG_SYSTEMD := n
SYSTEMD_CFLAGS :=
SYSTEMD_LIBS :=
XEN_SYSTEMD_DIR :=
XEN_SYSTEMD_MODULES_LOAD :=
CONFIG_9PFS :=
LINUX_BACKEND_MODULES :=
#System options
ZLIB :=
CONFIG_LIBICONV := n
CONFIG_GCRYPT := n
EXTFS_LIBS :=
CURSES_LIBS :=
TINFO_LIBS :=
ARGP_LDFLAGS :=
FILE_OFFSET_BITS :=
CONFIG_PV_SHIM := n

View File

@ -1,18 +1,36 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* Enabling support partial device tree in libxl */
/* #undef ENABLE_PARTIAL_DEVICE_TREE */
/* Define to 1 if you have the declaration of `fdt_first_subnode', and to 0 if
you don't. */
/* #undef HAVE_DECL_FDT_FIRST_SUBNODE */
/* Define to 1 if you have the declaration of `fdt_next_subnode', and to 0 if
you don't. */
/* #undef HAVE_DECL_FDT_NEXT_SUBNODE */
/* Define to 1 if you have the declaration of `fdt_property_u32', and to 0 if
you don't. */
/* #undef HAVE_DECL_FDT_PROPERTY_U32 */
/* Define to 1 if you have the `fdt_first_subnode' function. */
/* #undef HAVE_FDT_FIRST_SUBNODE */
/* Define to 1 if you have the `fdt_next_subnode' function. */
/* #undef HAVE_FDT_NEXT_SUBNODE */
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
/* Define to 1 if you have the `aio' library (-laio). */
/* #undef HAVE_LIBAIO */
/* Define to 1 if you have the `crypto' library (-lcrypto). */
/* #undef HAVE_LIBCRYPTO */
/* Define to 1 if you have the `fdt' library (-lfdt). */
/* #undef HAVE_LIBFDT */
/* Define to 1 if you have the `lzma' library (-llzma). */
/* #undef HAVE_LIBLZMA */
/* Define to 1 if you have the `yajl' library (-lyajl). */
/* #undef HAVE_LIBYAJL */
@ -25,6 +43,9 @@
/* Qemu traditional enabled */
/* #undef HAVE_QEMU_TRADITIONAL */
/* ROMBIOS enabled */
/* #undef HAVE_ROMBIOS */
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
@ -37,6 +58,9 @@
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
/* Systemd available and enabled */
/* #undef HAVE_SYSTEMD */
/* Define to 1 if you have the <sys/eventfd.h> header file. */
#define HAVE_SYS_EVENTFD_H 1
@ -49,6 +73,12 @@
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
/* Define to 1 if you have the <utmp.h> header file. */
#define HAVE_UTMP_H 1
/* Define to 1 if you have the <valgrind/memcheck.h> header file. */
/* #undef HAVE_VALGRIND_MEMCHECK_H */
/* Define to 1 if you have the <yajl/yajl_version.h> header file. */
/* #undef HAVE_YAJL_YAJL_VERSION_H */
@ -61,6 +91,12 @@
/* libutil header file name */
/* #undef INCLUDE_LIBUTIL_H */
/* IPXE path */
/* #undef IPXE_PATH */
/* OVMF path */
/* #undef OVMF_PATH */
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "xen-devel@lists.xen.org"
@ -68,7 +104,7 @@
#define PACKAGE_NAME "Xen Hypervisor Tools"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "Xen Hypervisor Tools 4.4"
#define PACKAGE_STRING "Xen Hypervisor Tools 4.14"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xen"
@ -77,14 +113,20 @@
#define PACKAGE_URL "http://www.xen.org/"
/* Define to the version of this package. */
#define PACKAGE_VERSION "4.4"
#define PACKAGE_VERSION "4.14"
/* Qemu Xen path */
/* #undef QEMU_XEN_PATH */
/* SeaBIOS path */
/* #undef SEABIOS_PATH */
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* QMP proxy path */
/* #undef STUBDOM_QMP_PROXY_PATH */
/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1

View File

@ -4,7 +4,7 @@
EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_COMPAT=( python3_6 )
inherit multilib python-any-r1 systemd toolchain-funcs
@ -12,15 +12,18 @@ MY_PV=${PV/_/-}
S="${WORKDIR}/xen-${MY_PV}"
DESCRIPTION="Xen's xenstore client utility"
HOMEPAGE="http://xen.org/"
SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz"
HOMEPAGE="https://www.xenproject.org"
SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ~x86"
IUSE=""
DEPEND="${PYTHON_DEPS}"
DEPEND="
${PYTHON_DEPS}
dev-lang/perl
"
RDEPEND=""
pkg_setup() {
@ -44,7 +47,6 @@ pkg_setup() {
}
src_prepare() {
sed -e '/^CFLAGS += -Werror$/d' tools/xenstore/Makefile || die
cp "${FILESDIR}"/config.h tools/ || die
cp "${FILESDIR}"/Tools.mk config/ || die
}
@ -55,21 +57,26 @@ src_configure() {
src_compile() {
local opts=(
V=1
prefix="/usr"
libdir="/usr/$(get_libdir)"
AR="$(tc-getAR)"
AWK='awk'
CC="$(tc-getCC)"
LD="$(tc-getLD)"
AR="$(tc-getAR)"
PERL='perl'
PYTHON="${PYTHON}"
RANLIB="$(tc-getRANLIB)"
libdir="/usr/$(get_libdir)"
)
)
unset LDFLAGS
unset CFLAGS
emake "${opts[@]}" -C tools/include all
emake "${opts[@]}" -C tools/libs/toolcore all
emake "${opts[@]}" -C tools/xenstore clients
}
src_install() {
dolib.so tools/libs/toolcore/libxentoolcore.so*
dolib.so tools/xenstore/libxenstore.so*
dobin tools/xenstore/xenstore