From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from m9a0013g.houston.softwaregrp.com (m9a0013g.houston.softwaregrp.com [15.124.64.91]) by mx.groups.io with SMTP id smtpd.web11.859.1581488835444106285 for ; Tue, 11 Feb 2020 22:27:20 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: suse.com, ip: 15.124.64.91, mailfrom: glin@suse.com) Received: FROM m9a0013g.houston.softwaregrp.com (15.121.0.191) BY m9a0013g.houston.softwaregrp.com WITH ESMTP; Wed, 12 Feb 2020 06:26:40 +0000 Received: from M9W0068.microfocus.com (2002:f79:bf::f79:bf) by M9W0068.microfocus.com (2002:f79:bf::f79:bf) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Wed, 12 Feb 2020 06:24:30 +0000 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (15.124.72.12) by M9W0068.microfocus.com (15.121.0.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10 via Frontend Transport; Wed, 12 Feb 2020 06:24:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LUMmWsKutnxO5KkbPqdb7W1zFS0j6v+W+EZOz2uWGEh/XuAkbUTGQVBWQ+GNJ3gigizwvQjZazQgBN8l8p4NmEi48p7tGZewKfODVHCE7J+AwOeCfjgLXrrsJwUnNCboYffgZjj/Y8vBSByLnNS6jt08i9URdvq87V6xoKgUkZPgWNBu7z7kGuxHL1+gm2IEF/8tuj1SzfEIy9DXCs7IMaXsv7BtCi7FlbDDwSgrGnJHVy2jGMTalpShNfypOIAX+ja+xSmVDVzuka0B392QJYxWuy1/JzWcdtY6E7uTzOTDtGKSny2U+ebn4wWEFdo4Unk6zPW2b95nfMy3N8OT6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fLTLjqiEneEAKbdxa6jRcrXTEkKkp849+lhuDjGHmUA=; b=Fw4E+8LCYyc8OJQFcTuF8XYTyy6CKWiauhAdnQS3h30mugtdFw2TO2QMtq7C3AZDHclVsaNOA7STKh3buJCPYElTFkZbehQeWr130GjNsDaVh5QcA/MasX13cVGBA6feD98hSe9XBCtn8Hz330CeYlNhzPZRMpdbT0HpNi9rm+lAjP1jf4DMf3k9ulz7TTBOgxEjVrVhSg2MPAJYpVvjN3k3lG5ryHyMkqm1XhaCuZ9lAN4s7oINoBAgxBupARj3eVOATeq4mVEF/PlAWCnW6zQ7ylwPjXCLilL58ekNu7M/uaOL5IuucH0d3SL/se8Cs4AasThPcO6/E8Ep+yz06w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=GLin@suse.com; Received: from DM6PR18MB3258.namprd18.prod.outlook.com (10.255.175.31) by DM6PR18MB2489.namprd18.prod.outlook.com (20.179.105.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2707.24; Wed, 12 Feb 2020 06:24:29 +0000 Received: from DM6PR18MB3258.namprd18.prod.outlook.com ([fe80::386b:b2:de3f:151a]) by DM6PR18MB3258.namprd18.prod.outlook.com ([fe80::386b:b2:de3f:151a%6]) with mapi id 15.20.2707.030; Wed, 12 Feb 2020 06:24:29 +0000 From: "Gary Lin" To: CC: Zailiang Sun , Yi Qian Subject: [PATCH 1/2] Vlv2TbltDevicePkg/GenerateCapsule: Create cab files with signed capsules Date: Wed, 12 Feb 2020 14:24:02 +0800 Message-ID: <20200212062403.21714-1-glin@suse.com> X-Mailer: git-send-email 2.16.4 X-ClientProxiedBy: LO2P123CA0072.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1::36) To DM6PR18MB3258.namprd18.prod.outlook.com (2603:10b6:5:1cd::31) Return-Path: GLin@suse.com MIME-Version: 1.0 Received: from GaryLaptop.suse.cz (36.229.208.188) by LO2P123CA0072.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2707.24 via Frontend Transport; Wed, 12 Feb 2020 06:24:27 +0000 X-Mailer: git-send-email 2.16.4 X-Originating-IP: [36.229.208.188] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2afcc02f-c1fc-462f-9f9a-08d7af84374e X-MS-TrafficTypeDiagnostic: DM6PR18MB2489: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1468; X-Forefront-PRVS: 0311124FA9 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4636009)(346002)(376002)(136003)(366004)(396003)(39860400002)(189003)(199004)(54906003)(16526019)(186003)(2616005)(956004)(6916009)(36756003)(52116002)(478600001)(6486002)(6506007)(6512007)(316002)(26005)(86362001)(6666004)(66946007)(4326008)(66556008)(5660300002)(81166006)(1076003)(81156014)(8676002)(8936002)(2906002)(66476007);DIR:OUT;SFP:1102;SCL:1;SRVR:DM6PR18MB2489;H:DM6PR18MB3258.namprd18.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; Received-SPF: None (protection.outlook.com: suse.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R0aSB1zKlnfRVotyoZZF+84H1HyqegOo49vdMomE43oOO+tTeCk8vFtVrBwZQLd/inDbZ/pBWUYAjwpiU/bWyen9LQB79yn2noG6dvw7UjOrFSe3HG+aN6MlDBqat50Y5IHz2tWcmfBbg8etUZwV/Ucf+OooBVCjhDf1c+1MkF6WOIWWnwbKkJLtdbaGQhwMc96P26e3YF+FXVLSy1gcT36Q4G4X3TuPP3ZtzebzCA/94UQI6WRa51H1txhvht8PGbibrMhavWXT5iKZb1TfPpj8nO0pBMDNKm9L0+/rNdJwmrwrRe+5T3wf4Ss/cZUwqGnFDxhisN9Xdzwj2f+uSRRJUTRFv/gyKzxAoHUXZpwW+yB1tXhQGA0KTVfkl4Zmb1OLjZTgvhCuvYflksOWe2ozOrtcZaaEFnZ5QN4w+IfBmGp0FqiUwzp3+JKEcpa3 X-MS-Exchange-AntiSpam-MessageData: 09dTIFVs+whr/iqZT9F4APG0vX9hZISbDOmrFwCWA25P64rBz3wt+Ku3obLABH3/hGuOL/TAlq74ivqNQSNhOYcORRtno+8sIKkCLQHl5aKyjX7aezB/3KtOF/LuqUH9nytcETCmUtuTJbbfzdvxag== X-MS-Exchange-CrossTenant-Network-Message-Id: 2afcc02f-c1fc-462f-9f9a-08d7af84374e X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2020 06:24:29.8375 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 856b813c-16e5-49a5-85ec-6f081e13b527 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: OF5UZFCIrxmDCH1iEAqLxWHchXSEtaDoTbWX+mxCz60AqNZExI8WCWM+RjySAJAu X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR18MB2489 X-OriginatorOrg: suse.com Content-Type: text/plain The cab file previously contained the unsigned payload without the FMP header, so the firmware would reject the capsule generated by fwupd based on the cab file. This commit copies the signed capsule into the cab file so that fwupd can generate a valid capsule. Cc: Zailiang Sun cc: Yi Qian Signed-off-by: Gary Lin --- .../Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.py b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.py index a37648ac96..1a6c597c4a 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.py +++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.py @@ -181,7 +181,7 @@ def GenCapsuleDevice (BaseName, PayloadFileName, Guid, Version, Lsv, CapsulesPat LogAlways (ProcessOutput[0].decode()) Error ('GenerateCapsule returned an error') - Copy (PayloadFileName, (CapsulesPath, 'firmware.bin')) + Copy (FmpCapsuleFile, (CapsulesPath, 'firmware.bin')) MetaInfoXml = MetaInfoXmlTemplate MetaInfoXml = MetaInfoXml.replace ('FMP_CAPSULE_GUID', Guid) MetaInfoXml = MetaInfoXml.replace ('FMP_CAPSULE_BASE_NAME', BaseName) -- 2.16.4