From patchwork Mon Apr 25 10:47:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12825573 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 10FBBC433EF for ; Mon, 25 Apr 2022 10:47:39 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.312749.530098 (Exim 4.92) (envelope-from ) id 1niwFa-0004Vl-Ra; Mon, 25 Apr 2022 10:47:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 312749.530098; Mon, 25 Apr 2022 10:47:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1niwFa-0004Ve-OW; Mon, 25 Apr 2022 10:47:26 +0000 Received: by outflank-mailman (input) for mailman id 312749; Mon, 25 Apr 2022 10:47:24 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1niwFY-0003yz-IJ for xen-devel@lists.xenproject.org; Mon, 25 Apr 2022 10:47:24 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 16e6f593-c485-11ec-a405-831a346695d4; Mon, 25 Apr 2022 12:47:23 +0200 (CEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2111.outbound.protection.outlook.com [104.47.18.111]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-18-xSdu224CNzWfkOmkjINSUg-1; Mon, 25 Apr 2022 12:47:20 +0200 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) by AM7PR04MB6790.eurprd04.prod.outlook.com (2603:10a6:20b:dd::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.21; Mon, 25 Apr 2022 10:47:19 +0000 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::5cb0:5195:4203:7c2f]) by DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::5cb0:5195:4203:7c2f%9]) with mapi id 15.20.5186.021; Mon, 25 Apr 2022 10:47:19 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 16e6f593-c485-11ec-a405-831a346695d4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1650883643; 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: content-transfer-encoding:content-transfer-encoding; bh=gSHZrWWi42V/brh4EXJTJNbSe9aBFjvHmxN0fNwYBR4=; b=lCIqY+aLKA03YsIky/6uF2ilA6pUrpuyOVNtC6G4yKnP5lRsUJ/BBvBbRTYuVljmDYovtu uPbV1b+WoEdxnfv535UmDolPi8QHbka1dcmblcb0fSYNKwu6mZWX9ALXGBj2ktnTA1r2AR ezfDHoUs8Bp+rBJiRXPQSVYtkNFbJHs= X-MC-Unique: xSdu224CNzWfkOmkjINSUg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gwkCsvwCqPq6Yp5f2zzM2NxLnB8q6/4V+aIqIlhwqTN4R4Xt3HrfiFaHenKEGtnrgS8WUNqF62xIZ3Cd9lg90x94Qlf8ArQb4rlqUNuv7ynN6DuPRCEV9pNzcefmKTR4r0KPfjW8MUaypS2qOQhSKjSaFCG64S8wlqSZYJ4a4EIcZz+WlAyd3/oqVNKcWr20wwfFP5CMt3A0boeA8dwU4hpcaah4U+cSxeOfQ1k5nfhKLGCQkso6uZPAZTzhH1JOQkTsao1RzwhgW5l43jwrB2KQ83VTd5uVX3VFvGUf5LuFvjjzCbYBTtzTQ+CPrxcxjRhSKIc3mNRC4R1lztx7ZA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gSHZrWWi42V/brh4EXJTJNbSe9aBFjvHmxN0fNwYBR4=; b=LKM3ZAo7p+3+02rZ4Kkrz0k1fzf3oaU5edF2fJp8b8I1VUZwwWRSi+3bOgl7PjPRDFWy3bRMlsdV+Eu0RdY0vaxHmCXH545y1PcRwxGLKOqafELNvLwLubXtdx5O2+n3qDrznTQueWXB6b031GPBxSoY35LWR8aJhL101G9u24SJ06cx7daJjSKnLQjc46aYrFMtdiPzPhrRh9pVd7dk6GcFimmkd6Vt8HiZ03dZiIZuimXgr8Udt/JT166nvqf2QYV5U55+qUS1i00mqfwN9L445I0aSht5cd6xGx1Rjh0u//fgCYBAn0eZqLlNjHELhJc2y17X/goB5lUR9/n3ig== 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: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <55e50138-1d41-1e79-f269-df875473b1d2@suse.com> Date: Mon, 25 Apr 2022 12:47:18 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Content-Language: en-US To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu From: Jan Beulich Subject: [PATCH] EFI: don't mistakenly delete a file we never installed X-ClientProxiedBy: AM6P191CA0084.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8a::25) To DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1c954a15-e5fa-4a2e-2da5-08da26a8f895 X-MS-TrafficTypeDiagnostic: AM7PR04MB6790:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iPO/yqEOFEcdTXEvezUXDHIjKod4ctjpRxg7Bwc4F6a3VnpSqJzUjtaMz0d+yz+H1ZcAwC8oCTf2E3oCsP7JPr7JBLro3PQfqIi724FiDEPIGNb+ffbDUmeQhlpjsnbQtuiQf2FaivWIMNEmKdQI/OJCIXeZKrnwX7JT5hN0Y4HklURpOfe6dY1eaHV2VYOmZDVcO6H0bZmKmq3hhVaZyUTYcyt8+jpYYpwkz/cbsjcGxE8EYfcYc6nhWS2JTinizl4NtbOTxzM/4mpRC7OhG+hJYioX1rQuO/8iC3pegncTGtgUrHrYX4u6LZ7zch/pn1teYn6no4ho+QcypoSlUgE3kFqgXUk4eig+lTignLeIoGjL1VWAFb2D0IOtrzuNZoFsT86EL1ylgfBhAaFTY+p03UWHmxkCzycXSwvGFovPXBXHXH319SHstB3yjhAEmbOg2CypEtSpCV6RjfiwW5czpu2KntTkcw/mM1ehLz1Bga8RzOfNO/uioqBC/YVceW9zq6cJzg1+zSeSbwByfVU0IT/PRrIAOsxmSFaeE+fy64uAp7+VLZrX6uvwSMSPocZN/RrVXmtKO0vA81JAfqgZ9GqLbDsR9QFeGqWEVW/2ltsWaYkd0SLV5QRC0lDMb49EMX88QuF9C+37nNDs0jL2U0uZyX7eTBk3s4TEUacUHY4OLT//njMg2//NWBtrEinmD1G5ryWBeZQ8I18hMmmRJakv2d/QKV+QbSiDpirSiaCYCE26U0ip9u9+wZBj X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8616.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(31696002)(86362001)(66476007)(66556008)(2616005)(4326008)(66946007)(186003)(38100700002)(8936002)(5660300002)(36756003)(316002)(6486002)(2906002)(508600001)(8676002)(26005)(54906003)(6512007)(6916009)(4744005)(6506007)(31686004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?tIvIFi+bbv7WRE6EwXrHF5rXisTZ?= =?utf-8?q?I4R/P3ZHwvKIbMoPF48GvzdmTnhh0/AmYDSamSKkKeupdzzuhl6miEyUIi9EkxAJ3?= =?utf-8?q?dr5AHw+1kjy3HHZUoT75Z07N0YOP59O2pMwncdwaakC8dTNvHDB0lW3mKqESPnxub?= =?utf-8?q?CZgPtiyrZy2vEydyvptdvPgG5P/DiLJb/uqPdD3sI0AfY7UyM0CM3I1+aOmXlvxmU?= =?utf-8?q?qbZTsJZ4FPySUyXF7tZ8evh1T1usKJotiVcrJs5irF3PiELOWGHjE7E5IJkY52zxD?= =?utf-8?q?9xwfxB8kDdSJ/ZuGUDlZyzoVLvw626qlXVfVDubwUFjKmu6xGEIlnSEtnZvoIrKts?= =?utf-8?q?nfD0EarHOUKSs/xp45Gt0Hly+cYEdQ+TwnOkaJfnLl4wTTi6XcSueSR+j1rV946ST?= =?utf-8?q?bUaj+khsK1OwM0Ce5c8lZHZHqpXLZWfgKwQ2tDxWNY29m0rWTVeBrOwZ2uC5r/K3c?= =?utf-8?q?BM4I15+JvYlEGy6a4cd6HNYfi/LNs9DC0EgfCWeccrPAaYF866UyrBpRwSMncT/0A?= =?utf-8?q?TGn4y3D3qxc2x/tHH8mBJVcvmyYQkjEoRnaaWCr9RT/gbR3h+v0zB2QkNorvAkEO9?= =?utf-8?q?HmeIhulcX/LrZ8RdA/kpq22eifzpIHylQ+61z9Sn9Mg6ASfZ/Pfoxc/i2WmANAOjy?= =?utf-8?q?/mGPnXfgQF6ix2zA7MDt4/6g1VK2hLMexOzKZVooPkb3QHLmMd81gjtDkm8anxEDh?= =?utf-8?q?Hct4IqFZ8MxwV2JF4UernttIzOj6yRKC6nxl+i691RtT2oLL7D2WaZHbK5d8iH+SP?= =?utf-8?q?kz7VSf3sQcu20pykJlfjsUJlbOe1MROyp1637XZwynkYmWewx3vxQ154F2lTsxhMl?= =?utf-8?q?E60dOabwjBJmdw2tM3mFzey7tCWEq0TY3SlTwWMG0Jt3IlxFcZA2mn2TCxRLUmU8a?= =?utf-8?q?F8sFJw+BQDZy7RYzVL0v0Uwokdk8eZfEak8L7S2BO9KQdFg5qj0sEYQjt1eGtuhCS?= =?utf-8?q?MKBr/STq5tlzSIHN2nhBuKarvgTfQAP1tWc2D02CSXhFpQcD6CEoeqzV7wtjhB96u?= =?utf-8?q?XDyP1Hnwfvnbv+RGYoFIlFAOsH7fIiqA9jiLC6h4sRecawm1JGN8Gfs4nzny6JX6h?= =?utf-8?q?mPRX/4aUARSPWo4MuE1GPlLp3CF/m4Q3AAWHeazsPDW/N6ef+CF2/Ml1R1M6cm1/J?= =?utf-8?q?MoSlONiRgyDq99qJwIlrecSSIiaJaWhRFKX0TWOu6gjQ1XR3D4uhJXVptF/OYrzxS?= =?utf-8?q?gS9ha7ZXzyeonGCht4Qg79KAhe+RNokj/TWuJdlCj4OgSwe6evZa0tPoHR7ATx0AV?= =?utf-8?q?SdASDQdX6oAF90tUTOBowAXWHNcr+iT8s73bmLFquGDFf/v3Ha1pC1A+/ppfhlAoY?= =?utf-8?q?468YZJlw/TxDVJsHnLwjmEToMEETfawUCS2oDlT3XUoDq/zbGKatYi/wRJ7ZM+AIV?= =?utf-8?q?uDTeakQVaW9F4cZKDJej3NYr075UdKSSSyFoFf2VaivFJxSAHL05vhHUlL8LbnDXL?= =?utf-8?q?Qkn5mwqYAKhwynEG9vWAW2XvRrTIMG4Zxk2P0VQKdL8axBSWqkEnfvqtNhvY7yP4M?= =?utf-8?q?mB3Hep10wT/HcpC/obBDFjxVVmKrBJqMPp4MhSdqNVRapWak22HVWHPl+4KcDexPJ?= =?utf-8?q?71CmPXzaNeqm/RK4A00itXd4tnb7rueyua2fDY7PS3adW5BOOQAaCnlTGmPRXj3Bs?= =?utf-8?q?X52LjfO/0q3WhZrt+Zkih7jpqDA7TuZQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1c954a15-e5fa-4a2e-2da5-08da26a8f895 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8616.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2022 10:47:19.5108 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +ClO3u/esT8/DK9dYcyBTs+o/ZVP/IxqdGIZ2Tbdn0+OOLy9JNVtRZjvC2Gm1TAeZMGp657YeGoEUSSDG5gYqQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB6790 Just like for "install", make dealing with xen.efi on the EFI partition dependent upon mount point and vendor directory being known. Signed-off-by: Jan Beulich Reviewed-by: Bertrand Marquis --- a/xen/Makefile +++ b/xen/Makefile @@ -515,7 +515,9 @@ _uninstall: rm -f $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi rm -f $(D)$(EFI_DIR)/$(T).efi - rm -f $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi + if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \ + rm -f $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \ + fi .PHONY: _debug _debug: