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.gnu.org (lists.gnu.org [209.51.188.17]) (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 7BEE6C27C65 for ; Tue, 11 Jun 2024 16:25:16 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sH4Io-0004m3-T5; Tue, 11 Jun 2024 12:24:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sH4Ii-0004lZ-Kc for grub-devel@gnu.org; Tue, 11 Jun 2024 12:24:48 -0400 Received: from relay4.mymailcheap.com ([137.74.80.155]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sH4Ig-0001g1-0V for grub-devel@gnu.org; Tue, 11 Jun 2024 12:24:47 -0400 Received: from nf2.mymailcheap.com (nf2.mymailcheap.com [54.39.180.165]) by relay4.mymailcheap.com (Postfix) with ESMTPS id DC151246B3 for ; Tue, 11 Jun 2024 16:24:43 +0000 (UTC) Received: from mail20.mymailcheap.com (mail20.mymailcheap.com [51.83.111.147]) by nf2.mymailcheap.com (Postfix) with ESMTPSA id D77DF401F9 for ; Tue, 11 Jun 2024 16:24:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=aosc.io; s=default; t=1718123081; bh=8M4dR93fhz8qlTwGBYfemvkLykWGWzkkO4bi6LVDRAU=; h=Date:From:To:Subject:From; b=sC3IDlsgR/J4cOTNt9lcPOcp51fA/hyxRhv7l51u9XKI6vOFyXi6BdnFYTkys9Tp3 iULIG4JB3jmYqVmdAyqUNacvh4DSthdxyKTNfA1zOxuVe+LEvTdh55lEVIcfFlYqR3 9i4UhqlGe3o+HP4HNO8XuSoAJQsc35+a0qH80O6A= Received: from mail20.mymailcheap.com (mail20.mymailcheap.com [51.83.111.147]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail20.mymailcheap.com (Postfix) with ESMTPSA id 4869440F81 for ; Tue, 11 Jun 2024 16:24:36 +0000 (UTC) MIME-Version: 1.0 Date: Wed, 12 Jun 2024 00:24:35 +0800 From: Mingcong Bai To: grub-devel@gnu.org Subject: [PATCH] util/grub-mkrescue: use capitalised paths for removable EFI images Message-ID: X-Sender: jeffbai@aosc.io Organization: Anthon Open Source Community X-Spamd-Result: default: False [0.01 / 10.00]; BAYES_SPAM(0.11)[60.72%]; MIME_GOOD(-0.10)[text/plain]; ASN(0.00)[asn:16276, ipnet:51.83.0.0/16, country:FR]; ARC_NA(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; MISSING_XM_UA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_ONE(0.00)[1]; HAS_ORG_HEADER(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[grub-devel@gnu.org]; FROM_HAS_DN(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Server: nf2.mymailcheap.com X-Rspamd-Action: no action X-Rspamd-Queue-Id: D77DF401F9 Received-SPF: pass client-ip=137.74.80.155; envelope-from=jeffbai@aosc.io; helo=relay4.mymailcheap.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The development of GNU GRUB Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="utf-8"; Format="flowed" Errors-To: grub-devel-bounces+grub-devel=archiver.kernel.org@gnu.org Sender: grub-devel-bounces+grub-devel=archiver.kernel.org@gnu.org UGVyIFVFRkkgU3BlY2lmaWNhdGlvbiwgc2VjdGlvbiAzLjQuMS4xOgoKLi4uIElmIEZpbGVQYXRo TGlzdFswXSBwb2ludHMgdG8gYSBkZXZpY2UgdGhhdCBzdXBwb3J0cyB0aGUKRUZJX1NJTVBMRV9G SUxFX1NZU1RFTV9QUk9UT0NPTCwgdGhlbiB0aGUgc3lzdGVtIGZpcm13YXJlIHdpbGwgYXR0ZW1w dCAKdG8gYm9vdApmcm9tIGEgcmVtb3ZhYmxlIG1lZGlhIEZpbGVQYXRoTGlzdFswXSBieSBhZGRp bmcgYSBkZWZhdWx0IGZpbGUgbmFtZSBpbiAKdGhlCmZvcm0gXEVGSVxCT09UXEJPT1R7bWFjaGlu ZSB0eXBlIHNob3J0LW5hbWV9LkVGSS4KCldoaWxlIEZBVCA8IDMyIGZpbGVzeXN0ZW1zIGFyZSBu b3QgY2FzZSBzZW5zaXRpdmUgKHdoaWNoIGdydWItbWtyZXNjdWUgCmNyZWF0ZXMKYXMgYSBGQVQx MiBpbWFnZSB2aWEgbWZvcm1hdCB3aXRoIGEgc2l6ZSBvZiAyLjg4TWlCKSwgaXQgc2VlbXMgdGhh dApzb21lIG9mIExvb25nc29uJ3MgTG9vbmdBcmNoLWJhc2VkIGZpcm13YXJlIChuYW1lbHkgdGhv c2UgZm91bmQgb24gdGhlaXIKbGF0ZXN0IFhBNjEyMDAgYm9hcmRzKSBzZWVtcyB0byB0cmVhdCB0 aGlzIGZpbGUgc3lzdGVtIGFzIApjYXNlLXNlbnNpdGl2ZS4gSW4KdGhpcyBjYXNlLCBhdCBsZWFz dCB0aGUgWEE2MTIwMCBib2FyZCBzZWVtcyBpbmNhcGFibGUgb2YgaWRlbnRpZnlpbmcKL2VmaS9i b290L2Jvb3Rsb29uZ2FyY2g2NC5lZmkgYXMgYSB2YWxpZCByZW1vdmFibGUgRUZJIGltYWdlLgoK SW4gYW55IGNhc2UsIGFjY29yZGluZyB0byB0aGUgVUVGSSBTcGVjaWZpY2F0aW9uLCBhbGwgcGF0 aHMgYW5kIGltYWdlCmZpbGVuYW1lcyBzaG91bGQgYmUgY2FwaXRhbGlzZWQgKHdpdGggdGhlIGV4 Y2VwdGlvbiBvZiBCT09UeDY0LkVGSSwgCmFjY29yZGluZwp0byBzZWN0aW9uIDMuNS4xLjEsIGZv ciBzb21lIHJlYXNvbikgdG8gc3RheSBjb21wbGlhbnQuIFRoZSBMb29uZ3NvbiAKY2FzZSBpcwpv bmx5IG9uZSBleGFtcGxlIG9mIHVzZXJzIHJ1bm5pbmcgaW50byBidWdneSBmaXJtd2FyZSBhbmQg dW5ib290YWJsZSAKR1JVQgpJU08gaW1hZ2VzLgoKU2lnbmVkLW9mZi1ieTogTWluZ2NvbmcgQmFp IDxqZWZmYmFpQGFvc2MuaW8+Ci0tLQogIHV0aWwvZ3J1Yi1ta3Jlc2N1ZS5jIHwgMjQgKysrKysr KysrKysrLS0tLS0tLS0tLS0tCiAgMSBmaWxlIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDEy IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3V0aWwvZ3J1Yi1ta3Jlc2N1ZS5jIGIvdXRpbC9n cnViLW1rcmVzY3VlLmMKaW5kZXggMjc2OTZlMDM0Li45NjNiNDcxMTcgMTAwNjQ0Ci0tLSBhL3V0 aWwvZ3J1Yi1ta3Jlc2N1ZS5jCisrKyBiL3V0aWwvZ3J1Yi1ta3Jlc2N1ZS5jCkBAIC03NjksOCAr NzY5LDggQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKICAgICAgICB8fCBzb3VyY2Vf ZGlyc1tHUlVCX0lOU1RBTExfUExBVEZPUk1fUklTQ1Y2NF9FRkldKQogICAgICB7CiAgICAgICAg RklMRSAqZjsKLSAgICAgIGNoYXIgKmVmaWRpcl9lZmkgPSBncnViX3V0aWxfcGF0aF9jb25jYXQg KDIsIGlzbzk2NjBfZGlyLCAiZWZpIik7Ci0gICAgICBjaGFyICplZmlkaXJfZWZpX2Jvb3QgPSBn cnViX3V0aWxfcGF0aF9jb25jYXQgKDMsIGlzbzk2NjBfZGlyLCAKImVmaSIsICJib290Iik7Cisg ICAgICBjaGFyICplZmlkaXJfZWZpID0gZ3J1Yl91dGlsX3BhdGhfY29uY2F0ICgyLCBpc285NjYw X2RpciwgIkVGSSIpOworICAgICAgY2hhciAqZWZpZGlyX2VmaV9ib290ID0gZ3J1Yl91dGlsX3Bh dGhfY29uY2F0ICgzLCBpc285NjYwX2RpciwgCiJFRkkiLCAiQk9PVCIpOwogICAgICAgIGNoYXIg KmltZ25hbWUsICppbWczMiwgKmltZzY0LCAqaW1nX21hYyA9IE5VTEw7CiAgICAgICAgY2hhciAq ZWZpaW1nZmF0LCAqaXNvX3V1aWRfZmlsZSwgKmRpc2tkaXIsICpkaXNrZGlyX3V1aWQ7CiAgICAg ICAgZ3J1Yl9pbnN0YWxsX21rZGlyX3AgKGVmaWRpcl9lZmlfYm9vdCk7CkBAIC03OTIsNTIgKzc5 Miw1MiBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqYXJndltdKQogICAgICAgIGZyZWUgKGRpc2tk aXJfdXVpZCk7CiAgICAgICAgZnJlZSAoZGlza2Rpcik7CgotICAgICAgaW1nbmFtZSA9IGdydWJf dXRpbF9wYXRoX2NvbmNhdCAoMiwgZWZpZGlyX2VmaV9ib290LCAKImJvb3RpYTY0LmVmaSIpOwor ICAgICAgaW1nbmFtZSA9IGdydWJfdXRpbF9wYXRoX2NvbmNhdCAoMiwgZWZpZGlyX2VmaV9ib290 LCAKIkJPT1RJQTY0LkVGSSIpOwogICAgICAgIG1ha2VfaW1hZ2VfZndkaXNrX2FicyAoR1JVQl9J TlNUQUxMX1BMQVRGT1JNX0lBNjRfRUZJLCAKImlhNjQtZWZpIiwgaW1nbmFtZSk7CiAgICAgICAg ZnJlZSAoaW1nbmFtZSk7CgogICAgICAgIGdydWJfaW5zdGFsbF9wdXNoX21vZHVsZSAoInBhcnRf YXBwbGUiKTsKLSAgICAgIGltZzY0ID0gZ3J1Yl91dGlsX3BhdGhfY29uY2F0ICgyLCBlZmlkaXJf ZWZpX2Jvb3QsIAoiYm9vdHg2NC5lZmkiKTsKKyAgICAgIGltZzY0ID0gZ3J1Yl91dGlsX3BhdGhf Y29uY2F0ICgyLCBlZmlkaXJfZWZpX2Jvb3QsIAoiQk9PVHg2NC5FRkkiKTsKICAgICAgICBtYWtl X2ltYWdlX2FicyAoR1JVQl9JTlNUQUxMX1BMQVRGT1JNX1g4Nl82NF9FRkksICJ4ODZfNjQtZWZp IiwgCmltZzY0KTsKICAgICAgICBncnViX2luc3RhbGxfcG9wX21vZHVsZSAoKTsKCiAgICAgICAg Z3J1Yl9pbnN0YWxsX3B1c2hfbW9kdWxlICgicGFydF9hcHBsZSIpOwotICAgICAgaW1nMzIgPSBn cnViX3V0aWxfcGF0aF9jb25jYXQgKDIsIGVmaWRpcl9lZmlfYm9vdCwgCiJib290aWEzMi5lZmki KTsKKyAgICAgIGltZzMyID0gZ3J1Yl91dGlsX3BhdGhfY29uY2F0ICgyLCBlZmlkaXJfZWZpX2Jv b3QsIAoiQk9PVElBMzIuRUZJIik7CiAgICAgICAgbWFrZV9pbWFnZV9hYnMgKEdSVUJfSU5TVEFM TF9QTEFURk9STV9JMzg2X0VGSSwgImkzODYtZWZpIiwgCmltZzMyKTsKICAgICAgICBncnViX2lu c3RhbGxfcG9wX21vZHVsZSAoKTsKCi0gICAgICBpbWduYW1lID0gZ3J1Yl91dGlsX3BhdGhfY29u Y2F0ICgyLCBlZmlkaXJfZWZpX2Jvb3QsIAoiYm9vdGFybS5lZmkiKTsKKyAgICAgIGltZ25hbWUg PSBncnViX3V0aWxfcGF0aF9jb25jYXQgKDIsIGVmaWRpcl9lZmlfYm9vdCwgCiJCT09UQVJNLkVG SSIpOwogICAgICAgIG1ha2VfaW1hZ2VfYWJzIChHUlVCX0lOU1RBTExfUExBVEZPUk1fQVJNX0VG SSwgImFybS1lZmkiLCAKaW1nbmFtZSk7CiAgICAgICAgZnJlZSAoaW1nbmFtZSk7CgotICAgICAg aW1nbmFtZSA9IGdydWJfdXRpbF9wYXRoX2NvbmNhdCAoMiwgZWZpZGlyX2VmaV9ib290LCAKImJv b3RhYTY0LmVmaSIpOworICAgICAgaW1nbmFtZSA9IGdydWJfdXRpbF9wYXRoX2NvbmNhdCAoMiwg ZWZpZGlyX2VmaV9ib290LCAKIkJPT1RBQTY0LkVGSSIpOwogICAgICAgIG1ha2VfaW1hZ2VfYWJz IChHUlVCX0lOU1RBTExfUExBVEZPUk1fQVJNNjRfRUZJLCAiYXJtNjQtZWZpIiwgCmltZ25hbWUp OwogICAgICAgIGZyZWUgKGltZ25hbWUpOwoKLSAgICAgIGltZ25hbWUgPSBncnViX3V0aWxfcGF0 aF9jb25jYXQgKDIsIGVmaWRpcl9lZmlfYm9vdCwgCiJib290bG9vbmdhcmNoNjQuZWZpIik7Cisg ICAgICBpbWduYW1lID0gZ3J1Yl91dGlsX3BhdGhfY29uY2F0ICgyLCBlZmlkaXJfZWZpX2Jvb3Qs IAoiQk9PVExPT05HQVJDSDY0LkVGSSIpOwogICAgICAgIG1ha2VfaW1hZ2VfZndkaXNrX2FicyAo R1JVQl9JTlNUQUxMX1BMQVRGT1JNX0xPT05HQVJDSDY0X0VGSSwKICAJCQkgICAgICJsb29uZ2Fy Y2g2NC1lZmkiLAogIAkJCSAgICAgaW1nbmFtZSk7CiAgICAgICAgZnJlZSAoaW1nbmFtZSk7Cgot ICAgICAgaW1nbmFtZSA9IGdydWJfdXRpbF9wYXRoX2NvbmNhdCAoMiwgZWZpZGlyX2VmaV9ib290 LCAKImJvb3RyaXNjdjMyLmVmaSIpOworICAgICAgaW1nbmFtZSA9IGdydWJfdXRpbF9wYXRoX2Nv bmNhdCAoMiwgZWZpZGlyX2VmaV9ib290LCAKIkJPT1RSSVNDVjMyLkVGSSIpOwogICAgICAgIG1h a2VfaW1hZ2VfYWJzIChHUlVCX0lOU1RBTExfUExBVEZPUk1fUklTQ1YzMl9FRkksICJyaXNjdjMy LWVmaSIsIAppbWduYW1lKTsKICAgICAgICBmcmVlIChpbWduYW1lKTsKCi0gICAgICBpbWduYW1l ID0gZ3J1Yl91dGlsX3BhdGhfY29uY2F0ICgyLCBlZmlkaXJfZWZpX2Jvb3QsIAoiYm9vdHJpc2N2 NjQuZWZpIik7CisgICAgICBpbWduYW1lID0gZ3J1Yl91dGlsX3BhdGhfY29uY2F0ICgyLCBlZmlk aXJfZWZpX2Jvb3QsIAoiQk9PVFJJU0NWNjQuRUZJIik7CiAgICAgICAgbWFrZV9pbWFnZV9hYnMg KEdSVUJfSU5TVEFMTF9QTEFURk9STV9SSVNDVjY0X0VGSSwgInJpc2N2NjQtZWZpIiwgCmltZ25h bWUpOwogICAgICAgIGZyZWUgKGltZ25hbWUpOwoKICAgICAgICBpZiAoc291cmNlX2RpcnNbR1JV Ql9JTlNUQUxMX1BMQVRGT1JNX0kzODZfRUZJXSkKICAJewotCSAgaW1nbmFtZSA9IGdydWJfdXRp bF9wYXRoX2NvbmNhdCAoMiwgZWZpZGlyX2VmaV9ib290LCAiYm9vdC5lZmkiKTsKKwkgIGltZ25h bWUgPSBncnViX3V0aWxfcGF0aF9jb25jYXQgKDIsIGVmaWRpcl9lZmlfYm9vdCwgIkJPT1QuRUZJ Iik7CiAgCSAgLyogRm9yIG9sZCBtYWNzLiBTdWdnZXN0ZWQgYnkgUGV0ZXIgSm9uZXMuICAqLwog IAkgIGdydWJfaW5zdGFsbF9jb3B5X2ZpbGUgKGltZzMyLCBpbWduYW1lLCAxKTsKICAJfQoKICAg ICAgICBpZiAoc291cmNlX2RpcnNbR1JVQl9JTlNUQUxMX1BMQVRGT1JNX0kzODZfRUZJXQogIAkg IHx8IHNvdXJjZV9kaXJzW0dSVUJfSU5TVEFMTF9QTEFURk9STV9YODZfNjRfRUZJXSkKLQlpbWdf bWFjID0gZ3J1Yl91dGlsX3BhdGhfY29uY2F0ICgyLCBjb3JlX3NlcnZpY2VzLCAiYm9vdC5lZmki KTsKKwlpbWdfbWFjID0gZ3J1Yl91dGlsX3BhdGhfY29uY2F0ICgyLCBjb3JlX3NlcnZpY2VzLCAi Qk9PVC5FRkkiKTsKCiAgICAgICAgaWYgKHNvdXJjZV9kaXJzW0dSVUJfSU5TVEFMTF9QTEFURk9S TV9JMzg2X0VGSV0KICAJICAmJiBzb3VyY2VfZGlyc1tHUlVCX0lOU1RBTExfUExBVEZPUk1fWDg2 XzY0X0VGSV0pCi0tIAoyLjQ1LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpHcnViLWRldmVsIG1haWxpbmcgbGlzdApHcnViLWRldmVsQGdudS5vcmcK aHR0cHM6Ly9saXN0cy5nbnUub3JnL21haWxtYW4vbGlzdGluZm8vZ3J1Yi1kZXZlbAo=