xentools413: adapt to pciutils 3.8
Untested because of ld -N -T out/romlayout32flat.lds out/rom16.strip.o out/rom32seg.strip.o out/code32flat.o -o out/rom.o ld: cannot find out/rom16.strip.o: No such file or directory ld: cannot find out/rom32seg.strip.o: No such file or directory on -current/amd64.
This commit is contained in:
parent
bb50f44d04
commit
b2a77c379c
4 changed files with 4 additions and 40 deletions
|
@ -1,11 +1,11 @@
|
|||
# $NetBSD: Makefile,v 1.27 2022/05/05 08:27:13 nia Exp $
|
||||
# $NetBSD: Makefile,v 1.28 2022/05/13 15:58:54 wiz Exp $
|
||||
#
|
||||
VERSION= 4.13.4
|
||||
|
||||
DIST_SUBDIR= xen413
|
||||
DISTNAME= xen-${VERSION}
|
||||
PKGNAME= xentools413-${VERSION}
|
||||
PKGREVISION= 2
|
||||
PKGREVISION= 3
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/
|
||||
|
||||
|
@ -236,6 +236,7 @@ MAKE_ENV+= EXTRA_HOSTCFLAGS=${EXTRA_HOSTCFLAGS:Q} EXTRA_CFLAGS=${EXTRA_CFLAGS:M*
|
|||
#.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"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: distinfo,v 1.14 2021/10/26 11:20:25 nia Exp $
|
||||
$NetBSD: distinfo,v 1.15 2022/05/13 15:58:54 wiz Exp $
|
||||
|
||||
BLAKE2s (xen413/ipxe-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz) = d2e88c1705b34d2d6ce59106702343e927686942f54b65ce047d29269fbdb393
|
||||
SHA512 (xen413/ipxe-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz) = 0d96236385d241fdddafc88e8b4dac37298f2371b0c61055b78d6ce794166559127de2c110409c55738ca16c4a9e9e1834b03f7a2de85729d0a66cf5c313c9e8
|
||||
|
@ -69,8 +69,6 @@ SHA1 (patch-tools_qemu-xen-traditional_configure) = 6a42dcac010f90439a347c0f6e88
|
|||
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
|
||||
|
|
|
@ -1,18 +0,0 @@
|
|||
$NetBSD: patch-tools_qemu-xen-traditional_hw_pass-through.h,v 1.1 2020/05/26 11:12:11 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"
|
|
@ -1,17 +0,0 @@
|
|||
$NetBSD: patch-tools_qemu-xen-traditional_hw_piix4acpi.c,v 1.1 2020/05/26 11:12:11 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)
|
Loading…
Reference in a new issue