From nobody Mon May 16 12:28:49 2022 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 9F8C01AE3973; Mon, 16 May 2022 12:28:49 +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 4L1z7j48qNz4l5S; Mon, 16 May 2022 12:28:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652704129; 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=weL8YBrR6zrLGF7xqWpitOjVRVPYi6heeVsOMTF0SIQ=; b=Gd3AQA5QqM8NTF42YpyyQ6hz0N5Uu8+kxdicyrnf+nL1bxa4gYiQulATkzhAPygW1o9I6p kWrZXcbNhVizo4eyOGZ660ik9ojo5D8vvlHeLpfUxKmrYXtUrZ0v1wLVd7lqLtMxcg6e8z I++A+jdlvfX/rpJaYqeZyN4OItwk9pjXkA4U2uUe/lpXrFQJCN/8fj3VtkihYkLYch144E dBI0SIUczrqNjB8zAzqjSkfYEnf9Zy39oVJ0l+OHyrNvkwEILFl5iGIM63VpGlXZFz0Stt Czft9r/vuaBi9FhIpj8BNuB89T3+MSdV6YQLhD1/sJAbJFBiYqeaUIAPjoM6NQ== 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 7072A20207; Mon, 16 May 2022 12:28:49 +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 24GCSntW062087; Mon, 16 May 2022 12:28:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GCSnh5062086; Mon, 16 May 2022 12:28:49 GMT (envelope-from git) Date: Mon, 16 May 2022 12:28:49 GMT Message-Id: <202205161228.24GCSnh5062086@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: 3e971e9bf59b - main - sysutils/edk2: Remove default FLAVOR 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 3e971e9bf59b04d5bb7fa0eb35157c2aa2a9a295 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652704129; 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=weL8YBrR6zrLGF7xqWpitOjVRVPYi6heeVsOMTF0SIQ=; b=x0tHGiul9xwGLd0xxjTba634cDoVETgEinCyPXJ7E4zaXj1RqKuZ3BzvvCO0M4BRc2+MlB bsSDZ1K2mvcKuEhzZqOZ+0avtA/+LV2l2gd4gYcrt2ihGzwPum5OD83XOtEJpLpE9gDcre MqiVcJWZxJDzNga1+4KxIPn7bKKGIsMZLLGxxIns4AMb1oA5J6ZzxOnRzudKxqNbFbPa4s PPCCjeCKWeL+E2/fxGzN/eLgZT5u/9i/MSUDEaiwBhkBI/Kw6ie6zQeSyIVRCVLLpCwa1Y ApL3XNM7Hrt8BpbAjMmu3Uy1+rX3jNV7rLnP4EP4Zcrt7weuHjJ5YRH7/FzqXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652704129; a=rsa-sha256; cv=none; b=fK945Tl4S2kQ6e91lrh4dPCuBgjHj4dM6ycHjP5obODOhmrYO7PELB2naBBoPXAW4OZ3kX tvfFzClajE/sadl6WKX52ExLPmgJ4FM3Hj17QwRYOhmXwX77bIxzqDcEcdPMMqXFjVRwws /l+swqBLmMDeEtiq5iQKSeiUI7+8cWEgE58K38O3Q3aPF9UcfwNebhqIGhgGQTh08bxmz0 CUxh53LBqD1E/CrO2Smz9r7p9cv8TbfYumIsvK31OX5qrZkNkaqs0u07LGrGnUM+9p9pqP 5c2pXsHTz4T16IWkiyeyzFIo0eihFmQIzvQ6H1q+PNzl8iDSvjb5zcJX8KC/BQ== 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=3e971e9bf59b04d5bb7fa0eb35157c2aa2a9a295 commit 3e971e9bf59b04d5bb7fa0eb35157c2aa2a9a295 Author: Emmanuel Vadot AuthorDate: 2022-05-16 12:28:15 +0000 Commit: Emmanuel Vadot CommitDate: 2022-05-16 12:28:44 +0000 sysutils/edk2: Remove default FLAVOR THis makes make clean clean all the flavors by default. --- sysutils/edk2/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile index 312c86f8362b..a0aea2b1e139 100644 --- a/sysutils/edk2/Makefile +++ b/sysutils/edk2/Makefile @@ -12,7 +12,6 @@ ONLY_FOR_ARCHS_REASON= only provides firmware for aarch64 and amd64 PKGNAMESUFFIX= -${FLAVOR:C/_/-/g} FLAVORS= macchiatobin fvp rpi3 rpi4 xen_x64 -FLAVOR?= macchiatobin USES= cpe gmake python:3.7+,build CPE_VENDOR= tianocore @@ -43,6 +42,8 @@ BINARY_ALIAS= make=${LOCALBASE}/bin/gmake \ g++=${LOCALBASE}/bin/g++${GCC_DEFAULT} \ python3=${PYTHON_CMD} python=${PYTHON_CMD} +.include + .if ${FLAVOR} == fvp PLAT= fvp PLAT_ARCH= AARCH64 @@ -105,8 +106,6 @@ MAKE_ENV+= WORKSPACE=${WRKDIR} \ PYTHON_COMMAND=python3 \ PYTHONHASHSEED=1 -.include - .if ${PLAT_ARCH} == AARCH64 && ${ARCH} != aarch64 BUILD_DEPENDS+= aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc MAKE_ENV+= GCC5_AARCH64_PREFIX=aarch64-none-elf-