[pkgsrc/trunk]: pkgsrc/sysutils/xentools415 xentools415: update for pciutils ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/sysutils/xentools415 xentools415: update for pciutils ...
From: wiz <wiz%pkgsrc.org@localhost>
Date: Fri, 13 May 2022 17:06:35 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/46f86e8b0cb1
branches:  trunk
changeset: 379260:46f86e8b0cb1
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri May 13 16:04:23 2022 +0000

description:
xentools415: update for pciutils 3.8.0

Untested because of

python3.10 ./scripts/ldnoexec.py out/rom16.o.strip.o out/rom16.noexec.o
Traceback (most recent call last):
  File "/scratch/sysutils/xentools415/work/seabios-rel-1.14.0/./scripts/ldnoexec.py", line 32, in <module>
    main()
  File "/scratch/sysutils/xentools415/work/seabios-rel-1.14.0/./scripts/ldnoexec.py", line 20, in main
    f = open(infilename, "rb")
FileNotFoundError: [Errno 2] No such file or directory: 'out/rom32seg.o.strip.o'
gmake[6]: *** [Makefile:133: out/rom32seg.noexec.o] Error 1
gmake[6]: *** Waiting for unfinished jobs....
Traceback (most recent call last):
  File "/scratch/sysutils/xentools415/work/seabios-rel-1.14.0/./scripts/ldnoexec.py", line 32, in <module>
    main()
  File "/scratch/sysutils/xentools415/work/seabios-rel-1.14.0/./scripts/ldnoexec.py", line 20, in main
    f = open(infilename, "rb")
FileNotFoundError: [Errno 2] No such file or directory: 'out/rom16.o.strip.o'
gmake[6]: *** [Makefile:133: out/rom16.noexec.o] Error 1

on -current/amd64.

Run pkglint -F while here.

diffstat:

 sysutils/xentools415/Makefile                                                   |  20 +++++----
 sysutils/xentools415/distinfo                                                   |   6 +--
 sysutils/xentools415/patches/patch-tools_qemu-xen-traditional_hw_pass-through.h |  18 ---------
 sysutils/xentools415/patches/patch-tools_qemu-xen-traditional_hw_piix4acpi.c    |  17 --------
 sysutils/xentools415/patches/patch-tools_qemu-xen-traditional_net.c             |   4 +-
 5 files changed, 16 insertions(+), 49 deletions(-)

diffs (146 lines):

diff -r 5514df2c5067 -r 46f86e8b0cb1 sysutils/xentools415/Makefile
--- a/sysutils/xentools415/Makefile     Fri May 13 15:58:54 2022 +0000
+++ b/sysutils/xentools415/Makefile     Fri May 13 16:04:23 2022 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2022/05/05 08:27:13 nia Exp $
+# $NetBSD: Makefile,v 1.13 2022/05/13 16:04:23 wiz Exp $
 #
 VERSION=       4.15.2
 
 DIST_SUBDIR=           xen415
 DISTNAME=              xen-${VERSION}
 PKGNAME=               xentools415-${VERSION}
+PKGREVISION=           1
 CATEGORIES=            sysutils
 MASTER_SITES=          https://downloads.xenproject.org/release/xen/${VERSION}/
 
@@ -17,7 +18,7 @@
 
 IPXE_VERSION=          988d2c13cdf0f0b4140685af35ced70ac5b3283c
 IPXE_DIST=             ipxe-${IPXE_VERSION}.tar.gz
-DISTFILES+=            ${IPXE_DIST}    
+DISTFILES+=            ${IPXE_DIST}
 SITES.${IPXE_DIST}=    -https://github.com/ipxe/ipxe/archive/${IPXE_VERSION}.tar.gz
 
 MAINTAINER=            bouyer%NetBSD.org@localhost
@@ -40,7 +41,7 @@
 ONLY_FOR_PLATFORM+=    NetBSD-9.0_STABLE-x86_64
 
 SSP_SUPPORTED=         no
-MKPIE_SUPPORTED=       no
+MKPIE_SUPPORTED=       no
 
 CONFLICTS+=            libxen-[0-9]*
 CONFLICTS+=            xenstoretools-[0-9]*
