Date: Thu, 27 Aug 2020 07:59:22 +0000 (UTC) From: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= <royger@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546327 - in head: emulators/xen-kernel emulators/xen-kernel/files sysutils/xen-tools sysutils/xen-tools/files Message-ID: <202008270759.07R7xMjD005424@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: royger (src committer) Date: Thu Aug 27 07:59:22 2020 New Revision: 546327 URL: https://svnweb.freebsd.org/changeset/ports/546327 Log: emulators/xen-kernel & sysutils/xen-tools: update to 4.14.0 Update to latest version and include a build fix for LLVM 11. Approved by: bapt (implicit) Added: head/emulators/xen-kernel/files/ head/emulators/xen-kernel/files/0001-x86-use-constant-flags-for-section-.init.rodata.patch (contents, props changed) head/sysutils/xen-tools/files/0001-x86-use-constant-flags-for-section-.init.rodata.patch (contents, props changed) Deleted: head/sysutils/xen-tools/files/0001-libfsimage-fix-clang-10-build.patch head/sysutils/xen-tools/files/0001-tools-libxl-disable-clang-indentation-check-for-the-.patch Modified: head/emulators/xen-kernel/Makefile head/emulators/xen-kernel/distinfo head/sysutils/xen-tools/Makefile head/sysutils/xen-tools/distinfo head/sysutils/xen-tools/pkg-plist Modified: head/emulators/xen-kernel/Makefile ============================================================================== --- head/emulators/xen-kernel/Makefile Thu Aug 27 07:07:42 2020 (r546326) +++ head/emulators/xen-kernel/Makefile Thu Aug 27 07:59:22 2020 (r546327) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= xen -PORTVERSION= 4.13.1 +PORTVERSION= 4.14.0 PORTREVISION= 0 CATEGORIES= emulators MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/ @@ -14,7 +14,7 @@ LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 -USES= cpe gmake python:build +USES= cpe gmake python:build bison # Ports build environment has ARCH=amd64 set which disables Xen automatic arch # detection, but amd64 is not a valid arch for Xen. Hardcode x86_64 on the @@ -24,6 +24,9 @@ NO_MTREE= yes STRIP= # PLIST_FILES= /boot/xen \ lib/debug/boot/xen.debug + +# Fix build with clang 11 +EXTRA_PATCHES+= ${PATCHDIR}/0001-x86-use-constant-flags-for-section-.init.rodata.patch:-p1 .include <bsd.port.options.mk> Modified: head/emulators/xen-kernel/distinfo ============================================================================== --- head/emulators/xen-kernel/distinfo Thu Aug 27 07:07:42 2020 (r546326) +++ head/emulators/xen-kernel/distinfo Thu Aug 27 07:59:22 2020 (r546327) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590416499 -SHA256 (xen-4.13.1.tar.gz) = b97ce363e55b12c992063f4466c43cba0a6386ceb7a747b4dc670311f337ef01 -SIZE (xen-4.13.1.tar.gz) = 39024612 +TIMESTAMP = 1598458426 +SHA256 (xen-4.14.0.tar.gz) = 06839f68ea7620669dbe8b67861213223cc2a7d02ced61b56e5249c50e87f035 +SIZE (xen-4.14.0.tar.gz) = 39950576 Added: head/emulators/xen-kernel/files/0001-x86-use-constant-flags-for-section-.init.rodata.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/xen-kernel/files/0001-x86-use-constant-flags-for-section-.init.rodata.patch Thu Aug 27 07:59:22 2020 (r546327) @@ -0,0 +1,62 @@ +From 40a95cf571242cffed8b35a7301730e2b45c217d Mon Sep 17 00:00:00 2001 +From: Roger Pau Monne <roger.pau@citrix.com> +To: xen-devel@lists.xenproject.org +Cc: Jan Beulich <jbeulich@suse.com> +Cc: Andrew Cooper <andrew.cooper3@citrix.com> +Cc: Wei Liu <wl@xen.org> +Cc: "Roger Pau Monné" <roger.pau@citrix.com> +Date: Wed, 26 Aug 2020 15:37:24 +0200 +Subject: [PATCH] x86: use constant flags for section .init.rodata +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +LLVM 11 complains with: + +<instantiation>:1:1: error: changed section flags for .init.rodata, expected: 0x2 +.pushsection .init.rodata +^ +<instantiation>:30:9: note: while in macro instantiation + entrypoint 0 + ^ +entry.S:979:9: note: while in macro instantiation + .rept 256 + ^ + +And: + +entry.S:1015:9: error: changed section flags for .init.rodata, expected: 0x2 + .section .init.rodata + ^ + +Fix it by explicitly using the same flags and type in all the +instances. + +Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> +--- + xen/arch/x86/x86_64/entry.S | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S +index 8b57a00040..1e880eb9f6 100644 +--- a/xen/arch/x86/x86_64/entry.S ++++ b/xen/arch/x86/x86_64/entry.S +@@ -967,7 +967,7 @@ GLOBAL(trap_nop) + GLOBAL(autogen_entrypoints) + /* pop into the .init.rodata section and record an entry point. */ + .macro entrypoint ent +- .pushsection .init.rodata ++ .pushsection .init.rodata, "a", @progbits + .quad \ent + .popsection + .endm +@@ -1012,5 +1012,5 @@ autogen_stubs: /* Automatically generated stubs. */ + vec = vec + 1 + .endr + +- .section .init.rodata ++ .section .init.rodata, "a", @progbits + .size autogen_entrypoints, . - autogen_entrypoints +-- +2.28.0 + Modified: head/sysutils/xen-tools/Makefile ============================================================================== --- head/sysutils/xen-tools/Makefile Thu Aug 27 07:07:42 2020 (r546326) +++ head/sysutils/xen-tools/Makefile Thu Aug 27 07:59:22 2020 (r546327) @@ -2,7 +2,7 @@ PORTNAME= xen PKGNAMESUFFIX= -tools -PORTVERSION= 4.13.1 +PORTVERSION= 4.14.0 PORTREVISION= 0 CATEGORIES= sysutils emulators MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/ @@ -27,8 +27,7 @@ OPTIONS_DEFAULT= DOCS OPTIONS_SUB= yes SPICE_DESC= Enable SPICE protocol for QEMU -SPICE_CONFIGURE_ON= --with-extra-qemuu-configure-args="--enable-spice --disable-user" -SPICE_CONFIGURE_OFF= --with-extra-qemuu-configure-args="--disable-user" +SPICE_CONFIGURE_WITH= extra-qemuu-configure-args="--enable-spice" SPICE_BUILD_DEPENDS= spice-protocol>=0.12.10:devel/spice-protocol SPICE_LIB_DEPENDS= libspice-server.so:devel/libspice-server @@ -36,7 +35,7 @@ ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= "not yet ported to anything other than amd64" USES= cpe gettext gmake gnome libtool localbase:ldflags perl5 \ - pkgconfig python shebangfix iconv + pkgconfig python shebangfix iconv bison USE_GNOME= glib20 USE_LDCONFIG= yes USE_PYTHON= py3kplist @@ -57,10 +56,8 @@ DOCS_ALL_TARGET= docs INSTALL_TARGET= install-tools DOCS_INSTALL_TARGET= install-docs -# Fix build with clang 10.0 (re convert enum constant to boolean and bad -# indentation of flex generated parser) -EXTRA_PATCHES+= ${PATCHDIR}/0001-libfsimage-fix-clang-10-build.patch:-p1 \ - ${PATCHDIR}/0001-tools-libxl-disable-clang-indentation-check-for-the-.patch:-p1 +# Fix build with clang 11 +EXTRA_PATCHES+= ${PATCHDIR}/0001-x86-use-constant-flags-for-section-.init.rodata.patch:-p1 .include <bsd.port.options.mk> @@ -93,5 +90,7 @@ do-install: post-install: ${MKDIR} ${STAGEDIR}/var/run/xen + # Empty dir, purge it. + ${RMDIR} ${STAGEDIR}/${PREFIX}/lib/xen/include .include <bsd.port.mk> Modified: head/sysutils/xen-tools/distinfo ============================================================================== --- head/sysutils/xen-tools/distinfo Thu Aug 27 07:07:42 2020 (r546326) +++ head/sysutils/xen-tools/distinfo Thu Aug 27 07:59:22 2020 (r546327) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590416499 -SHA256 (xen-4.13.1.tar.gz) = b97ce363e55b12c992063f4466c43cba0a6386ceb7a747b4dc670311f337ef01 -SIZE (xen-4.13.1.tar.gz) = 39024612 +TIMESTAMP = 1598459427 +SHA256 (xen-4.14.0.tar.gz) = 06839f68ea7620669dbe8b67861213223cc2a7d02ced61b56e5249c50e87f035 +SIZE (xen-4.14.0.tar.gz) = 39950576 Added: head/sysutils/xen-tools/files/0001-x86-use-constant-flags-for-section-.init.rodata.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/xen-tools/files/0001-x86-use-constant-flags-for-section-.init.rodata.patch Thu Aug 27 07:59:22 2020 (r546327) @@ -0,0 +1,62 @@ +From 40a95cf571242cffed8b35a7301730e2b45c217d Mon Sep 17 00:00:00 2001 +From: Roger Pau Monne <roger.pau@citrix.com> +To: xen-devel@lists.xenproject.org +Cc: Jan Beulich <jbeulich@suse.com> +Cc: Andrew Cooper <andrew.cooper3@citrix.com> +Cc: Wei Liu <wl@xen.org> +Cc: "Roger Pau Monné" <roger.pau@citrix.com> +Date: Wed, 26 Aug 2020 15:37:24 +0200 +Subject: [PATCH] x86: use constant flags for section .init.rodata +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +LLVM 11 complains with: + +<instantiation>:1:1: error: changed section flags for .init.rodata, expected: 0x2 +.pushsection .init.rodata +^ +<instantiation>:30:9: note: while in macro instantiation + entrypoint 0 + ^ +entry.S:979:9: note: while in macro instantiation + .rept 256 + ^ + +And: + +entry.S:1015:9: error: changed section flags for .init.rodata, expected: 0x2 + .section .init.rodata + ^ + +Fix it by explicitly using the same flags and type in all the +instances. + +Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> +--- + xen/arch/x86/x86_64/entry.S | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S +index 8b57a00040..1e880eb9f6 100644 +--- a/xen/arch/x86/x86_64/entry.S ++++ b/xen/arch/x86/x86_64/entry.S +@@ -967,7 +967,7 @@ GLOBAL(trap_nop) + GLOBAL(autogen_entrypoints) + /* pop into the .init.rodata section and record an entry point. */ + .macro entrypoint ent +- .pushsection .init.rodata ++ .pushsection .init.rodata, "a", @progbits + .quad \ent + .popsection + .endm +@@ -1012,5 +1012,5 @@ autogen_stubs: /* Automatically generated stubs. */ + vec = vec + 1 + .endr + +- .section .init.rodata ++ .section .init.rodata, "a", @progbits + .size autogen_entrypoints, . - autogen_entrypoints +-- +2.28.0 + Modified: head/sysutils/xen-tools/pkg-plist ============================================================================== --- head/sysutils/xen-tools/pkg-plist Thu Aug 27 07:07:42 2020 (r546326) +++ head/sysutils/xen-tools/pkg-plist Thu Aug 27 07:59:22 2020 (r546327) @@ -74,6 +74,7 @@ include/xen/hvm/ioreq.h include/xen/hvm/params.h include/xen/hvm/pvdrivers.h include/xen/hvm/save.h +include/xen/hypfs.h include/xen/io/9pfs.h include/xen/io/blkif.h include/xen/io/cameraif.h @@ -126,6 +127,7 @@ include/xenfsimage_grub.h include/xenfsimage_plugin.h include/xengnttab.h include/xenguest.h +include/xenhypfs.h include/xenstat.h include/xenstore-compat/xs.h include/xenstore-compat/xs_lib.h @@ -142,8 +144,8 @@ lib/libxencall.so.1 lib/libxencall.so.1.2 lib/libxenctrl.a lib/libxenctrl.so -lib/libxenctrl.so.4.13 -lib/libxenctrl.so.4.13.0 +lib/libxenctrl.so.4.14 +lib/libxenctrl.so.4.14.0 lib/libxendevicemodel.a lib/libxendevicemodel.so lib/libxendevicemodel.so.1 @@ -157,24 +159,28 @@ lib/libxenforeignmemory.so lib/libxenforeignmemory.so.1 lib/libxenforeignmemory.so.1.3 lib/libxenfsimage.so -lib/libxenfsimage.so.4.13 -lib/libxenfsimage.so.4.13.0 +lib/libxenfsimage.so.4.14 +lib/libxenfsimage.so.4.14.0 lib/libxengnttab.a lib/libxengnttab.so lib/libxengnttab.so.1 lib/libxengnttab.so.1.2 lib/libxenguest.a lib/libxenguest.so -lib/libxenguest.so.4.13 -lib/libxenguest.so.4.13.0 +lib/libxenguest.so.4.14 +lib/libxenguest.so.4.14.0 +lib/libxenhypfs.a +lib/libxenhypfs.so +lib/libxenhypfs.so.1 +lib/libxenhypfs.so.1.0 lib/libxenlight.a lib/libxenlight.so -lib/libxenlight.so.4.13 -lib/libxenlight.so.4.13.0 +lib/libxenlight.so.4.14 +lib/libxenlight.so.4.14.0 lib/libxenstat.a lib/libxenstat.so -lib/libxenstat.so.4.13 -lib/libxenstat.so.4.13.0 +lib/libxenstat.so.4.14 +lib/libxenstat.so.4.14.0 lib/libxenstore.a lib/libxenstore.so lib/libxenstore.so.3.0 @@ -189,8 +195,8 @@ lib/libxentoollog.so.1 lib/libxentoollog.so.1.0 lib/libxlutil.a lib/libxlutil.so -lib/libxlutil.so.4.13 -lib/libxlutil.so.4.13.0 +lib/libxlutil.so.4.14 +lib/libxlutil.so.4.14.0 %%PYTHON_SITELIBDIR%%/grub/ExtLinuxConf.py %%PYTHON_SITELIBDIR%%/grub/ExtLinuxConf.pyc %%PYTHON_SITELIBDIR%%/grub/GrubConf.py @@ -203,6 +209,7 @@ lib/libxlutil.so.4.13.0 %%PYTHON_SITELIBDIR%%/xen-3.0-py%%PYTHON_VER%%.egg-info %%PYTHON_SITELIBDIR%%/xen/__init__.py %%PYTHON_SITELIBDIR%%/xen/__init__.pyc +%%PYTHON_SITELIBDIR%%/xen/__pycache__/util.cpython-37.pyc %%PYTHON_SITELIBDIR%%/xen/lowlevel/__init__.py %%PYTHON_SITELIBDIR%%/xen/lowlevel/__init__.pyc %%PYTHON_SITELIBDIR%%/xen/lowlevel/xc.so @@ -223,6 +230,7 @@ lib/libxlutil.so.4.13.0 %%PYTHON_SITELIBDIR%%/xen/migration/verify.pyc %%PYTHON_SITELIBDIR%%/xen/migration/xl.py %%PYTHON_SITELIBDIR%%/xen/migration/xl.pyc +%%PYTHON_SITELIBDIR%%/xen/util.py %%PYTHON_SITELIBDIR%%/xenfsimage.so lib/xen/bin/convert-legacy-stream lib/xen/bin/depriv-fd-checker @@ -233,6 +241,7 @@ lib/xen/bin/qemu-edid lib/xen/bin/qemu-img lib/xen/bin/qemu-io lib/xen/bin/qemu-nbd +lib/xen/bin/qemu-storage-daemon lib/xen/bin/qemu-system-i386 lib/xen/bin/readnotes lib/xen/bin/verify-stream-v2 @@ -257,12 +266,14 @@ libdata/pkgconfig/xenevtchn.pc libdata/pkgconfig/xenforeignmemory.pc libdata/pkgconfig/xengnttab.pc libdata/pkgconfig/xenguest.pc +libdata/pkgconfig/xenhypfs.pc libdata/pkgconfig/xenlight.pc libdata/pkgconfig/xenstat.pc libdata/pkgconfig/xenstore.pc libdata/pkgconfig/xentoolcore.pc libdata/pkgconfig/xentoollog.pc libdata/pkgconfig/xlutil.pc +man/man1/xenhypfs.1.gz man/man1/xenstore-chmod.1.gz man/man1/xenstore-ls.1.gz man/man1/xenstore-read.1.gz @@ -302,6 +313,7 @@ sbin/xen-ucode sbin/xenbaked sbin/xenconsoled sbin/xencov +sbin/xenhypfs sbin/xenlockprof sbin/xenmon sbin/xenperf @@ -338,6 +350,7 @@ sbin/xl %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,hvm,params.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,hvm,pvdrivers.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,hvm,save.h.html +%%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,hypfs.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,io,9pfs.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,io,blkif.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,io,cameraif.h.html @@ -409,6 +422,7 @@ sbin/xl %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,hvm,params.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,hvm,pvdrivers.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,hvm,save.h.html +%%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,hypfs.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,io,9pfs.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,io,blkif.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,io,console.h.html @@ -479,6 +493,7 @@ sbin/xl %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,hvm,params.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,hvm,pvdrivers.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,hvm,save.h.html +%%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,hypfs.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,io,9pfs.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,io,blkif.h.html %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,io,cameraif.h.html @@ -526,6 +541,7 @@ sbin/xl %%PORTDOCS%%%%DOCSDIR%%/html/man/xen-tscmode.7.html %%PORTDOCS%%%%DOCSDIR%%/html/man/xen-vtpm.7.html %%PORTDOCS%%%%DOCSDIR%%/html/man/xen-vtpmmgr.7.html +%%PORTDOCS%%%%DOCSDIR%%/html/man/xenhypfs.1.html %%PORTDOCS%%%%DOCSDIR%%/html/man/xenstore-chmod.1.html %%PORTDOCS%%%%DOCSDIR%%/html/man/xenstore-ls.1.html %%PORTDOCS%%%%DOCSDIR%%/html/man/xenstore-read.1.html @@ -560,8 +576,6 @@ sbin/xl %%PORTDOCS%%%%DOCSDIR%%/html/misc/dump-core-format.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/grant-tables.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/index.html -%%PORTDOCS%%%%DOCSDIR%%/html/misc/kconfig-language.txt -%%PORTDOCS%%%%DOCSDIR%%/html/misc/kconfig.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/kexec_and_kdump.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/libxl_memory.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/printk-formats.txt @@ -580,6 +594,7 @@ share/qemu-xen/qemu/QEMU,cgthree.bin share/qemu-xen/qemu/QEMU,tcx.bin share/qemu-xen/qemu/bamboo.dtb share/qemu-xen/qemu/bios-256k.bin +share/qemu-xen/qemu/bios-microvm.bin share/qemu-xen/qemu/bios.bin share/qemu-xen/qemu/canyonlands.dtb share/qemu-xen/qemu/efi-e1000.rom @@ -629,13 +644,13 @@ share/qemu-xen/qemu/kvmvapic.bin share/qemu-xen/qemu/linuxboot.bin share/qemu-xen/qemu/linuxboot_dma.bin share/qemu-xen/qemu/multiboot.bin +share/qemu-xen/qemu/opensbi-riscv32-sifive_u-fw_jump.bin share/qemu-xen/qemu/openbios-ppc share/qemu-xen/qemu/openbios-sparc32 share/qemu-xen/qemu/openbios-sparc64 share/qemu-xen/qemu/palcode-clipper share/qemu-xen/qemu/petalogix-ml605.dtb share/qemu-xen/qemu/petalogix-s3adsp1800.dtb -share/qemu-xen/qemu/ppc_rom.bin share/qemu-xen/qemu/pxe-e1000.rom share/qemu-xen/qemu/pxe-eepro100.rom share/qemu-xen/qemu/pxe-ne2k_pci.rom @@ -648,7 +663,6 @@ share/qemu-xen/qemu/s390-netboot.img share/qemu-xen/qemu/sgabios.bin share/qemu-xen/qemu/skiboot.lid share/qemu-xen/qemu/slof.bin -share/qemu-xen/qemu/spapr-rtas.bin share/qemu-xen/qemu/trace-events-all share/qemu-xen/qemu/u-boot-sam460-20100605.bin share/qemu-xen/qemu/u-boot.e500
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008270759.07R7xMjD005424>