Date: Sun, 12 Feb 2023 19:11:01 GMT From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a86dcedb5670 - main - sysutils/xen-guest-tools: update to 4.16.1 Message-ID: <202302121911.31CJB1Dw036343@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=a86dcedb567066afe92bc223cf3a8794e5bcdcee commit a86dcedb567066afe92bc223cf3a8794e5bcdcee Author: Dirk Meyer <dinoex@FreeBSD.org> AuthorDate: 2023-02-12 19:10:42 +0000 Commit: Dirk Meyer <dinoex@FreeBSD.org> CommitDate: 2023-02-12 19:10:42 +0000 sysutils/xen-guest-tools: update to 4.16.1 --- sysutils/xen-guest-tools/Makefile | 11 ++++--- sysutils/xen-guest-tools/distinfo | 6 ++-- .../xen-guest-tools/files/patch-libxl_create.c | 38 ---------------------- .../xen-guest-tools/files/patch-tools-Makefile | 14 ++++---- 4 files changed, 16 insertions(+), 53 deletions(-) diff --git a/sysutils/xen-guest-tools/Makefile b/sysutils/xen-guest-tools/Makefile index df649668fdb3..f396858c417c 100644 --- a/sysutils/xen-guest-tools/Makefile +++ b/sysutils/xen-guest-tools/Makefile @@ -1,5 +1,6 @@ PORTNAME= xen-guest-tools -PORTVERSION= 4.14.0 +#PORTVERSION= 4.14.0 +PORTVERSION= 4.16.1 PORTREVISION= 0 CATEGORIES= sysutils MASTER_SITES= https://downloads.xenproject.org/release/xen/${PORTVERSION}/ @@ -52,8 +53,8 @@ PLIST_FILES= bin/xen-detect \ bin/xenstore-rm \ bin/xenstore-watch \ bin/xenstore-write \ - lib/libxenstore.so.3.0 \ - lib/libxentoolcore.so.1 + lib/libxenstore.so.4.0 \ + lib/libxentoolcore.so.1.0 post-patch: ${REINPLACE_CMD} -e 's;=xen tools stubdom docs;=tools;' \ @@ -66,8 +67,8 @@ do-install: ${WRKSRC}/tools/xenstore/xenstore \ ${WRKSRC}/tools/xenstore/xenstore-control \ ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_LIB} ${WRKSRC}/tools/xenstore/libxenstore.so.3.0 \ - ${WRKSRC}/tools/libs/toolcore/libxentoolcore.so.1 \ + ${INSTALL_LIB} ${WRKSRC}/tools/libs/store/libxenstore.so.4.0 \ + ${WRKSRC}/tools/libs/toolcore/libxentoolcore.so.1.0 \ ${STAGEDIR}${PREFIX}/lib/ cd ${STAGEDIR}${PREFIX}/bin/ && ${LN} -f xenstore xenstore-chmod cd ${STAGEDIR}${PREFIX}/bin/ && ${LN} -f xenstore xenstore-control diff --git a/sysutils/xen-guest-tools/distinfo b/sysutils/xen-guest-tools/distinfo index f050fb2e58fd..2b8d6e09b994 100644 --- a/sysutils/xen-guest-tools/distinfo +++ b/sysutils/xen-guest-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1595603681 -SHA256 (xen-4.14.0.tar.gz) = 06839f68ea7620669dbe8b67861213223cc2a7d02ced61b56e5249c50e87f035 -SIZE (xen-4.14.0.tar.gz) = 39950576 +TIMESTAMP = 1655136459 +SHA256 (xen-4.16.1.tar.gz) = cb9fc345f9b1cd724cbb6b7724674db70175183cb9015ec991843f0375e7428a +SIZE (xen-4.16.1.tar.gz) = 44964667 diff --git a/sysutils/xen-guest-tools/files/patch-libxl_create.c b/sysutils/xen-guest-tools/files/patch-libxl_create.c deleted file mode 100644 index 40bdecc19574..000000000000 --- a/sysutils/xen-guest-tools/files/patch-libxl_create.c +++ /dev/null @@ -1,38 +0,0 @@ ---- tools/libxl/libxl_create.c.orig 2019-12-17 14:23:09 UTC -+++ tools/libxl/libxl_create.c -@@ -459,7 +459,7 @@ int libxl__domain_build(libxl__gc *gc, - vments[2] = "image/ostype"; - vments[3] = "hvm"; - vments[4] = "start_time"; -- vments[5] = GCSPRINTF("%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); -+ vments[5] = GCSPRINTF("%lu.%02d", (unsigned long)start_time.tv_sec,(int)start_time.tv_usec/10000); - - localents = libxl__calloc(gc, 13, sizeof(char *)); - i = 0; -@@ -498,7 +498,7 @@ int libxl__domain_build(libxl__gc *gc, - vments[i++] = "image/kernel"; - vments[i++] = (char *) state->pv_kernel.path; - vments[i++] = "start_time"; -- vments[i++] = GCSPRINTF("%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); -+ vments[i++] = GCSPRINTF("%lu.%02d", (unsigned long)start_time.tv_sec,(int)start_time.tv_usec/10000); - if (state->pv_ramdisk.path) { - vments[i++] = "image/ramdisk"; - vments[i++] = (char *) state->pv_ramdisk.path; -@@ -1342,7 +1342,7 @@ static void domcreate_stream_done(libxl__egc *egc, - vments[2] = "image/ostype"; - vments[3] = "hvm"; - vments[4] = "start_time"; -- vments[5] = GCSPRINTF("%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); -+ vments[5] = GCSPRINTF("%lu.%02d", (unsigned long)start_time.tv_sec,(int)start_time.tv_usec/10000); - break; - case LIBXL_DOMAIN_TYPE_PV: - vments = libxl__calloc(gc, 11, sizeof(char *)); -@@ -1352,7 +1352,7 @@ static void domcreate_stream_done(libxl__egc *egc, - vments[i++] = "image/kernel"; - vments[i++] = (char *) state->pv_kernel.path; - vments[i++] = "start_time"; -- vments[i++] = GCSPRINTF("%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); -+ vments[i++] = GCSPRINTF("%lu.%02d", (unsigned long)start_time.tv_sec,(int)start_time.tv_usec/10000); - if (state->pv_ramdisk.path) { - vments[i++] = "image/ramdisk"; - vments[i++] = (char *) state->pv_ramdisk.path; diff --git a/sysutils/xen-guest-tools/files/patch-tools-Makefile b/sysutils/xen-guest-tools/files/patch-tools-Makefile index 65025e9c1b8a..d397204e9992 100644 --- a/sysutils/xen-guest-tools/files/patch-tools-Makefile +++ b/sysutils/xen-guest-tools/files/patch-tools-Makefile @@ -1,12 +1,12 @@ ---- tools/Makefile.orig 2019-12-17 14:23:09 UTC +--- tools/Makefile.orig 2022-04-12 12:21:23 UTC +++ tools/Makefile -@@ -50,6 +50,9 @@ endif - ifeq ($(CONFIG_RUMP),y) - SUBDIRS-y := libs libxc xenstore +@@ -51,6 +51,9 @@ CROSS_SYS_ROOT ?= /usr/$(CROSS_COMPILE:-=)/sys-root + export CROSS_SYS_ROOT # exported for check/funcs.sh + export CROSS_BIN_PATH # exported for cross-install.sh endif +ifeq ($(FREEBSD_PORT),y) -+SUBDIRS-y := libs libxc xenstore misc ++SUBDIRS-y := libs xenstore misc +endif - # For the sake of linking, set the sys-root - ifneq ($(CROSS_COMPILE),) + .PHONY: build all + build all: subdirs-all
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302121911.31CJB1Dw036343>