From nobody Fri Jun 03 08:28:47 2022 X-Original-To: dev-commits-ports-all@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 F36FB1B66CDB; Fri, 3 Jun 2022 08:28:47 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LDwyR6LDpz3C19; Fri, 3 Jun 2022 08:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654244927; 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=I+VQtZnXRS8ahlLIO/CPXaMyisKjUCXJ/OLmmWhoqnc=; b=Ow3fN10l3aJPtIhiwnvqaLwrVeh8omFH+8jtgiSemv9bTUEAujVsMtjR9TlbS6r2Wetg6G 9rEWc/1g/Sj432O5fUjlsZ5Emv5lubBJ902HoyJa9OLNu7pYXj1b3Bcgk40Q9EC+V0CM2w 3gu8v6axmiwsokJuJ7cHZBg/5FIeTue92aPgCkfjydWUHci+oQWRnKu0sTywS02Twwb4vg nHpQ/dnVuu9upRqEoFpI49FPDQ17bsEj6ImbvHfjQZNA150yL2O1qxrM6j6zFGHc4swL6K Tms9WPaoOc4plWU4mYYkrXhdp+uVpEYtCnG770YvVAkQj3lyqp3u0iIOVNcz6g== 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 B4E852573F; Fri, 3 Jun 2022 08:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2538SldO033253; Fri, 3 Jun 2022 08:28:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2538SlLM033252; Fri, 3 Jun 2022 08:28:47 GMT (envelope-from git) Date: Fri, 3 Jun 2022 08:28:47 GMT Message-Id: <202206030828.2538SlLM033252@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 3023881d2e9b - main - sysutils/edk2@bhyve: Fix main firmware List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3023881d2e9b0f07aeca701e99caed5039206e06 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654244927; 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=I+VQtZnXRS8ahlLIO/CPXaMyisKjUCXJ/OLmmWhoqnc=; b=Hh4wRadZeV7C3wxf9JE8aH/sZX0cnCJnJRG6dwCnu4W1BxNzIJarXmEYuPxZpkQcGfeou/ T1exkbvSdhllft5CqKg/J7kBixrh2Dvne4MmBhfDSpIWbrO6+KhcGYco0C736N3CDdKCe6 34dsvlDmzvfPorjZ9AW9ZGISWahXfgTFAqQszDtsGEQhXluJKgWPnFhuazGIOf9VmBUSuq CvEzwk6bQo990T51Qr0oMXzc7uJlLXnO75AqXi1qTk8yy9MSgCuAWka20cpyNxah4z/L23 kU4JrcZtwL2StSgJ7OTtdKgmpzw8cxyMkK9lmWZIQwIBhpcYr6brj+1XLtjP9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654244927; a=rsa-sha256; cv=none; b=cS31r74Rw1r16C5QbFHm1qlsKjni3Vsc/xQVroA+SGsatHqJnDcs13nQ2JvURBrLhQ3hah zz/xOYmX80R619zB5k+p/CGOurA5u70uslRvVIFSQYPTyiSrS+qvJsgSg9UX1EYAGc2ewV y3B1wvgtO9VF9Nn/BQ8ekzqZC6HZ5cJOjm7SWZlY2bBVsNyJOwa3rcsBeWx9q48BILKV+J 0G1CqBLCocYVBEjxH7YUvaa2sUFdObEu2oYwOP70wnWsbRvG38S+q3nJW6Kr9C3KbG4B/s qpqMEqD623gi8wAaf5Bing4E6JppDVHqwVFRAB7e4gRKZ1cl35plz2uiMKduBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=3023881d2e9b0f07aeca701e99caed5039206e06 commit 3023881d2e9b0f07aeca701e99caed5039206e06 Author: Emmanuel Vadot AuthorDate: 2022-06-03 08:23:41 +0000 Commit: Emmanuel Vadot CommitDate: 2022-06-03 08:23:41 +0000 sysutils/edk2@bhyve: Fix main firmware EDK2 produce multiple files for the bhyve flavor, _CODE and _DATA The PLAT_RESULT is just a concat of both. But bhyve doesn't support having only one file. When it was its own port we just install the _CODE file as the main file instead of using the concat one generated during edk2 build. For this port we need to use the main PLAT_RESULT files for all flavors except bhyve so add a quirks in the install phase that just replace the main file with the _CODE one. Thanks to Corvin Köhne for helping me understanding the issue. Fixes: 2e6a6ccd15 ("sysutils/edk2: Add bhyve as a new FLAVOR of edk2") Sponsored by: Beckhoff Automation GmbH & Co. KG PR: 264338 --- sysutils/edk2/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile index 325b85ab166d..d821fd0d4747 100644 --- a/sysutils/edk2/Makefile +++ b/sysutils/edk2/Makefile @@ -1,5 +1,6 @@ PORTNAME= edk2 PORTVERSION= g202202 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= uboot@FreeBSD.org @@ -165,6 +166,7 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT_VARS} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_VARS} .endif .if ${FLAVOR} == bhyve + ${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT_CODE} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME} # For backwards compatibility ${MKDIR} ${STAGEDIR}/${PREFIX}/share/uefi-firmware/ ${RLN} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME} ${STAGEDIR}/${PREFIX}/share/uefi-firmware/${PLAT_FILENAME}