From nobody Sat Feb 01 21:37:23 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YlmLq6z45z5m3rx; Sat, 01 Feb 2025 21:37:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YlmLq5xRfz3bXj; Sat, 01 Feb 2025 21:37:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738445843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rdRDl46nD7hkmtj7yO31NixvIToaDrTHQWJpuNEkU0Y=; b=S6hxqt85ur0PAyjzGJJhh2kBqDyXVy6LxUMcUeOZw3EUhQoUw0tgtghrpJxcxFkeUc8J8g JX3f6u88Y1wbWToim8nWqgk0UuLrY9AECfTSR1nTYVFDEmFOrHl36Hdw3DlB3zkBTFqkds Rd3ibDk4Ep9QyUGohsLpKi+nniDD+J14CKNwORWbZz0Et0KaLgR4Z9eTJS13JzytMzwlA+ BUfcVbqrsAos60YsTMOer26q/zf0UhCTRh/DYDeVsaHVPcv2tPWN1ffGjwAIw6/tAUBbhk 4jCGMCEqRLjxUyvQZCfzSdDSS8Cn8fY1cIZ+t8ME1hphUEC5nYbXFVUJMYmUmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738445843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rdRDl46nD7hkmtj7yO31NixvIToaDrTHQWJpuNEkU0Y=; b=XgO04xNYgMoN6sQ6dyobVX16vG8QMODzOLhsIOaTaMNOcoJfKMTher8+23H1vDu6faZE+y HbqKMvNsDAPGTHVQ9Tbp0sec/AI9CjqfTVEulvqfvTe5Uk+luOar7/4Gg7duLrxXM6Frnr M+eE5N9iVjvZQVMYwfoJu2whyMqme8SyjsOLWbGd7pUcH6bOjVZ+O/LKIlCzb0B4/oLRGv rSeDKysl6t97+UjRyp42Tw2sgDiCOILgFMH42wCpbQehMivr6G9RAMYDJgsGlEnqQHo5Vf HclbKpaRr3AFDPIfIrFFyOehEKSb+qsgZH3d7/DGjiTSO8Gi3rLbz7uirys/ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738445843; a=rsa-sha256; cv=none; b=ghomO/W2wYg8YOMbdd5WccvTWzzYJeLk+Os+uHuO2Ed1j6278ii8HMeaFpZgdBJS7qKXfm v5jQQKHIbMsKzA1hto+InKXqJuqXCO5HaP+jf5TKyqK4FXejAaWHxpZGRr1Rnavv5VXEoQ A/BJPaolvg4Ba/5IMqDyzQaeOlosadAWBB2veL1GV2Tc+O1U1LCa9Q/G28rYKjrILEGtu7 dr+Ha8O9DBgo1UqvL/BmB9mPYF+FCQk16fxTvfsCPc1vzmuZ/9miAYOn2CrPl/KbMxhL8j uRoLtsedLb0rJaaqA8LZKW+emejDCUCUfljJjaVLrlLnGwPnofi7uEsUMRJlLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YlmLq5VqSz63g; Sat, 01 Feb 2025 21:37:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 511LbNeD048271; Sat, 1 Feb 2025 21:37:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 511LbNxo048268; Sat, 1 Feb 2025 21:37:23 GMT (envelope-from git) Date: Sat, 1 Feb 2025 21:37:23 GMT Message-Id: <202502012137.511LbNxo048268@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: d23dace6ecc6 - main - emulators/virtualbox-ose{,-legacy}: Merge patches and unify patch names for src/VBox/Devices/PC/ipxe/Makefile.kmk List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d23dace6ecc6c757cd2142e7e5f60c4aa3a7798a Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=d23dace6ecc6c757cd2142e7e5f60c4aa3a7798a commit d23dace6ecc6c757cd2142e7e5f60c4aa3a7798a Author: Vladimir Druzenko AuthorDate: 2025-02-01 21:32:11 +0000 Commit: Vladimir Druzenko CommitDate: 2025-02-01 21:32:11 +0000 emulators/virtualbox-ose{,-legacy}: Merge patches and unify patch names for src/VBox/Devices/PC/ipxe/Makefile.kmk --- ...kefile.kmk => patch-src_VBox_Devices_PC_ipxe_Makefile.kmk} | 0 emulators/virtualbox-ose/Makefile | 1 - .../files/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk | 11 ----------- .../files/patch-src_VBox_Devices_PC_ipxe_Makefile.kmk | 11 ++++++++++- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Devices_PC_ipxe_Makefile.kmk similarity index 100% rename from emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk rename to emulators/virtualbox-ose-legacy/files/patch-src_VBox_Devices_PC_ipxe_Makefile.kmk diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 77500e1e992a..ce6fe1e095a2 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -220,7 +220,6 @@ VBOX_LLVM_VER?= ${LLVM_DEFAULT} .endif .endif PATCH_DEPENDS+= ${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild -EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk .endif .if ${PYTHON_MAJOR_VER} >= 3 diff --git a/emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk b/emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk deleted file mode 100644 index c2a39f402b18..000000000000 --- a/emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk +++ /dev/null @@ -1,11 +0,0 @@ ---- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2013-11-29 14:23:32.000000000 -0500 -+++ src/VBox/Devices/PC/ipxe/Makefile.kmk 2013-12-13 15:06:45.000000000 -0500 -@@ -35,7 +35,7 @@ - iPxeBiosBin_CLEAN = \ - $(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \ - --if1of ($(KBUILD_TARGET), darwin os2 solaris win) -+if1of ($(KBUILD_TARGET), darwin freebsd os2 solaris win) - $$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c: $(PATH_SUB_CURRENT)/iPxeBiosBin.rom $(VBOX_BIN2C) | $$(dir $$@) - $(call MSG_TOOL,bin2c,iPxeBiosBin,$<,$@) - $(QUIET)$(VBOX_BIN2C) -min 32 -max 56 -mask 0x1ff -export NetBiosBinary $< $@ diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_ipxe_Makefile.kmk b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_ipxe_Makefile.kmk index 5d6e9ee0f2f2..86fda6974519 100644 --- a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_ipxe_Makefile.kmk +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_ipxe_Makefile.kmk @@ -1,5 +1,14 @@ ---- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2021-01-07 15:39:44 UTC +--- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2024-01-11 12:19:38 UTC +++ src/VBox/Devices/PC/ipxe/Makefile.kmk +@@ -35,7 +35,7 @@ iPxeBiosBin_CLEAN = \ + iPxeBiosBin_CLEAN = \ + $(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \ + +-if1of ($(KBUILD_TARGET), darwin os2 solaris win) ++if1of ($(KBUILD_TARGET), darwin freebsd os2 solaris win) + $$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c: $(PATH_SUB_CURRENT)/iPxeBiosBin.rom $(VBOX_BIN2C) | $$(dir $$@) + $(call MSG_TOOL,bin2c,iPxeBiosBin,$<,$@) + $(QUIET)$(VBOX_BIN2C) -min 32 -max 56 -mask 0x1ff -export NetBiosBinary $< $@ @@ -121,7 +121,7 @@ endif -falign-loops=1 \ -Os \