Re: Import sysutils/u-boot/octeon and devel/mips-elf

Please s/Copys/Copies/ in binutils (I've already fixed it in others in
the tree).

I assume the patches.bk dir is an old backup and should be removed?

Otherwise ok



On 2026/07/13 12:58, Kirill A. Korinsky wrote:
> On Thu, 18 Jun 2026 03:16:00 +0200,
> Kirill A. Korinsky <[email protected]> wrote:
> > 
> > ports@,
> > 
> > I'd like to import sysutils/u-boot/octeon which builds u-boot for Cavium
> > Octeon III / EBB7304 EVK, which can be used in qemu mips64 with some love.
> > 
> > To build it I need also devel/mips-elf which contains binutils, gcc and
> > newlib.
> > 
> > As baseline I've used devel/riscv-elf.
> > 
> > It was tested on -current/amd64 to build with my hacky work-in-progress qemu
> > octeon3 machine which actually can boot that u-boot as bios which is here:
> > https://github.com/catap/qemu/tree/octeon
> > 
> > Ok to import?
> > 
> 
> I still would like to import this.
> 
> This time I attached tgz which artifacts which I'd like to import and diff
> for qemu port to easy test it. I won't plan to commit that diff but if
> anyone willing to test qemu octeon3 machine, it can be done by this diff.
> 
> Machine needs netwrok and e1000 works fine and usb-storage as disk, and
> u-boot should be used as bios.
> 
> It is stable to work with -accel tcg,thread=multi for multiple days long
> build of gcc-16.1.0 with -smp 16 and -m 16G
> 
> The machine also boots a recovery u-boot EdgeRouter Infinity, so more or
> less it sane.
> 
> Anyway, anyone willing to ok to import devel/mips-elf and sysutils/u-boot/octeon?
> 
> -- 
> wbr, Kirill


> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
> diff -u -p -r1.263 Makefile
> --- Makefile	15 Jun 2026 00:26:21 -0000	1.263
> +++ Makefile	13 Jul 2026 10:37:46 -0000
> @@ -6,11 +6,12 @@ USE_NOBTCFI=	Yes
>  COMMENT-main=	multi system emulator
>  COMMENT-ga=	QEMU guest agent
>  
> -VERSION=	11.0.1
> -REVISION-main=	0
> +# switched to https://github.com/catap/qemu/tree/octeon
> +# commit 02cb88cc615af16709658bdbe35de6bc3c9f7fb6
> +VERSION=	11.0.50.20260713
>  DISTNAME=	qemu-${VERSION}
>  CATEGORIES=	emulators
> -SITES=		https://download.qemu.org/
> +SITES=		https://kirill.korins.ky/pub/distfiles/
>  EXTRACT_SUFX=	.tar.xz
>  
>  HOMEPAGE=	https://www.qemu.org/
> Index: distinfo
> ===================================================================
> RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
> diff -u -p -r1.87 distinfo
> --- distinfo	29 May 2026 15:55:47 -0000	1.87
> +++ distinfo	13 Jul 2026 10:38:04 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (qemu-11.0.1.tar.xz) = DSNfWCAnjZFKMVXsJ6+OQljWl+qJKJVXCAfWnAy4zWQ=
> -SIZE (qemu-11.0.1.tar.xz) = 141368572
> +SHA256 (qemu-11.0.50.20260713.tar.xz) = 1qyEA2G8MgkW5srn0GV1szZc9spklp/wIFY9GMznh94=
> +SIZE (qemu-11.0.50.20260713.tar.xz) = 145085516
> Index: patches/patch-tests_qtest_meson_build
> ===================================================================
> RCS file: patches/patch-tests_qtest_meson_build
> diff -N patches/patch-tests_qtest_meson_build
> --- patches/patch-tests_qtest_meson_build	29 May 2026 15:55:47 -0000	1.4
> +++ /dev/null	1 Jan 1970 00:00:00 -0000
> @@ -1,18 +0,0 @@
> -Index: tests/qtest/meson.build
> ---- tests/qtest/meson.build.orig
> -+++ tests/qtest/meson.build
> -@@ -405,14 +405,6 @@ qtests = {
> -   'netdev-socket': files('netdev-socket.c', '../unit/socket-helpers.c'),
> - }
> - 
> --if vnc.found()
> --  gvnc = dependency('gvnc-1.0', method: 'pkg-config', required: false)
> --  if gvnc.found()
> --    qtests += {'vnc-display-test': [gvnc, keymap_targets]}
> --    qtests_generic += [ 'vnc-display-test' ]
> --  endif
> --endif
> --
> - if dbus_display
> -   qtests += {'dbus-display-test': [dbus_display1, gio]}
> - endif
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST-main,v
> diff -u -p -r1.26 PLIST-main
> --- pkg/PLIST-main	29 May 2026 15:55:47 -0000	1.26
> +++ pkg/PLIST-main	7 Jul 2026 10:41:09 -0000
> @@ -10,6 +10,7 @@
>  @bin bin/qemu-system-alpha
>  @bin bin/qemu-system-arm
>  @bin bin/qemu-system-avr
> +@bin bin/qemu-system-hexagon
>  @bin bin/qemu-system-hppa
>  @bin bin/qemu-system-i386
>  @bin bin/qemu-system-loongarch64
> @@ -36,6 +37,7 @@
>  @bin bin/qemu-system-xtensaeb
>  @man man/man1/qemu-img.1
>  @man man/man1/qemu-storage-daemon.1
> +@man man/man1/qemu-vnc.1
>  @man man/man1/qemu.1
>  @man man/man7/qemu-block-drivers.7
>  @man man/man7/qemu-cpu-models.7
> @@ -115,6 +117,7 @@ share/doc/qemu/devel/crypto.html
>  share/doc/qemu/devel/decodetree.html
>  share/doc/qemu/devel/docs.html
>  share/doc/qemu/devel/ebpf_rss.html
> +share/doc/qemu/devel/hexagon-sys.html
>  share/doc/qemu/devel/index-api.html
>  share/doc/qemu/devel/index-build.html
>  share/doc/qemu/devel/index-internals.html
> @@ -184,6 +187,7 @@ share/doc/qemu/devel/trivial-patches.htm
>  share/doc/qemu/devel/uefi-vars.html
>  share/doc/qemu/devel/ui.html
>  share/doc/qemu/devel/vfio-iommufd.html
> +share/doc/qemu/devel/vfio-mdpy.html
>  share/doc/qemu/devel/virtio-backends.html
>  share/doc/qemu/devel/writing-monitor-commands.html
>  share/doc/qemu/devel/zoned-storage.html
> @@ -194,6 +198,7 @@ share/doc/qemu/interop/barrier.html
>  share/doc/qemu/interop/bitmaps.html
>  share/doc/qemu/interop/dbus-display.html
>  share/doc/qemu/interop/dbus-vmstate.html
> +share/doc/qemu/interop/dbus-vnc.html
>  share/doc/qemu/interop/dbus.html
>  share/doc/qemu/interop/index.html
>  share/doc/qemu/interop/live-block-operations.html
> @@ -267,9 +272,8 @@ share/doc/qemu/system/arm/digic.html
>  share/doc/qemu/system/arm/emcraft-sf2.html
>  share/doc/qemu/system/arm/emulation.html
>  share/doc/qemu/system/arm/exynos.html
> -share/doc/qemu/system/arm/fby35.html
>  share/doc/qemu/system/arm/imx25-pdk.html
> -share/doc/qemu/system/arm/imx8mp-evk.html
> +share/doc/qemu/system/arm/imx8m.html
>  share/doc/qemu/system/arm/integratorcp.html
>  share/doc/qemu/system/arm/kzm.html
>  share/doc/qemu/system/arm/max78000.html
> @@ -330,6 +334,9 @@ share/doc/qemu/system/devices/virtio/vir
>  share/doc/qemu/system/gdb.html
>  share/doc/qemu/system/generic-loader.html
>  share/doc/qemu/system/guest-loader.html
> +share/doc/qemu/system/hexagon/
> +share/doc/qemu/system/hexagon/cdsp.html
> +share/doc/qemu/system/hexagon/emulation.html
>  share/doc/qemu/system/i386/
>  share/doc/qemu/system/i386/amd-memory-encryption.html
>  share/doc/qemu/system/i386/cpu.html
> @@ -376,11 +383,13 @@ share/doc/qemu/system/qemu-cpu-models.ht
>  share/doc/qemu/system/qemu-manpage.html
>  share/doc/qemu/system/replay.html
>  share/doc/qemu/system/riscv/
> +share/doc/qemu/system/riscv/k230.html
>  share/doc/qemu/system/riscv/microblaze-v-generic.html
>  share/doc/qemu/system/riscv/microchip-icicle-kit.html
>  share/doc/qemu/system/riscv/mips.html
>  share/doc/qemu/system/riscv/shakti-c.html
>  share/doc/qemu/system/riscv/sifive_u.html
> +share/doc/qemu/system/riscv/tt_atlantis.html
>  share/doc/qemu/system/riscv/virt.html
>  share/doc/qemu/system/riscv/xiangshan-kunminghu.html
>  share/doc/qemu/system/s390x/
> @@ -397,6 +406,7 @@ share/doc/qemu/system/security.html
>  share/doc/qemu/system/sriov.html
>  share/doc/qemu/system/target-arm.html
>  share/doc/qemu/system/target-avr.html
> +share/doc/qemu/system/target-hexagon.html
>  share/doc/qemu/system/target-i386.html
>  share/doc/qemu/system/target-loongarch.html
>  share/doc/qemu/system/target-m68k.html
> @@ -423,6 +433,7 @@ share/doc/qemu/tools/qemu-pr-helper.html
>  share/doc/qemu/tools/qemu-storage-daemon.html
>  share/doc/qemu/tools/qemu-trace-stap.html
>  share/doc/qemu/tools/qemu-vmsr-helper.html
> +share/doc/qemu/tools/qemu-vnc.html
>  share/doc/qemu/user/
>  share/doc/qemu/user/index.html
>  share/doc/qemu/user/main.html