233080 2021-11-12 16:52:43 -0800 [webkitpy] Symlink daemons into simulator runtime root 2021-11-16 07:50:08 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED WONTFIX https://bugs.webkit.org/show_bug.cgi?id=232982 InRadar P2 Normal --- 1 jbedard jbedard ap beidson ews-watchlist glenn webkit-bug-importer oldest_to_newest 1814687 0 jbedard 2021-11-12 16:52:43 -0800 WebKit daemons live inside the WebKit framework. However, we can't start these daemons during testing because they live outside the runtime root of the simulator. If we symlink our daemons into the simulator runtime root, we can safely test them. 1814688 1 webkit-bug-importer 2021-11-12 16:53:01 -0800 <rdar://problem/85362551> 1814692 2 444125 jbedard 2021-11-12 16:59:10 -0800 Created attachment 444125 Patch 1814693 3 jbedard 2021-11-12 16:59:36 -0800 Pull-request: https://github.com/WebKit/WebKit/pull/38 1814694 4 444125 beidson 2021-11-12 17:06:33 -0800 Comment on attachment 444125 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=444125&action=review > Tools/Scripts/webkitpy/api_tests/manager.py:156 > + # Daemons can't be called from outside the runtime root I would phrase a bit differently, like: "A Daemons executable path must be located within the runtime root" 1814706 5 444125 ap 2021-11-12 17:25:36 -0800 Comment on attachment 444125 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=444125&action=review > Tools/ChangeLog:3 > + [webkitpy] Symlink daemons into simulator runtime root Does this modify what's inside /Applications/Xcode.app? If so, this seems very undesirable. 1814708 6 jbedard 2021-11-12 17:31:12 -0800 (In reply to Alexey Proskuryakov from comment #5) > Comment on attachment 444125 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=444125&action=review > > > Tools/ChangeLog:3 > > + [webkitpy] Symlink daemons into simulator runtime root > > Does this modify what's inside /Applications/Xcode.app? If so, this seems > very undesirable. Yes, not sure there is another way to do this, though. Simulators can't interact with daemons outside of their runtime root. We're sticking the binaries in a place that shouldn't effect anything. 1814721 7 beidson 2021-11-12 18:42:39 -0800 (In reply to Jonathan Bedard from comment #6) > (In reply to Alexey Proskuryakov from comment #5) > > Comment on attachment 444125 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=444125&action=review > > > > > Tools/ChangeLog:3 > > > + [webkitpy] Symlink daemons into simulator runtime root > > > > Does this modify what's inside /Applications/Xcode.app? If so, this seems > > very undesirable. > > Yes, not sure there is another way to do this, though. Simulators can't > interact with daemons outside of their runtime root. We're sticking the > binaries in a place that shouldn't effect anything. Right. We chose a symlink location that has zero chance of conflicting with any other built-in file that might end up in a future runtime root, and a near-zero chance of affecting anything else with the runtime. To test our daemons (which is a quite desirable thing to do) we have no other identified options. 1814732 8 jbedard 2021-11-12 20:47:42 -0800 Landed https://commits.webkit.org/244216@main (r285772)! If we come up with a better technique in the coming weeks, happy to remove this. I think it's important to unblock testing for now, though. 1814741 9 beidson 2021-11-12 23:44:18 -0800 (In reply to Jonathan Bedard from comment #8) > Landed https://commits.webkit.org/244216@main (r285772)! > > If we come up with a better technique in the coming weeks, happy to remove > this. I think it's important to unblock testing for now, though. This patch worked for you locally, for me locally, and for EWS here when you put the patch in the queue. But with my patch over in https://bugs.webkit.org/show_bug.cgi?id=232982 it fails to do the link: https://ews-build.webkit.org/#/builders/9/builds/58765 1814752 10 ap 2021-11-13 08:10:44 -0800 I think that this is strictly unacceptable, whether there is another solution or not. I will be reverting this change. 1814791 11 jbedard 2021-11-13 13:59:00 -0800 Reverted r285772 for reason: Ownership issues in some XCode installs Committed r285779 (244223@main): <https://commits.webkit.org/244223@main> 1814795 12 jbedard 2021-11-13 14:00:40 -0800 Reverted the change because it didn't unblock Brady anyways and I think Brady's patch meant that this change was breaking some EWS queues. I do think that symlinking is still the right approach, but let's figure out our options next week. 1815128 13 444276 jbedard 2021-11-15 10:58:34 -0800 Created attachment 444276 Patch 1815476 14 jbedard 2021-11-16 07:50:08 -0800 Brady found another way to solve this problem, closing this bug. 444125 2021-11-12 16:59:10 -0800 2021-11-12 20:47:51 -0800 Patch bug-233080-20211112165909.patch text/plain 8975 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NzYzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTc1NWM4YjIyZGNmMjNmYTZiMTc3NTIzYmNlNDI3ZDEy OTIzMGEzYi4uNzE2YjM3YzE3NDkzZGUzNDZmZTc2MDU5NjY0ZjZlYzM2ZTgzZDUxYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDIxLTExLTEyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0cHldIFN5bWxpbmsgZGFlbW9ucyBpbnRvIHNpbXVsYXRvciBydW50aW1l IHJvb3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz MzA4MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODUzNjI1NTE+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2FwaV90 ZXN0cy9tYW5hZ2VyLnB5OgorICAgICAgICAoTWFuYWdlci5faW5pdGlhbGl6ZV9kZXZpY2VzKTog U3ltbGluayBkYWVtb25zIGluIHRoZSBXZWJLaXQuZnJhbWV3b3JrIGludG8KKyAgICAgICAgc2lt dWxhdG9yIHJ1bnRpbWUgcm9vdC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9z eXN0ZW0vZmlsZXN5c3RlbS5weToKKyAgICAgICAgKEZpbGVTeXN0ZW0uc3ltbGluayk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW1fbW9jay5weToK KyAgICAgICAgKE1vY2tGaWxlU3lzdGVtLnN5bWxpbmspOgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvcG9ydC9kYXJ3aW4ucHk6CisgICAgICAgIChEYXJ3aW5Qb3J0LnBhdGhfdG9fZGFlbW9u cyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0ZWRfZGV2aWNlLnB5 OgorICAgICAgICAoU2ltdWxhdGVkRGV2aWNlTWFuYWdlci5SdW50aW1lLl9faW5pdF9fKTogQWRk IHJvb3QuCisgICAgICAgIChTaW11bGF0ZWREZXZpY2VNYW5hZ2VyLl9jcmVhdGVfZGV2aWNlX3dp dGhfcnVudGltZSk6IFBhc3MgcnVudGltZS4KKyAgICAgICAgKFNpbXVsYXRlZERldmljZS5fX2lu aXRfXyk6IExpbmsgdG8gcnVudGltZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3hjb2Rl L3NpbXVsYXRlZF9kZXZpY2VfdW5pdHRlc3QucHk6CisKIDIwMjEtMTEtMTIgIFNpaHVpIExpdSAg PHNpaHVpX2xpdUBhcHBsZS5jb20+CiAKICAgICAgICAgU2V0IGRlZmF1bHQgZ2VuZXJhbCBzdG9y YWdlIGRpcmVjdG9yeSB0byB3ZWJzaXRlRGF0YURpcmVjdG9yeQpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9hcGlfdGVzdHMvbWFuYWdlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvYXBpX3Rlc3RzL21hbmFnZXIucHkKaW5kZXggZGVmOTE2NjM3MTNjMWJlZjA4NzI0Zjkx MzU1NTFhOTBlOWEyMjMxMS4uOGViZGYwOWIwZDA2NmY3ZDAxMzliYzM5Mzc3OTg3NGY5ZmNmY2E2 MiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9hcGlfdGVzdHMvbWFuYWdlci5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2FwaV90ZXN0cy9tYW5hZ2VyLnB5CkBAIC0x NTIsNiArMTUyLDIyIEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICBkZWYgX2luaXRpYWxp emVfZGV2aWNlcyhzZWxmKToKICAgICAgICAgaWYgJ3NpbXVsYXRvcicgaW4gc2VsZi5fcG9ydC5w b3J0X25hbWU6CiAgICAgICAgICAgICBTaW11bGF0ZWREZXZpY2VNYW5hZ2VyLmluaXRpYWxpemVf ZGV2aWNlcyhEZXZpY2VSZXF1ZXN0KHNlbGYuX3BvcnQuREVWSUNFX1RZUEUsIGFsbG93X2luY29t cGxldGVfbWF0Y2g9VHJ1ZSksIHNlbGYuaG9zdCwgc2ltdWxhdG9yX3VpPUZhbHNlKQorCisgICAg ICAgICAgICAjIERhZW1vbnMgY2FuJ3QgYmUgY2FsbGVkIGZyb20gb3V0c2lkZSB0aGUgcnVudGlt ZSByb290CisgICAgICAgICAgICByb290cyA9IHsKKyAgICAgICAgICAgICAgICBkZXZpY2UucGxh dGZvcm1fZGV2aWNlLnJ1bnRpbWUucm9vdCBmb3IgZGV2aWNlIGluIFNpbXVsYXRlZERldmljZU1h bmFnZXIuSU5JVElBTElaRURfREVWSUNFUworICAgICAgICAgICAgICAgIGlmIGRldmljZS5wbGF0 Zm9ybV9kZXZpY2UucnVudGltZSBhbmQgZGV2aWNlLnBsYXRmb3JtX2RldmljZS5ydW50aW1lLnJv b3QKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGZzID0gc2VsZi5fcG9ydC5ob3N0LmZpbGVz eXN0ZW0KKyAgICAgICAgICAgIGZvciByb290IGluIHJvb3RzOgorICAgICAgICAgICAgICAgIF9s b2cuZGVidWcoIkxpbmtpbmcgRGFlbW9ucyBpbnRvIHJ1bnRpbWUgcm9vdCAne30nIi5mb3JtYXQo cm9vdCkpCisgICAgICAgICAgICAgICAgZm9yIGZpbGUgaW4gZnMuZmlsZXNfdW5kZXIoc2VsZi5f cG9ydC5wYXRoX3RvX2RhZW1vbnMoKSk6CisgICAgICAgICAgICAgICAgICAgIHRhcmdldCA9IGZz LmpvaW4ocm9vdCwgJ3VzcicsICdsb2NhbCcsICdiaW4nLCAnd2Via2l0LXRlc3RpbmcnLCBmcy5i YXNlbmFtZShmaWxlKSkKKyAgICAgICAgICAgICAgICAgICAgZnMubWF5YmVfbWFrZV9kaXJlY3Rv cnkoZnMuZGlybmFtZSh0YXJnZXQpKQorICAgICAgICAgICAgICAgICAgICBpZiBmcy5pc2ZpbGUo dGFyZ2V0KToKKyAgICAgICAgICAgICAgICAgICAgICAgIGZzLnJlbW92ZSh0YXJnZXQpCisgICAg ICAgICAgICAgICAgICAgIGZzLnN5bWxpbmsoZmlsZSwgdGFyZ2V0KQorCiAgICAgICAgIGVsaWYg J2RldmljZScgaW4gc2VsZi5fcG9ydC5wb3J0X25hbWU6CiAgICAgICAgICAgICByYWlzZSBSdW50 aW1lRXJyb3IoJ1J1bm5pbmcgYXBpIHRlc3RzIG9uIHt9IGlzIG5vdCBzdXBwb3J0ZWQnLmZvcm1h dChzZWxmLl9wb3J0LnBvcnRfbmFtZSkpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW0ucHkKaW5kZXggYjY2MmI1YzUyYWYwNzI5NThiNWZi MDk5OGQ2NjRhNDNmNzg2MTliMi4uZGE0ODIyNmVkODVkMmVkZTA5NTNhMjViZTMzYjY1NDRkZTE0 MmMxOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2Zp bGVzeXN0ZW0ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2Zp bGVzeXN0ZW0ucHkKQEAgLTMzOSwzICszMzksNiBAQCBjbGFzcyBGaWxlU3lzdGVtKG9iamVjdCk6 CiAgICAgICAgICAgICBzZWxmLmNvcHl0cmVlKHNvdXJjZSwgZGVzdGluYXRpb24pCiAgICAgICAg IGVsc2U6CiAgICAgICAgICAgICBzZWxmLmNvcHlmaWxlKHNvdXJjZSwgZGVzdGluYXRpb24pCisK KyAgICBkZWYgc3ltbGluayhzZWxmLCAqYXJncywgKiprd2FyZ3MpOgorICAgICAgICBvcy5zeW1s aW5rKCphcmdzLCAqKmt3YXJncykKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL3N5c3RlbS9maWxlc3lzdGVtX21vY2sucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbV9tb2NrLnB5CmluZGV4IDg4MDlkMmRkYzI3OGFmMTFj YThjY2ExMThlYjhjYTU0NzNmMTFkZTcuLjFkMjE4MjBiMmYwOTRlZTA5MDQ2M2NiOWI0MzVlMzE4 ZTRjNGRmMWMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3Rl bS9maWxlc3lzdGVtX21vY2sucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v c3lzdGVtL2ZpbGVzeXN0ZW1fbW9jay5weQpAQCAtNDM2LDYgKzQzNiw5IEBAIGNsYXNzIE1vY2tG aWxlU3lzdGVtKG9iamVjdCk6CiAgICAgZGVmIGNvcHlfZnJvbV9iYXNlX2hvc3Qoc2VsZiwgc291 cmNlLCBkZXN0aW5hdGlvbik6CiAgICAgICAgIHNlbGYubW92ZShzb3VyY2UsIGRlc3RpbmF0aW9u KQogCisgICAgZGVmIHN5bWxpbmsoc2VsZiwgc3JjLCBkc3QpOgorICAgICAgICBzZWxmLm1vdmUo c3JjLCBkc3QpCisKIAogY2xhc3MgV3JpdGFibGVCaW5hcnlGaWxlT2JqZWN0KG9iamVjdCk6CiAg ICAgZGVmIF9faW5pdF9fKHNlbGYsIGZzLCBwYXRoKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC9kYXJ3aW4ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQv ZGFyd2luLnB5CmluZGV4IDZmNDhiZjhiYmY1NDYzZGUyMTA5N2JiMTRhM2M5NGNhMWE5NmQ4OTgu LjFjNmY4ODYwYjhhMWNjMzNkNzc1YTljYzJiZjE2OWFlNDY5NmU4OTUgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kYXJ3aW4ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9wb3J0L2Rhcndpbi5weQpAQCAtODIsNiArODIsOSBAQCBjbGFzcyBEYXJ3aW5Qb3J0 KEFwcGxlUG9ydCk6CiAgICAgZGVmIF9wYXRoX3RvX3dlYmNvcmVfbGlicmFyeShzZWxmKToKICAg ICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoJ1dlYkNvcmUuZnJhbWV3b3JrL1ZlcnNpb25z L0EvV2ViQ29yZScpCiAKKyAgICBkZWYgcGF0aF90b19kYWVtb25zKHNlbGYpOgorICAgICAgICBy ZXR1cm4gc2VsZi5fYnVpbGRfcGF0aCgnV2ViS2l0LmZyYW1ld29yay9EYWVtb25zJykKKwogICAg IGRlZiBzaG93X3Jlc3VsdHNfaHRtbF9maWxlKHNlbGYsIHJlc3VsdHNfZmlsZW5hbWUpOgogICAg ICAgICAjIFdlIGRvbid0IHVzZSBzZWxmLl9ydW5fc2NyaXB0KCkgYmVjYXVzZSB3ZSBkb24ndCB3 YW50IHRvIHdhaXQgZm9yIHRoZSBzY3JpcHQKICAgICAgICAgIyB0byBleGl0IGFuZCB3ZSB3YW50 IHRoZSBvdXRwdXQgdG8gc2hvdyB1cCBvbiBzdGRvdXQgaW4gY2FzZSB0aGVyZSBhcmUgZXJyb3Jz CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRlZF9kZXZp Y2UucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRlZF9kZXZpY2UucHkK aW5kZXggODkxMjAxMzRjYWU2NWY3NzhlNDA4MWU0NzYxZDY4YzljNWM2YWFhNy4uODkwNDUyNDlh N2Y4Mzk3ZjZhMjdiYmY3Y2U0NWM5M2I1ZmRiOTcwYSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS94Y29kZS9zaW11bGF0ZWRfZGV2aWNlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkveGNvZGUvc2ltdWxhdGVkX2RldmljZS5weQpAQCAtNjAsNiArNjAsNyBAQCBjbGFz cyBTaW11bGF0ZWREZXZpY2VNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLnZlcnNp b24gPSBWZXJzaW9uLmZyb21fc3RyaW5nKHJ1bnRpbWVfZGljdFsndmVyc2lvbiddKQogICAgICAg ICAgICAgc2VsZi5pZGVudGlmaWVyID0gcnVudGltZV9kaWN0WydpZGVudGlmaWVyJ10KICAgICAg ICAgICAgIHNlbGYubmFtZSA9IHJ1bnRpbWVfZGljdFsnbmFtZSddCisgICAgICAgICAgICBzZWxm LnJvb3QgPSBydW50aW1lX2RpY3QuZ2V0KCdydW50aW1lUm9vdCcpCiAKICAgICBBVkFJTEFCTEVf UlVOVElNRVMgPSBbXQogICAgIEFWQUlMQUJMRV9ERVZJQ0VTID0gW10KQEAgLTEyMyw2ICsxMjQs NyBAQCBjbGFzcyBTaW11bGF0ZWREZXZpY2VNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAgICBo b3N0PWhvc3QsCiAgICAgICAgICAgICBkZXZpY2VfdHlwZT1kZXZpY2VfdHlwZSwKICAgICAgICAg ICAgIGJ1aWxkX3ZlcnNpb249cnVudGltZS5idWlsZF92ZXJzaW9uLAorICAgICAgICAgICAgcnVu dGltZT1ydW50aW1lLAogICAgICAgICApKQogICAgICAgICBTaW11bGF0ZWREZXZpY2VNYW5hZ2Vy LkFWQUlMQUJMRV9ERVZJQ0VTLmFwcGVuZChyZXN1bHQpCiAgICAgICAgIHJldHVybiByZXN1bHQK QEAgLTU0NCwxMyArNTQ2LDE0IEBAIGNsYXNzIFNpbXVsYXRlZERldmljZShvYmplY3QpOgogICAg ICAgICAnd2F0Y2hPUyc6ICdjb20uYXBwbGUuY2Fyb3VzZWwuc2Vzc2lvbnNlcnZpY2UnLAogICAg IH0KIAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCB1ZGlkLCBob3N0LCBkZXZpY2VfdHlw ZSwgYnVpbGRfdmVyc2lvbik6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIHVkaWQsIGhv c3QsIGRldmljZV90eXBlLCBidWlsZF92ZXJzaW9uLCBydW50aW1lKToKICAgICAgICAgYXNzZXJ0 IGRldmljZV90eXBlLnNvZnR3YXJlX3ZlcnNpb24KIAogICAgICAgICBzZWxmLm5hbWUgPSBuYW1l CiAgICAgICAgIHNlbGYudWRpZCA9IHVkaWQKICAgICAgICAgc2VsZi5kZXZpY2VfdHlwZSA9IGRl dmljZV90eXBlCiAgICAgICAgIHNlbGYuYnVpbGRfdmVyc2lvbiA9IGJ1aWxkX3ZlcnNpb24KKyAg ICAgICAgc2VsZi5ydW50aW1lID0gcnVudGltZQogICAgICAgICBzZWxmLl9zdGF0ZSA9IFNpbXVs YXRlZERldmljZS5EZXZpY2VTdGF0ZS5TSFVUVElOR19ET1dOCiAKICAgICAgICAgc2VsZi5leGVj dXRpdmUgPSBob3N0LmV4ZWN1dGl2ZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS94Y29kZS9zaW11bGF0ZWRfZGV2aWNlX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS94Y29kZS9zaW11bGF0ZWRfZGV2aWNlX3VuaXR0ZXN0LnB5CmluZGV4IDE1OTk5ZjFhZDRj NjU4MGYyYmE2YjU1YjA0YTUwZmE2ZjIzOWRkNGYuLjIyNmU3ODdiMmI2ZDVmZmIyNjQwOWMyNTFj OGYyYzU1ZDI2MTgyOGEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUv c2ltdWxhdGVkX2RldmljZV91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3hjb2RlL3NpbXVsYXRlZF9kZXZpY2VfdW5pdHRlc3QucHkKQEAgLTE2OCwzNSArMTY4LDQwIEBA IHNpbWN0bF9qc29uX291dHB1dCA9ICIiInsKICAgICAgImF2YWlsYWJpbGl0eSIgOiAiKGF2YWls YWJsZSkiLAogICAgICAibmFtZSIgOiAiaU9TIDkuMyIsCiAgICAgICJpZGVudGlmaWVyIiA6ICJj b20uYXBwbGUuQ29yZVNpbXVsYXRvci5TaW1SdW50aW1lLmlPUy05LTMiLAotICAgICAidmVyc2lv biIgOiAiOS4zIgorICAgICAidmVyc2lvbiIgOiAiOS4zIiwKKyAgICAgInJ1bnRpbWVSb290IiA6 ICIvQXBwbGljYXRpb25zL1hjb2RlLmFwcC9Db250ZW50cy9EZXZlbG9wZXIvUGxhdGZvcm1zL2lQ aG9uZU9TLnBsYXRmb3JtL0xpYnJhcnkvRGV2ZWxvcGVyL0NvcmVTaW11bGF0b3IvUHJvZmlsZXMv UnVudGltZXMvaU9TIDkuMy5zaW1ydW50aW1lL0NvbnRlbnRzL1Jlc291cmNlcy9SdW50aW1lUm9v dCIKICAgIH0sCiAgICB7CiAgICAgICJidWlsZHZlcnNpb24iIDogIjE1QTg0MDEiLAogICAgICAi YXZhaWxhYmlsaXR5IiA6ICIoYXZhaWxhYmxlKSIsCiAgICAgICJuYW1lIiA6ICJpT1MgMTEuMCIs CiAgICAgICJpZGVudGlmaWVyIiA6ICJjb20uYXBwbGUuQ29yZVNpbXVsYXRvci5TaW1SdW50aW1l LmlPUy0xMS0wIiwKLSAgICAgInZlcnNpb24iIDogIjExLjAuMSIKKyAgICAgInZlcnNpb24iIDog IjExLjAuMSIsCisgICAgICJydW50aW1lUm9vdCIgOiAiL0FwcGxpY2F0aW9ucy9YY29kZS5hcHAv Q29udGVudHMvRGV2ZWxvcGVyL1BsYXRmb3Jtcy9pUGhvbmVPUy5wbGF0Zm9ybS9MaWJyYXJ5L0Rl dmVsb3Blci9Db3JlU2ltdWxhdG9yL1Byb2ZpbGVzL1J1bnRpbWVzL2lPUyAxMS4wLjEuc2ltcnVu dGltZS9Db250ZW50cy9SZXNvdXJjZXMvUnVudGltZVJvb3QiCiAgICB9LAogICAgewogICAgICAi YnVpbGR2ZXJzaW9uIiA6ICIxNUozODAiLAogICAgICAiYXZhaWxhYmlsaXR5IiA6ICIoYXZhaWxh YmxlKSIsCiAgICAgICJuYW1lIiA6ICJ0dk9TIDExLjAiLAogICAgICAiaWRlbnRpZmllciIgOiAi Y29tLmFwcGxlLkNvcmVTaW11bGF0b3IuU2ltUnVudGltZS50dk9TLTExLTAiLAotICAgICAidmVy c2lvbiIgOiAiMTEuMCIKKyAgICAgInZlcnNpb24iIDogIjExLjAiLAorICAgICAicnVudGltZVJv b3QiIDogIi9BcHBsaWNhdGlvbnMvWGNvZGUuYXBwL0NvbnRlbnRzL0RldmVsb3Blci9QbGF0Zm9y bXMvaVBob25lT1MucGxhdGZvcm0vTGlicmFyeS9EZXZlbG9wZXIvQ29yZVNpbXVsYXRvci9Qcm9m aWxlcy9SdW50aW1lcy90dk9TIDExLnNpbXJ1bnRpbWUvQ29udGVudHMvUmVzb3VyY2VzL1J1bnRp bWVSb290IgogICAgfSwKICAgIHsKICAgICAgImJ1aWxkdmVyc2lvbiIgOiAiMTVSMzcyIiwKICAg ICAgImF2YWlsYWJpbGl0eSIgOiAiKGF2YWlsYWJsZSkiLAogICAgICAibmFtZSIgOiAid2F0Y2hP UyA0LjAiLAogICAgICAiaWRlbnRpZmllciIgOiAiY29tLmFwcGxlLkNvcmVTaW11bGF0b3IuU2lt UnVudGltZS53YXRjaE9TLTQtMCIsCi0gICAgICJ2ZXJzaW9uIiA6ICI0LjAiCisgICAgICJ2ZXJz aW9uIiA6ICI0LjAiLAorICAgICAicnVudGltZVJvb3QiIDogIi9BcHBsaWNhdGlvbnMvWGNvZGUu YXBwL0NvbnRlbnRzL0RldmVsb3Blci9QbGF0Zm9ybXMvaVBob25lT1MucGxhdGZvcm0vTGlicmFy eS9EZXZlbG9wZXIvQ29yZVNpbXVsYXRvci9Qcm9maWxlcy9SdW50aW1lcy93YXRjaE9TIDQuc2lt cnVudGltZS9Db250ZW50cy9SZXNvdXJjZXMvUnVudGltZVJvb3QiCiAgICB9LAogICAgewogICAg ICAiYnVpbGR2ZXJzaW9uIiA6ICIxNkEzNjciLAogICAgICAiaXNBdmFpbGFibGUiIDogIllFUyIs CiAgICAgICJuYW1lIiA6ICJpT1MgMTIuMCIsCiAgICAgICJpZGVudGlmaWVyIiA6ICJjb20uYXBw bGUuQ29yZVNpbXVsYXRvci5TaW1SdW50aW1lLmlPUy0xMi0wIiwKLSAgICAgInZlcnNpb24iIDog IjEyLjAiCisgICAgICJ2ZXJzaW9uIiA6ICIxMi4wIiwKKyAgICAgInJ1bnRpbWVSb290IiA6ICIv QXBwbGljYXRpb25zL1hjb2RlLmFwcC9Db250ZW50cy9EZXZlbG9wZXIvUGxhdGZvcm1zL2lQaG9u ZU9TLnBsYXRmb3JtL0xpYnJhcnkvRGV2ZWxvcGVyL0NvcmVTaW11bGF0b3IvUHJvZmlsZXMvUnVu dGltZXMvaU9TIDEyLnNpbXJ1bnRpbWUvQ29udGVudHMvUmVzb3VyY2VzL1J1bnRpbWVSb290Igog ICAgfQogIF0sCiAgImRldmljZXMiIDogewo= 444276 2021-11-15 10:58:34 -0800 2021-11-15 10:58:34 -0800 Patch bug-233080-20211115105833.patch text/plain 5106 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1ODA5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGRlOWEyNWI2MGZiNDVlMmRlMGEwMjJlZWQ1YmJmMjc1 YThjZTc5Ni4uY2FlNDBlMjBlNjMxMDI4MjlmNTRhZWZjOTNkMjc0ODY2MTFlNTA1MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEx IEBACisyMDIxLTExLTE1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0cHldIFN5bWxpbmsgZGFlbW9ucyBpbnRvIHNpbXVsYXRvciBydW50aW1l IHJvb3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz MzA4MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODUzNjI1NTE+CisKKyAgICAgICAgV0lQCisK IDIwMjEtMTEtMTQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAg IEdldCBkYWVtb24gQVBJIHJlYWR5IHRvIHdvcmsgaW4gdGhlIGlPUyBzaW11bGF0b3IgKHN0YXJ0 aW5nIHdpdGggV2ViUHVzaEQpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Fw aV90ZXN0cy9tYW5hZ2VyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9hcGlfdGVzdHMvbWFu YWdlci5weQppbmRleCBkZWY5MTY2MzcxM2MxYmVmMDg3MjRmOTEzNTU1MWE5MGU5YTIyMzExLi42 NjUyZWVlYTdiYjk3YmZjZGVlMDc2ZDdhMzJjNDBhNGY1ZDBkYjkwIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2FwaV90ZXN0cy9tYW5hZ2VyLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvYXBpX3Rlc3RzL21hbmFnZXIucHkKQEAgLTE1Miw2ICsxNTIsMTcgQEAgY2xh c3MgTWFuYWdlcihvYmplY3QpOgogICAgIGRlZiBfaW5pdGlhbGl6ZV9kZXZpY2VzKHNlbGYpOgog ICAgICAgICBpZiAnc2ltdWxhdG9yJyBpbiBzZWxmLl9wb3J0LnBvcnRfbmFtZToKICAgICAgICAg ICAgIFNpbXVsYXRlZERldmljZU1hbmFnZXIuaW5pdGlhbGl6ZV9kZXZpY2VzKERldmljZVJlcXVl c3Qoc2VsZi5fcG9ydC5ERVZJQ0VfVFlQRSwgYWxsb3dfaW5jb21wbGV0ZV9tYXRjaD1UcnVlKSwg c2VsZi5ob3N0LCBzaW11bGF0b3JfdWk9RmFsc2UpCisKKyAgICAgICAgICAgICMgRGFlbW9ucyBj YW4ndCBiZSBjYWxsZWQgZnJvbSBvdXRzaWRlIHRoZSBzaW11bGF0b3Igcm9vdAorICAgICAgICAg ICAgZnMgPSBzZWxmLl9wb3J0Lmhvc3QuZmlsZXN5c3RlbQorICAgICAgICAgICAgZm9yIGRldmlj ZSBpbiBTaW11bGF0ZWREZXZpY2VNYW5hZ2VyLklOSVRJQUxJWkVEX0RFVklDRVM6CisgICAgICAg ICAgICAgICAgX2xvZy5kZWJ1ZygiTGlua2luZyBEYWVtb25zIGludG8gc2ltdWxhdG9yIHJvb3Qg J3t9JyIuZm9ybWF0KGRldmljZS5wbGF0Zm9ybV9kZXZpY2UudG1wKSkKKyAgICAgICAgICAgICAg ICBmb3IgZmlsZSBpbiBmcy5maWxlc191bmRlcihzZWxmLl9wb3J0LnBhdGhfdG9fZGFlbW9ucygp KToKKyAgICAgICAgICAgICAgICAgICAgdGFyZ2V0ID0gZnMuam9pbihkZXZpY2UucGxhdGZvcm1f ZGV2aWNlLnRtcCwgZnMuYmFzZW5hbWUoZmlsZSkpCisgICAgICAgICAgICAgICAgICAgIGlmIGZz LmlzZmlsZSh0YXJnZXQpOgorICAgICAgICAgICAgICAgICAgICAgICAgZnMucmVtb3ZlKHRhcmdl dCkKKyAgICAgICAgICAgICAgICAgICAgZnMuc3ltbGluayhmaWxlLCB0YXJnZXQpCisKICAgICAg ICAgZWxpZiAnZGV2aWNlJyBpbiBzZWxmLl9wb3J0LnBvcnRfbmFtZToKICAgICAgICAgICAgIHJh aXNlIFJ1bnRpbWVFcnJvcignUnVubmluZyBhcGkgdGVzdHMgb24ge30gaXMgbm90IHN1cHBvcnRl ZCcuZm9ybWF0KHNlbGYuX3BvcnQucG9ydF9uYW1lKSkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW0ucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbS5weQppbmRleCBiNjYyYjVjNTJhZjA3 Mjk1OGI1ZmIwOTk4ZDY2NGE0M2Y3ODYxOWIyLi5kYTQ4MjI2ZWQ4NWQyZWRlMDk1M2EyNWJlMzNi NjU0NGRlMTQyYzE4IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9z eXN0ZW0vZmlsZXN5c3RlbS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9z eXN0ZW0vZmlsZXN5c3RlbS5weQpAQCAtMzM5LDMgKzMzOSw2IEBAIGNsYXNzIEZpbGVTeXN0ZW0o b2JqZWN0KToKICAgICAgICAgICAgIHNlbGYuY29weXRyZWUoc291cmNlLCBkZXN0aW5hdGlvbikK ICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHNlbGYuY29weWZpbGUoc291cmNlLCBkZXN0aW5h dGlvbikKKworICAgIGRlZiBzeW1saW5rKHNlbGYsICphcmdzLCAqKmt3YXJncyk6CisgICAgICAg IG9zLnN5bWxpbmsoKmFyZ3MsICoqa3dhcmdzKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW1fbW9jay5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtX21vY2sucHkKaW5kZXggODgwOWQyZGRj Mjc4YWYxMWNhOGNjYTExOGViOGNhNTQ3M2YxMWRlNy4uMWQyMTgyMGIyZjA5NGVlMDkwNDYzY2I5 YjQzNWUzMThlNGM0ZGYxYyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vc3lzdGVtL2ZpbGVzeXN0ZW1fbW9jay5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbV9tb2NrLnB5CkBAIC00MzYsNiArNDM2LDkgQEAgY2xh c3MgTW9ja0ZpbGVTeXN0ZW0ob2JqZWN0KToKICAgICBkZWYgY29weV9mcm9tX2Jhc2VfaG9zdChz ZWxmLCBzb3VyY2UsIGRlc3RpbmF0aW9uKToKICAgICAgICAgc2VsZi5tb3ZlKHNvdXJjZSwgZGVz dGluYXRpb24pCiAKKyAgICBkZWYgc3ltbGluayhzZWxmLCBzcmMsIGRzdCk6CisgICAgICAgIHNl bGYubW92ZShzcmMsIGRzdCkKKwogCiBjbGFzcyBXcml0YWJsZUJpbmFyeUZpbGVPYmplY3Qob2Jq ZWN0KToKICAgICBkZWYgX19pbml0X18oc2VsZiwgZnMsIHBhdGgpOgpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Rhcndpbi5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvcG9ydC9kYXJ3aW4ucHkKaW5kZXggNmY0OGJmOGJiZjU0NjNkZTIxMDk3YmIxNGEzYzk0Y2Ex YTk2ZDg5OC4uMWM2Zjg4NjBiOGExY2MzM2Q3NzVhOWNjMmJmMTY5YWU0Njk2ZTg5NSAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Rhcndpbi5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luLnB5CkBAIC04Miw2ICs4Miw5IEBAIGNsYXNzIERh cndpblBvcnQoQXBwbGVQb3J0KToKICAgICBkZWYgX3BhdGhfdG9fd2ViY29yZV9saWJyYXJ5KHNl bGYpOgogICAgICAgICByZXR1cm4gc2VsZi5fYnVpbGRfcGF0aCgnV2ViQ29yZS5mcmFtZXdvcmsv VmVyc2lvbnMvQS9XZWJDb3JlJykKIAorICAgIGRlZiBwYXRoX3RvX2RhZW1vbnMoc2VsZik6Cisg ICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9wYXRoKCdXZWJLaXQuZnJhbWV3b3JrL0RhZW1vbnMn KQorCiAgICAgZGVmIHNob3dfcmVzdWx0c19odG1sX2ZpbGUoc2VsZiwgcmVzdWx0c19maWxlbmFt ZSk6CiAgICAgICAgICMgV2UgZG9uJ3QgdXNlIHNlbGYuX3J1bl9zY3JpcHQoKSBiZWNhdXNlIHdl IGRvbid0IHdhbnQgdG8gd2FpdCBmb3IgdGhlIHNjcmlwdAogICAgICAgICAjIHRvIGV4aXQgYW5k IHdlIHdhbnQgdGhlIG91dHB1dCB0byBzaG93IHVwIG9uIHN0ZG91dCBpbiBjYXNlIHRoZXJlIGFy ZSBlcnJvcnMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvc2ltdWxh dGVkX2RldmljZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvc2ltdWxhdGVkX2Rl dmljZS5weQppbmRleCA4OTEyMDEzNGNhZTY1Zjc3OGU0MDgxZTQ3NjFkNjhjOWM1YzZhYWE3Li5j Mzg0MGRmY2RhZTdlYmM0MGM0ZjllZGI2MGUyZWY3OGU0ZDlkM2IyIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRlZF9kZXZpY2UucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0ZWRfZGV2aWNlLnB5CkBAIC0xMjMsNiArMTIz LDcgQEAgY2xhc3MgU2ltdWxhdGVkRGV2aWNlTWFuYWdlcihvYmplY3QpOgogICAgICAgICAgICAg aG9zdD1ob3N0LAogICAgICAgICAgICAgZGV2aWNlX3R5cGU9ZGV2aWNlX3R5cGUsCiAgICAgICAg ICAgICBidWlsZF92ZXJzaW9uPXJ1bnRpbWUuYnVpbGRfdmVyc2lvbiwKKyAgICAgICAgICAgIHRt cD1kZXZpY2VfaW5mby5nZXQoJ2RhdGFQYXRoJyksCiAgICAgICAgICkpCiAgICAgICAgIFNpbXVs YXRlZERldmljZU1hbmFnZXIuQVZBSUxBQkxFX0RFVklDRVMuYXBwZW5kKHJlc3VsdCkKICAgICAg ICAgcmV0dXJuIHJlc3VsdApAQCAtNTQ0LDEzICs1NDUsMTQgQEAgY2xhc3MgU2ltdWxhdGVkRGV2 aWNlKG9iamVjdCk6CiAgICAgICAgICd3YXRjaE9TJzogJ2NvbS5hcHBsZS5jYXJvdXNlbC5zZXNz aW9uc2VydmljZScsCiAgICAgfQogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIHVkaWQs IGhvc3QsIGRldmljZV90eXBlLCBidWlsZF92ZXJzaW9uKToKKyAgICBkZWYgX19pbml0X18oc2Vs ZiwgbmFtZSwgdWRpZCwgaG9zdCwgZGV2aWNlX3R5cGUsIGJ1aWxkX3ZlcnNpb24sIHRtcD1Ob25l KToKICAgICAgICAgYXNzZXJ0IGRldmljZV90eXBlLnNvZnR3YXJlX3ZlcnNpb24KIAogICAgICAg ICBzZWxmLm5hbWUgPSBuYW1lCiAgICAgICAgIHNlbGYudWRpZCA9IHVkaWQKICAgICAgICAgc2Vs Zi5kZXZpY2VfdHlwZSA9IGRldmljZV90eXBlCiAgICAgICAgIHNlbGYuYnVpbGRfdmVyc2lvbiA9 IGJ1aWxkX3ZlcnNpb24KKyAgICAgICAgc2VsZi50bXAgPSB0bXAKICAgICAgICAgc2VsZi5fc3Rh dGUgPSBTaW11bGF0ZWREZXZpY2UuRGV2aWNlU3RhdGUuU0hVVFRJTkdfRE9XTgogCiAgICAgICAg IHNlbGYuZXhlY3V0aXZlID0gaG9zdC5leGVjdXRpdmUK