@@ -66,7 +67,7 @@
 MAKE_ENV+=             XEN_EXAMPLES_DIR=${EGDIR}
 MAKE_ENV+=             MV=${MV:Q} CP=${CP:Q}
 MAKE_ENV+=             PYTHON=${PYTHONBIN:Q} PYTHON_COMMAND=${PYTHONBIN:Q}
-MAKE_ENV+=             SED=${SED:Q}  
+MAKE_ENV+=             SED=${SED:Q}
 MAKE_ENV+=             V=YES
 MAKE_ENV+=             BARE_CPP="gcc -E"
 #MAKE_ENV+=            NO_WERROR=1
@@ -102,11 +103,11 @@
 SUBST_FILES.getopt+=   tools/fuzz/x86_instruction_emulator/afl-harness.c
 SUBST_SED.getopt+=     -e 's,getopt_long_only,getopt_long,'
 
-SUBST_CLASSES+=                rpath-link
-SUBST_STAGE.rpath-link=        pre-configure
-SUBST_MESSAGE.rpath-link= Fixing rpath-link syntax
-SUBST_FILES.rpath-link+= tools/Rules.mk
-SUBST_SED.rpath-link+= -e 's/-rpath-link=/-rpath-link,/g'
+SUBST_CLASSES+=                        rpath-link
+SUBST_STAGE.rpath-link=                pre-configure
+SUBST_MESSAGE.rpath-link=      Fixing rpath-link syntax
+SUBST_FILES.rpath-link+=       tools/Rules.mk
+SUBST_SED.rpath-link+=         -e 's/-rpath-link=/-rpath-link,/g'
 
 OPSYSVARS+=            PROCPATH
 PROCPATH.NetBSD=       /kern
@@ -238,6 +239,7 @@
 #.include "../../devel/SDL/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../devel/ocaml-findlib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.pciutils+=       pciutils>=3.8
 .include "../../sysutils/pciutils/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/yajl/buildlink3.mk"
