From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.17568.1665560128102997382 for ; Wed, 12 Oct 2022 00:35:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=cPzsOKAt; spf=pass (domain: redhat.com, ip: 170.10.129.124, mailfrom: osteffen@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665560126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=c8tA9w0RiirpeMbE2ADf7cLU7INVHP9ehhAVYYmuIkk=; b=cPzsOKAtBSH9Uo7GLWQoS8xF+SCXVCu4NGo9+LJFkE63boh7bQB4uNPQJMHM279gUw8XG/ 4LJKZ4baR4LTwNYfYKulyDSwzLgXzRAi1qURwzflp8Bkv6Z+C7sGnonqYpXje5PeoSQ4qU K9VT0ma1SM/UH680f7XUVhlw62pg7Rs= Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-609-IqsWJrzSO36pG_funVS7uA-1; Wed, 12 Oct 2022 03:35:25 -0400 X-MC-Unique: IqsWJrzSO36pG_funVS7uA-1 Received: by mail-lf1-f71.google.com with SMTP id u2-20020ac25182000000b004a24f3189feso4433218lfi.15 for ; Wed, 12 Oct 2022 00:35:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=c8tA9w0RiirpeMbE2ADf7cLU7INVHP9ehhAVYYmuIkk=; b=siajdkvIrBnEd6Cm4RWfwq9e4wI0Vt/hdpjETLP0Vp054kjL357MawzVeuoRWV5KPv gKEy//5jPvxdwZV0kmPVD2m238RK67nP3gznYjQdJ4+RxKEjdf+4u2KiLj3jUKpiV/hI rAVyzmbgDylS5YdkgduxQmMP76fFA7m5TrA9hSVHMpcILQ20GlUv0L/OeSEbkv4EcVLe 2KojPwSyGy86lfV1yKG8krRT6Cy+BFzfaH/3sR0w9gE4oEHlbc9IEML4TiEA457tfBxw sOrxt+SiRrl0NOLaVd+kOk5Biz6FQ4ZvpoOoBwl7CzDW2Gnk4xGJ3tWDTxmGfbSwVDeb 78aA== X-Gm-Message-State: ACrzQf087ahHTO1PynZVsK6HdXpT/hE5qGcYLMUvDB93qVzRhxoEzraa lMk1GqAcAw8fIwFLiJTXIs4Vlx0vs0wJwJyStm+S1KEVyy6S3mE/EwscRbLAGVBcysFRCopzLY3 ljCZVjQyZqxYutE3yTE7vEwZvrDKc2A== X-Received: by 2002:a2e:7808:0:b0:26f:c0c2:8a3e with SMTP id t8-20020a2e7808000000b0026fc0c28a3emr351171ljc.260.1665560123695; Wed, 12 Oct 2022 00:35:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7+sWSsZWPHsfSmI/p6f6cjqkDanlXyIQ1F6M6dNhvTqe/89BOIsOzcdK1oQQYWYhMVGKxf83nLGp3L4BnKwvs= X-Received: by 2002:a2e:7808:0:b0:26f:c0c2:8a3e with SMTP id t8-20020a2e7808000000b0026fc0c28a3emr351149ljc.260.1665560123370; Wed, 12 Oct 2022 00:35:23 -0700 (PDT) Received: from 567203818698 named unknown by gmailapi.google.com with HTTPREST; Wed, 12 Oct 2022 07:35:22 +0000 From: "Oliver Steffen" X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221012073504.511854-1-osteffen@redhat.com> References: <20221012073504.511854-1-osteffen@redhat.com> MIME-Version: 1.0 Date: Wed, 12 Oct 2022 07:35:22 +0000 Message-ID: Subject: [PATCH 1/2] OvmfPkg: allow setting Firmware Version from build command line To: devel@edk2.groups.io Cc: Anthony Perard , Ard Biesheuvel , Gerd Hoffmann , Jian J Wang , Jiewen Yao , Jordan Justen , Julien Grall , Leif Lindholm , Liming Gao , Ray Ni , Sami Mujawar , Zhichao Gao , Pawel Polawski , Oliver Steffen X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Initialize gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString with with the value of the variable "FIRMWARE_VER" in all flavors of OvmfPkg. This behavior is already implemented in ArmVirtXen.dsc. It allows specifying the firmware version string on the build command line with -D FIRMARE_VER=... Signed-off-by: Oliver Steffen --- OvmfPkg/OvmfPkgIa32.dsc | 1 + OvmfPkg/OvmfPkgIa32X64.dsc | 1 + OvmfPkg/OvmfPkgX64.dsc | 1 + OvmfPkg/OvmfXen.dsc | 1 + 4 files changed, 4 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index e9ba491237ae..0a027577a673 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -488,6 +488,7 @@ [PcdsFeatureFlag] !endif [PcdsFixedAtBuild] + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1 !if $(SMM_REQUIRE) == FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index af566b953f36..70a310365100 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -494,6 +494,7 @@ [PcdsFeatureFlag] !endif [PcdsFixedAtBuild] + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1 !if $(SMM_REQUIRE) == FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index f39d9cd117e6..9e231278811f 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -514,6 +514,7 @@ [PcdsFeatureFlag] !endif [PcdsFixedAtBuild] + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1 !if $(SMM_REQUIRE) == FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index 58a7c97cddf7..2a2987e637d5 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -367,6 +367,7 @@ [PcdsFeatureFlag] !endif [PcdsFixedAtBuild] + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1 gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE -- 2.37.3