diff -r 5514df2c5067 -r 46f86e8b0cb1 sysutils/xentools415/distinfo
--- a/sysutils/xentools415/distinfo     Fri May 13 15:58:54 2022 +0000
+++ b/sysutils/xentools415/distinfo     Fri May 13 16:04:23 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2022/03/04 17:54:08 bouyer Exp $
+$NetBSD: distinfo,v 1.8 2022/05/13 16:04:23 wiz Exp $
 
 BLAKE2s (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 67ded947316100f4f66fa61fe156baf1620db575450f4dc0dd8dcb323e57970b
 SHA512 (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = d888e0e653727ee9895fa866d8895e6d23a568b4e9e8439db4c4d790996700c60b0655e3a3129e599736ec2b4f7b987ce79d625ba208f06665fced8bddf94403
@@ -48,13 +48,11 @@
 SHA1 (patch-tools_qemu-xen-traditional_hw_e1000.c) = ec86584529cc743ea27768ad1fab523ee9fb6bea
 SHA1 (patch-tools_qemu-xen-traditional_hw_ide.c) = b541546390c6d142bc6079dbd51cfd65b5223e9e
 SHA1 (patch-tools_qemu-xen-traditional_hw_pass-through.c) = 45848fb5038bdd6def218b35dd0a6496a14102f1
-SHA1 (patch-tools_qemu-xen-traditional_hw_pass-through.h) = 6edb7a9a03d99b84801bf595c4d68acbc361bb4b
-SHA1 (patch-tools_qemu-xen-traditional_hw_piix4acpi.c) = 280265db035e239b173efd9d63b629201d2c0cfa
 SHA1 (patch-tools_qemu-xen-traditional_hw_pt-graphics.c) = b9c18042f40ccacb3f24ab0f1e3c6e1a5bf5521a
 SHA1 (patch-tools_qemu-xen-traditional_hw_pt-msi.c) = a953380dbc3e64528c39e26d2c45c0cbd3e4d738
 SHA1 (patch-tools_qemu-xen-traditional_hw_pt-msi.h) = 787447cc24518fe5ae16942d72d3038db612419d
 SHA1 (patch-tools_qemu-xen-traditional_i386-dm_hookstarget.mak) = 3fdfbb7c9c2243a4cf5dabc5a6dd13c12f9d5850
-SHA1 (patch-tools_qemu-xen-traditional_net.c) = 0999993172070db5dc8d7c7daaa4999a3edaadb8
+SHA1 (patch-tools_qemu-xen-traditional_net.c) = 17ca8b0ba8fca5eee277fc97373287aaf25b5dae
 SHA1 (patch-tools_qemu-xen-traditional_xen-hooks.mak) = bc59cb87742036dfa75869572b21b58dd5a2c5ee
 SHA1 (patch-tools_qemu-xen_audio_audio.c) = a1c33d8df7a15515592d5978412d02683847cce5
 SHA1 (patch-tools_qemu-xen_configure) = dc939ff397e5cd554b30d0cc9c19876470a5c2c3
diff -r 5514df2c5067 -r 46f86e8b0cb1 sysutils/xentools415/patches/patch-tools_qemu-xen-traditional_hw_pass-through.h
--- a/sysutils/xentools415/patches/patch-tools_qemu-xen-traditional_hw_pass-through.h   Fri May 13 15:58:54 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-tools_qemu-xen-traditional_hw_pass-through.h,v 1.1 2021/04/18 12:31:26 bouyer Exp $
-
---- tools/qemu-xen-traditional/hw/pass-through.h.orig  2014-10-06 17:50:24.000000000 +0200
-+++ tools/qemu-xen-traditional/hw/pass-through.h       2015-01-19 13:16:38.000000000 +0100
-@@ -20,8 +20,13 @@
- 
- #include "hw.h"
- #include "pci.h"
-+#ifdef __NetBSD__
-+#include "pciutils/header.h"
-+#include "pciutils/pci.h"
-+#else
- #include "pci/header.h"
- #include "pci/pci.h"
-+#endif
- #include "exec-all.h"
- #include "sys-queue.h"
- #include "qemu-timer.h"
diff -r 5514df2c5067 -r 46f86e8b0cb1 sysutils/xentools415/patches/patch-tools_qemu-xen-traditional_hw_piix4acpi.c
--- a/sysutils/xentools415/patches/patch-tools_qemu-xen-traditional_hw_piix4acpi.c      Fri May 13 15:58:54 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-tools_qemu-xen-traditional_hw_piix4acpi.c,v 1.1 2021/04/18 12:31:26 bouyer Exp $
-
---- tools/qemu-xen-traditional/hw/piix4acpi.c.orig     2014-10-06 17:50:24.000000000 +0200
-+++ tools/qemu-xen-traditional/hw/piix4acpi.c  2015-01-19 13:16:38.000000000 +0100
-@@ -41,8 +41,12 @@
- #define PIIX4ACPI_LOG(level, fmt, ...) do { if (level <= PIIX4ACPI_LOGLEVEL) qemu_log(fmt, ## __VA_ARGS__); } while (0)
- 
- #ifdef CONFIG_PASSTHROUGH
-+#ifdef __NetBSD__
-+#include <pciutils/header.h>
-+#else
- #include <pci/header.h>
- #endif
-+#endif
- 
- /* PM1a_CNT bits, as defined in the ACPI specification. */
- #define SCI_EN            (1 <<  0)
diff -r 5514df2c5067 -r 46f86e8b0cb1 sysutils/xentools415/patches/patch-tools_qemu-xen-traditional_net.c
--- a/sysutils/xentools415/patches/patch-tools_qemu-xen-traditional_net.c       Fri May 13 15:58:54 2022 +0000
+++ b/sysutils/xentools415/patches/patch-tools_qemu-xen-traditional_net.c       Fri May 13 16:04:23 2022 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-tools_qemu-xen-traditional_net.c,v 1.1 2021/04/18 12:31:26 bouyer Exp $
+$NetBSD: patch-tools_qemu-xen-traditional_net.c,v 1.2 2022/05/13 16:04:23 wiz Exp $
+
+
 --- tools/qemu-xen-traditional/net.c.orig      2016-11-29 17:36:38.000000000 +0100
 +++ tools/qemu-xen-traditional/net.c   2017-03-29 18:16:54.000000000 +0200
 @@ -990,6 +990,7 @@
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/threadweaver threadweaver: SunOS needs sys/loada...
Next by Date: [pkgsrc/trunk]: pkgsrc/misc/marble marble: Avoid ambiguous function call.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/threadweaver threadweaver: SunOS needs sys/loada...
Next by Thread: [pkgsrc/trunk]: pkgsrc/misc/marble marble: Avoid ambiguous function call.
Indexes:
Home | Main Index | Thread Index | Old Index