206620 2020-01-22 15:37:46 -0800 Makefiles should make webkitdirs aware of the SDK 2020-01-31 07:50:23 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified NEW https://bugs.webkit.org/show_bug.cgi?id=206618 https://bugs.webkit.org/show_bug.cgi?id=206703 https://bugs.webkit.org/show_bug.cgi?id=207045 P2 Normal --- 1 jbedard jbedard ap dbates ews-watchlist krollin rniwa saam thorton oldest_to_newest 1609785 0 jbedard 2020-01-22 15:37:46 -0800 Make should work with SDKROOT=iphoneos, for a number of reasons, it does not. I discovered these issues while fixing https://bugs.webkit.org/show_bug.cgi?id=206618. 1609868 1 ap 2020-01-22 17:13:59 -0800 I'm not sure if we need two ways to build, why is this desirable? 1609889 2 jbedard 2020-01-22 17:40:36 -0800 (In reply to Alexey Proskuryakov from comment #1) > I'm not sure if we need two ways to build, why is this desirable? Make allows partial builds, you can, for example, just build JavascriptCore. build-webkit (to my knowledge) does not (at least not without a specific script designed to do so) If we don't intend to support the make workflow for local development, it should fail early and hard. Given that it's so close to working, it seems better to fix it. 1610106 3 388548 jbedard 2020-01-23 08:15:33 -0800 Created attachment 388548 Patch 1610108 4 jbedard 2020-01-23 08:17:29 -0800 After exploring this change, I'm quite confused how we've gone this long without this. This is the reason you have to specify the architecture when running make, after this change, 'make SDKROOT=iphoneos' will work, you won't need 'make SDKROOT=iphoneos ARCHS=arm64' 1610242 5 388573 jbedard 2020-01-23 12:01:30 -0800 Created attachment 388573 Patch 1610244 6 jbedard 2020-01-23 12:09:39 -0800 We definitely want some parts of this change (line 371, for example, fixes a bug in build-webkit), but arm64e can't build on our bots at the moment, so this change can't land yet. 1610263 7 388573 krollin 2020-01-23 12:43:54 -0800 Comment on attachment 388573 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=388573&action=review > Tools/Scripts/webkitdirs.pm:376 > + } elsif ($xcodeSDK =~ /^iphoneos/ || /^watchos/ || $xcodeSDK =~ /^appletvos/) { Does that watchOS regex need to be applied to $xcodeSDK? 1610276 8 388582 jbedard 2020-01-23 13:00:28 -0800 Created attachment 388582 Patch 1610812 9 388717 jbedard 2020-01-24 12:17:54 -0800 Created attachment 388717 Patch 1610848 10 388717 ap 2020-01-24 13:55:52 -0800 Comment on attachment 388717 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=388717&action=review > Tools/ChangeLog:11 > + (determineXcodeSDK): Check for SDKROOT=* in passed arguments so that we can > + apply the correct arguments for a specific SDK. I am still skeptical about the idea. Arguments that are passed to make in this way have a simple well defined meaning. Having intermediate scripts intercept them and enable tangentially related magic adds a lot of conceptual complexity. I do not think that we have a practical problem that is worth solving, much less one that is worth solving like this. 1610862 11 388717 jbedard 2020-01-24 14:19:24 -0800 Comment on attachment 388717 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=388717&action=review >> Tools/ChangeLog:11 >> + apply the correct arguments for a specific SDK. > > I am still skeptical about the idea. Arguments that are passed to make in this way have a simple well defined meaning. Having intermediate scripts intercept them and enable tangentially related magic adds a lot of conceptual complexity. I do not think that we have a practical problem that is worth solving, much less one that is worth solving like this. If we don't like the idea of intercepting arguments, then we need to strip webkitdirs.pm of the device specific Xcode options (line 913 through line 922). The intention of the makefile seems to be to keep our Xcode options unified in a single spot, so that make and build-webkit do mostly the same thing. It seems to me that making Make more like build-webkit is a good thing, but if it's not, then we should make build-webkit more like make. I also think that build-webkit needs some intermediate interception regardless of what Make is doing. It's clearly not ok for build-webkit to pick an architecture when the user specifies one. 1613361 12 jbedard 2020-01-31 07:50:23 -0800 Filed https://bugs.webkit.org/show_bug.cgi?id=207045 for the work in webkitdirs, this bug will just track the work in the Makefile. 388548 2020-01-23 08:15:33 -0800 2020-01-23 12:01:29 -0800 Patch bug-206620-20200123081532.patch text/plain 3018 jbedard SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDI1NDk3 NSkKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDIwLTAx LTIzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtl ZmlsZXMgc2hvdWxkIG1ha2Ugd2Via2l0ZGlycyBhd2FyZSBvZiB0aGUgU0RLCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDY2MjAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1ha2VmaWxlLnNoYXJlZDog UGFzcyBTREtST09UPSogdG8gd2Via2l0ZGlycyB0byBnZXQgdGhlIGNvcnJlY3QgYXJndW1lbnRz IGZvcgorICAgICAgICB0aGUgc3BlY2lmaWVkIHBsYXRmb3JtLgorCiAyMDIwLTAxLTIyICBEb24g T2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+CiAKICAgICAgICAgW09wZW5TU0xdIEFk ZCBzdHVicyBhbmQgYnVpbGQgZm9yIFdlYiBDcnlwdG8KSW5kZXg6IE1ha2VmaWxlLnNoYXJlZAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBNYWtlZmlsZS5zaGFyZWQJKHJldmlzaW9uIDI1NDk3NSkKKysrIE1ha2Vm aWxlLnNoYXJlZAkod29ya2luZyBjb3B5KQpAQCAtMSwxNiArMSwxNiBAQAogU0NSSVBUU19QQVRI ID89IC4uL1Rvb2xzL1NjcmlwdHMKIAogU0VUX0NPTE9SX0RJQUdOT1NUSUNTX0FSRyA9IGlmIFtb IC10IDEgXV07IHRoZW4gQ09MT1JfRElBR05PU1RJQ1NfQVJHPSJDT0xPUl9ESUFHTk9TVElDUz1Z RVMiOyBmaQotWENPREVfT1BUSU9OUyA9IGBwZXJsIC1JJChTQ1JJUFRTX1BBVEgpIC1Nd2Via2l0 ZGlycyAtZSAncHJpbnQgWGNvZGVPcHRpb25TdHJpbmcoKScgLS0gJChCVUlMRF9XRUJLSVRfT1BU SU9OUylgICQke0NPTE9SX0RJQUdOT1NUSUNTX0FSR30gJChBUkdTKQorWENPREVfT1BUSU9OUyA9 IGBwZXJsIC1JJChTQ1JJUFRTX1BBVEgpIC1Nd2Via2l0ZGlycyAtZSAncHJpbnQgWGNvZGVPcHRp b25TdHJpbmcoKScgLS0gJChCVUlMRF9XRUJLSVRfT1BUSU9OUylgCiAKIGlmbmVxICgsJChTREtS T09UKSkKIAlpZm5lcSAoLCQoT1ZFUlJJREVfU0RLUk9PVCkpCiAJCWlmbmVxIChkZWZhdWx0LCQo T1ZFUlJJREVfU0RLUk9PVCkpCi0JCQlYQ09ERV9PUFRJT05TIDo9ICQoWENPREVfT1BUSU9OUykg U0RLUk9PVD0kKE9WRVJSSURFX1NES1JPT1QpCisJCSAgICBYQ09ERV9PUFRJT05TID0gYHBlcmwg LUkkKFNDUklQVFNfUEFUSCkgLU13ZWJraXRkaXJzIC1lICdwcmludCBYY29kZU9wdGlvblN0cmlu ZygpJyBTREtST09UPSQoT1ZFUlJJREVfU0RLUk9PVCkgLS0gJChCVUlMRF9XRUJLSVRfT1BUSU9O UylgCiAJCWVuZGlmCiAJCU9WRVJSSURFX1NES1JPT1QgPQogCWVsc2UKLQkJWENPREVfT1BUSU9O UyA6PSAkKFhDT0RFX09QVElPTlMpIFNES1JPT1Q9JChTREtST09UKQorCSAgICBYQ09ERV9PUFRJ T05TID0gYHBlcmwgLUkkKFNDUklQVFNfUEFUSCkgLU13ZWJraXRkaXJzIC1lICdwcmludCBYY29k ZU9wdGlvblN0cmluZygpJyBTREtST09UPSQoU0RLUk9PVCkgLS0gJChCVUlMRF9XRUJLSVRfT1BU SU9OUylgCiAJZW5kaWYKIGVuZGlmCiAKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1NDk3NikKKysrIFRvb2xzL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDIwLTAxLTIzICBKb25hdGhhbiBC ZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlZmlsZXMgc2hvdWxkIG1h a2Ugd2Via2l0ZGlycyBhd2FyZSBvZiB0aGUgU0RLCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDY2MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAg KGRldGVybWluZVhjb2RlU0RLKTogQ2hlY2sgZm9yIFNES1JPT1Q9KiBpbiBwYXNzZWQgYXJndW1l bnRzIHNvIHRoYXQgd2UgY2FuCisgICAgICAgIGFwcGx5IHRoZSBjb3JyZWN0IGFyZ3VtZW50cyBm b3IgYSBzcGVjaWZpYyBTREsuCisKIDIwMjAtMDEtMjMgIFRha2FzaGkgS29tb3JpICA8VGFrYXNo aS5Lb21vcmlAc29ueS5jb20+CiAKICAgICAgICAgS2V5ZWREZWNvZGVyR2VuZXJpYyBjcmFzaGVz IHdoZW4gaXQgYWNjZXNzZXMgYSBkYXRhIHdpdGggZW1wdHkgc3RyaW5nIGtleS4KSW5kZXg6IFRv b2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dl YmtpdGRpcnMucG0JKHJldmlzaW9uIDI1NDk3NSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGly cy5wbQkod29ya2luZyBjb3B5KQpAQCAtNTg3LDYgKzU4NywxMSBAQCBzdWIgZGV0ZXJtaW5lWGNv ZGVTREsKICAgICAgICAgJHhjb2RlU0RLID0gJHNkazsKICAgICAgICAgcmV0dXJuOwogICAgIH0K KyAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWR2V0dGluZ1ZhbHVlKCJT REtST09UIiwgXCRzZGspKSB7CisgICAgICAgICR4Y29kZVNESyA9ICRzZGs7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisKICAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdW KCItLWRldmljZSIpIHx8IGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS1pb3Mt ZGV2aWNlIikpIHsKICAgICAgICAgJHhjb2RlU0RLIHx8PSAiaXBob25lb3MiOwogICAgIH0K 388573 2020-01-23 12:01:30 -0800 2020-01-23 13:00:27 -0800 Patch bug-206620-20200123120128.patch text/plain 3969 jbedard SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDI1NDk4 MCkKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDIwLTAx LTIzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtl ZmlsZXMgc2hvdWxkIG1ha2Ugd2Via2l0ZGlycyBhd2FyZSBvZiB0aGUgU0RLCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDY2MjAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1ha2VmaWxlLnNoYXJlZDog UGFzcyBTREtST09UPSogYW5kIEFSQ0hTPSogdG8gd2Via2l0ZGlycyB0byBnZXQgdGhlIGNvcnJl Y3QKKyAgICAgICAgYXJndW1lbnRzIGZvciB0aGUgc3BlY2lmaWVkIHBsYXRmb3JtLgorCiAyMDIw LTAxLTIyICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+CiAKICAgICAgICAg W09wZW5TU0xdIEFkZCBzdHVicyBhbmQgYnVpbGQgZm9yIFdlYiBDcnlwdG8KSW5kZXg6IE1ha2Vm aWxlLnNoYXJlZAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBNYWtlZmlsZS5zaGFyZWQJKHJldmlzaW9uIDI1NDk4 MCkKKysrIE1ha2VmaWxlLnNoYXJlZAkod29ya2luZyBjb3B5KQpAQCAtMSwxNiArMSwxNSBAQAog U0NSSVBUU19QQVRIID89IC4uL1Rvb2xzL1NjcmlwdHMKIAogU0VUX0NPTE9SX0RJQUdOT1NUSUNT X0FSRyA9IGlmIFtbIC10IDEgXV07IHRoZW4gQ09MT1JfRElBR05PU1RJQ1NfQVJHPSJDT0xPUl9E SUFHTk9TVElDUz1ZRVMiOyBmaQotWENPREVfT1BUSU9OUyA9IGBwZXJsIC1JJChTQ1JJUFRTX1BB VEgpIC1Nd2Via2l0ZGlycyAtZSAncHJpbnQgWGNvZGVPcHRpb25TdHJpbmcoKScgLS0gJChCVUlM RF9XRUJLSVRfT1BUSU9OUylgICQke0NPTE9SX0RJQUdOT1NUSUNTX0FSR30gJChBUkdTKQotCitY Q09ERV9PUFRJT05TID0KIGlmbmVxICgsJChTREtST09UKSkKIAlpZm5lcSAoLCQoT1ZFUlJJREVf U0RLUk9PVCkpCiAJCWlmbmVxIChkZWZhdWx0LCQoT1ZFUlJJREVfU0RLUk9PVCkpCi0JCQlYQ09E RV9PUFRJT05TIDo9ICQoWENPREVfT1BUSU9OUykgU0RLUk9PVD0kKE9WRVJSSURFX1NES1JPT1Qp CisJCSAgICBYQ09ERV9PUFRJT05TICs9IFNES1JPT1Q9JChPVkVSUklERV9TREtST09UKQogCQll bmRpZgogCQlPVkVSUklERV9TREtST09UID0KIAllbHNlCi0JCVhDT0RFX09QVElPTlMgOj0gJChY Q09ERV9PUFRJT05TKSBTREtST09UPSQoU0RLUk9PVCkKKwkgICAgWENPREVfT1BUSU9OUyArPSBT REtST09UPSQoU0RLUk9PVCkKIAllbmRpZgogZW5kaWYKIApAQCAtMzMsNiArMzIsNyBAQCBpZm5l cSAoLCQoQVJDSFMpKQogCQllbmRpZgogCWVuZGlmCiBlbmRpZgorWENPREVfT1BUSU9OUyA6PSBg cGVybCAtSSQoU0NSSVBUU19QQVRIKSAtTXdlYmtpdGRpcnMgLWUgJ3ByaW50IFhjb2RlT3B0aW9u U3RyaW5nKCknICQoWENPREVfT1BUSU9OUykgLS0gJChCVUlMRF9XRUJLSVRfT1BUSU9OUylgCiAK IGlmbmVxICgsJChTREtfVkFSSUFOVCkpCiAJWENPREVfT1BUSU9OUyArPSBTREtfVkFSSUFOVD0i JChTREtfVkFSSUFOVCkiCkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTQ5ODIpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtp bmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAyMC0wMS0yMyAgSm9uYXRoYW4gQmVkYXJkICA8 amJlZGFyZEBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZWZpbGVzIHNob3VsZCBtYWtlIHdlYmtp dGRpcnMgYXdhcmUgb2YgdGhlIEFyY2hpdGVjdHVyZSwgU0RLCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDY2MjAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAg ICAgICAgKGRldGVybWluZUFyY2hpdGVjdHVyZSk6IENoZWNrIGFyZ3VtZW50cyBmb3IgdXNlciBz cGVjaWZpZWQgYXJjaGl0ZWN0dXJlcy4KKyAgICAgICAgKGRldGVybWluZVhjb2RlU0RLKTogQ2hl Y2sgZm9yIFNES1JPT1Q9KiBpbiBwYXNzZWQgYXJndW1lbnRzIHNvIHRoYXQgd2UgY2FuCisgICAg ICAgIGFwcGx5IHRoZSBjb3JyZWN0IGFyZ3VtZW50cyBmb3IgYSBzcGVjaWZpYyBTREsuCisKIDIw MjAtMDEtMjMgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAg IEZpeCBpT1MgMTMuMiBpcGhvbmVvcyBidWlsZApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRk aXJzLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkocmV2aXNp b24gMjU0OTgwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCSh3b3JraW5nIGNvcHkp CkBAIC0zNjgsMTUgKzM2OCwxNSBAQCBzdWIgZGV0ZXJtaW5lQXJjaGl0ZWN0dXJlCiAgICAgICAg IH0KICAgICAgICAgaWYgKCRhcmNoaXRlY3R1cmUpIHsKICAgICAgICAgICAgIGNob21wICRhcmNo aXRlY3R1cmU7Ci0gICAgICAgIH0gZWxzZSB7CisgICAgICAgIH0gZWxzaWYgKCFjaGVja0ZvckFy Z3VtZW50QW5kUmVtb3ZlRnJvbUFSR1ZHZXR0aW5nVmFsdWUoIkFSQ0hTIiwgXCRhcmNoaXRlY3R1 cmUpKSB7CiAgICAgICAgICAgICBpZiAobm90IGRlZmluZWQgJHhjb2RlU0RLIG9yICR4Y29kZVNE SyA9fiAvXihcLyR8bWFjb3N4KS8pIHsKICAgICAgICAgICAgICAgICBteSAkc3VwcG9ydHM2NEJp dCA9IGBzeXNjdGwgLW4gaHcub3B0aW9uYWwueDg2XzY0YDsKICAgICAgICAgICAgICAgICBjaG9t cCAkc3VwcG9ydHM2NEJpdDsKICAgICAgICAgICAgICAgICAkYXJjaGl0ZWN0dXJlID0gJ3g4Nl82 NCcgaWYgJHN1cHBvcnRzNjRCaXQ7Ci0gICAgICAgICAgICB9IGVsc2lmICgkeGNvZGVTREsgPX4g L15pcGhvbmVzaW11bGF0b3IvKSB7CisgICAgICAgICAgICB9IGVsc2lmICgkeGNvZGVTREsgPX4g L15pcGhvbmVvcy8gfHwgL153YXRjaG9zLyB8fCAkeGNvZGVTREsgPX4gL15hcHBsZXR2b3MvKSB7 CisgICAgICAgICAgICAgICAgJGFyY2hpdGVjdHVyZSA9ICdhcm02NGUnOworICAgICAgICAgICAg fSBlbHNpZiAoJHhjb2RlU0RLID1+IC9zaW11bGF0b3IvKSB7CiAgICAgICAgICAgICAgICAgJGFy Y2hpdGVjdHVyZSA9ICd4ODZfNjQnOwotICAgICAgICAgICAgfSBlbHNpZiAoJHhjb2RlU0RLID1+ IC9eaXBob25lb3MvKSB7Ci0gICAgICAgICAgICAgICAgJGFyY2hpdGVjdHVyZSA9ICdhcm02NCc7 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9IGVsc2lmIChpc0NNYWtlQnVpbGQoKSkg ewpAQCAtNTg3LDYgKzU4NywxMSBAQCBzdWIgZGV0ZXJtaW5lWGNvZGVTREsKICAgICAgICAgJHhj b2RlU0RLID0gJHNkazsKICAgICAgICAgcmV0dXJuOwogICAgIH0KKyAgICBpZiAoY2hlY2tGb3JB cmd1bWVudEFuZFJlbW92ZUZyb21BUkdWR2V0dGluZ1ZhbHVlKCJTREtST09UIiwgXCRzZGspKSB7 CisgICAgICAgICR4Y29kZVNESyA9ICRzZGs7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAg ICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLWRldmljZSIpIHx8IGNo ZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS1pb3MtZGV2aWNlIikpIHsKICAgICAg ICAgJHhjb2RlU0RLIHx8PSAiaXBob25lb3MiOwogICAgIH0K 388582 2020-01-23 13:00:28 -0800 2020-01-24 12:17:52 -0800 Patch bug-206620-20200123130027.patch text/plain 3982 jbedard SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDI1NDk4 MCkKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDIwLTAx LTIzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtl ZmlsZXMgc2hvdWxkIG1ha2Ugd2Via2l0ZGlycyBhd2FyZSBvZiB0aGUgU0RLCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDY2MjAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1ha2VmaWxlLnNoYXJlZDog UGFzcyBTREtST09UPSogYW5kIEFSQ0hTPSogdG8gd2Via2l0ZGlycyB0byBnZXQgdGhlIGNvcnJl Y3QKKyAgICAgICAgYXJndW1lbnRzIGZvciB0aGUgc3BlY2lmaWVkIHBsYXRmb3JtLgorCiAyMDIw LTAxLTIyICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+CiAKICAgICAgICAg W09wZW5TU0xdIEFkZCBzdHVicyBhbmQgYnVpbGQgZm9yIFdlYiBDcnlwdG8KSW5kZXg6IE1ha2Vm aWxlLnNoYXJlZAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBNYWtlZmlsZS5zaGFyZWQJKHJldmlzaW9uIDI1NDk4 MCkKKysrIE1ha2VmaWxlLnNoYXJlZAkod29ya2luZyBjb3B5KQpAQCAtMSwxNiArMSwxNSBAQAog U0NSSVBUU19QQVRIID89IC4uL1Rvb2xzL1NjcmlwdHMKIAogU0VUX0NPTE9SX0RJQUdOT1NUSUNT X0FSRyA9IGlmIFtbIC10IDEgXV07IHRoZW4gQ09MT1JfRElBR05PU1RJQ1NfQVJHPSJDT0xPUl9E SUFHTk9TVElDUz1ZRVMiOyBmaQotWENPREVfT1BUSU9OUyA9IGBwZXJsIC1JJChTQ1JJUFRTX1BB VEgpIC1Nd2Via2l0ZGlycyAtZSAncHJpbnQgWGNvZGVPcHRpb25TdHJpbmcoKScgLS0gJChCVUlM RF9XRUJLSVRfT1BUSU9OUylgICQke0NPTE9SX0RJQUdOT1NUSUNTX0FSR30gJChBUkdTKQotCitY Q09ERV9PUFRJT05TID0KIGlmbmVxICgsJChTREtST09UKSkKIAlpZm5lcSAoLCQoT1ZFUlJJREVf U0RLUk9PVCkpCiAJCWlmbmVxIChkZWZhdWx0LCQoT1ZFUlJJREVfU0RLUk9PVCkpCi0JCQlYQ09E RV9PUFRJT05TIDo9ICQoWENPREVfT1BUSU9OUykgU0RLUk9PVD0kKE9WRVJSSURFX1NES1JPT1Qp CisJCSAgICBYQ09ERV9PUFRJT05TICs9IFNES1JPT1Q9JChPVkVSUklERV9TREtST09UKQogCQll bmRpZgogCQlPVkVSUklERV9TREtST09UID0KIAllbHNlCi0JCVhDT0RFX09QVElPTlMgOj0gJChY Q09ERV9PUFRJT05TKSBTREtST09UPSQoU0RLUk9PVCkKKwkgICAgWENPREVfT1BUSU9OUyArPSBT REtST09UPSQoU0RLUk9PVCkKIAllbmRpZgogZW5kaWYKIApAQCAtMzMsNiArMzIsNyBAQCBpZm5l cSAoLCQoQVJDSFMpKQogCQllbmRpZgogCWVuZGlmCiBlbmRpZgorWENPREVfT1BUSU9OUyA6PSBg cGVybCAtSSQoU0NSSVBUU19QQVRIKSAtTXdlYmtpdGRpcnMgLWUgJ3ByaW50IFhjb2RlT3B0aW9u U3RyaW5nKCknICQoWENPREVfT1BUSU9OUykgLS0gJChCVUlMRF9XRUJLSVRfT1BUSU9OUylgCiAK IGlmbmVxICgsJChTREtfVkFSSUFOVCkpCiAJWENPREVfT1BUSU9OUyArPSBTREtfVkFSSUFOVD0i JChTREtfVkFSSUFOVCkiCkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTQ5ODIpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtp bmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAyMC0wMS0yMyAgSm9uYXRoYW4gQmVkYXJkICA8 amJlZGFyZEBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZWZpbGVzIHNob3VsZCBtYWtlIHdlYmtp dGRpcnMgYXdhcmUgb2YgdGhlIEFyY2hpdGVjdHVyZSwgU0RLCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDY2MjAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAg ICAgICAgKGRldGVybWluZUFyY2hpdGVjdHVyZSk6IENoZWNrIGFyZ3VtZW50cyBmb3IgdXNlciBz cGVjaWZpZWQgYXJjaGl0ZWN0dXJlcy4KKyAgICAgICAgKGRldGVybWluZVhjb2RlU0RLKTogQ2hl Y2sgZm9yIFNES1JPT1Q9KiBpbiBwYXNzZWQgYXJndW1lbnRzIHNvIHRoYXQgd2UgY2FuCisgICAg ICAgIGFwcGx5IHRoZSBjb3JyZWN0IGFyZ3VtZW50cyBmb3IgYSBzcGVjaWZpYyBTREsuCisKIDIw MjAtMDEtMjMgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAg IEZpeCBpT1MgMTMuMiBpcGhvbmVvcyBidWlsZApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRk aXJzLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkocmV2aXNp b24gMjU0OTgwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCSh3b3JraW5nIGNvcHkp CkBAIC0zNjgsMTUgKzM2OCwxNSBAQCBzdWIgZGV0ZXJtaW5lQXJjaGl0ZWN0dXJlCiAgICAgICAg IH0KICAgICAgICAgaWYgKCRhcmNoaXRlY3R1cmUpIHsKICAgICAgICAgICAgIGNob21wICRhcmNo aXRlY3R1cmU7Ci0gICAgICAgIH0gZWxzZSB7CisgICAgICAgIH0gZWxzaWYgKCFjaGVja0ZvckFy Z3VtZW50QW5kUmVtb3ZlRnJvbUFSR1ZHZXR0aW5nVmFsdWUoIkFSQ0hTIiwgXCRhcmNoaXRlY3R1 cmUpKSB7CiAgICAgICAgICAgICBpZiAobm90IGRlZmluZWQgJHhjb2RlU0RLIG9yICR4Y29kZVNE SyA9fiAvXihcLyR8bWFjb3N4KS8pIHsKICAgICAgICAgICAgICAgICBteSAkc3VwcG9ydHM2NEJp dCA9IGBzeXNjdGwgLW4gaHcub3B0aW9uYWwueDg2XzY0YDsKICAgICAgICAgICAgICAgICBjaG9t cCAkc3VwcG9ydHM2NEJpdDsKICAgICAgICAgICAgICAgICAkYXJjaGl0ZWN0dXJlID0gJ3g4Nl82 NCcgaWYgJHN1cHBvcnRzNjRCaXQ7Ci0gICAgICAgICAgICB9IGVsc2lmICgkeGNvZGVTREsgPX4g L15pcGhvbmVzaW11bGF0b3IvKSB7CisgICAgICAgICAgICB9IGVsc2lmICgkeGNvZGVTREsgPX4g L15pcGhvbmVvcy8gfHwgJHhjb2RlU0RLID1+IC9ed2F0Y2hvcy8gfHwgJHhjb2RlU0RLID1+IC9e YXBwbGV0dm9zLykgeworICAgICAgICAgICAgICAgICRhcmNoaXRlY3R1cmUgPSAnYXJtNjRlJzsK KyAgICAgICAgICAgIH0gZWxzaWYgKCR4Y29kZVNESyA9fiAvc2ltdWxhdG9yLykgewogICAgICAg ICAgICAgICAgICRhcmNoaXRlY3R1cmUgPSAneDg2XzY0JzsKLSAgICAgICAgICAgIH0gZWxzaWYg KCR4Y29kZVNESyA9fiAvXmlwaG9uZW9zLykgewotICAgICAgICAgICAgICAgICRhcmNoaXRlY3R1 cmUgPSAnYXJtNjQnOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfSBlbHNpZiAoaXND TWFrZUJ1aWxkKCkpIHsKQEAgLTU4Nyw2ICs1ODcsMTEgQEAgc3ViIGRldGVybWluZVhjb2RlU0RL CiAgICAgICAgICR4Y29kZVNESyA9ICRzZGs7CiAgICAgICAgIHJldHVybjsKICAgICB9CisgICAg aWYgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVkdldHRpbmdWYWx1ZSgiU0RLUk9P VCIsIFwkc2RrKSkgeworICAgICAgICAkeGNvZGVTREsgPSAkc2RrOworICAgICAgICByZXR1cm47 CisgICAgfQorCiAgICAgaWYgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS1k ZXZpY2UiKSB8fCBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0taW9zLWRldmlj ZSIpKSB7CiAgICAgICAgICR4Y29kZVNESyB8fD0gImlwaG9uZW9zIjsKICAgICB9Cg== 388717 2020-01-24 12:17:54 -0800 2020-01-24 12:17:54 -0800 Patch bug-206620-20200124121753.patch text/plain 3974 jbedard SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDI1NTA4 NikKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDIwLTAx LTI0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtl ZmlsZXMgc2hvdWxkIG1ha2Ugd2Via2l0ZGlycyBhd2FyZSBvZiB0aGUgU0RLCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDY2MjAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1ha2VmaWxlLnNoYXJlZDog UGFzcyBTREtST09UPSogYW5kIEFSQ0hTPSogdG8gd2Via2l0ZGlycyB0byBnZXQgdGhlIGNvcnJl Y3QKKyAgICAgICAgYXJndW1lbnRzIGZvciB0aGUgc3BlY2lmaWVkIHBsYXRmb3JtLgorCiAyMDIw LTAxLTIyICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+CiAKICAgICAgICAg W09wZW5TU0xdIEFkZCBzdHVicyBhbmQgYnVpbGQgZm9yIFdlYiBDcnlwdG8KSW5kZXg6IE1ha2Vm aWxlLnNoYXJlZAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBNYWtlZmlsZS5zaGFyZWQJKHJldmlzaW9uIDI1NTA4 NikKKysrIE1ha2VmaWxlLnNoYXJlZAkod29ya2luZyBjb3B5KQpAQCAtMSwxNiArMSwxNSBAQAog U0NSSVBUU19QQVRIID89IC4uL1Rvb2xzL1NjcmlwdHMKIAogU0VUX0NPTE9SX0RJQUdOT1NUSUNT X0FSRyA9IGlmIFtbIC10IDEgXV07IHRoZW4gQ09MT1JfRElBR05PU1RJQ1NfQVJHPSJDT0xPUl9E SUFHTk9TVElDUz1ZRVMiOyBmaQotWENPREVfT1BUSU9OUyA9IGBwZXJsIC1JJChTQ1JJUFRTX1BB VEgpIC1Nd2Via2l0ZGlycyAtZSAncHJpbnQgWGNvZGVPcHRpb25TdHJpbmcoKScgLS0gJChCVUlM RF9XRUJLSVRfT1BUSU9OUylgICQke0NPTE9SX0RJQUdOT1NUSUNTX0FSR30gJChBUkdTKQotCitY Q09ERV9PUFRJT05TID0KIGlmbmVxICgsJChTREtST09UKSkKIAlpZm5lcSAoLCQoT1ZFUlJJREVf U0RLUk9PVCkpCiAJCWlmbmVxIChkZWZhdWx0LCQoT1ZFUlJJREVfU0RLUk9PVCkpCi0JCQlYQ09E RV9PUFRJT05TIDo9ICQoWENPREVfT1BUSU9OUykgU0RLUk9PVD0kKE9WRVJSSURFX1NES1JPT1Qp CisJCQlYQ09ERV9PUFRJT05TICs9IFNES1JPT1Q9JChPVkVSUklERV9TREtST09UKQogCQllbmRp ZgogCQlPVkVSUklERV9TREtST09UID0KIAllbHNlCi0JCVhDT0RFX09QVElPTlMgOj0gJChYQ09E RV9PUFRJT05TKSBTREtST09UPSQoU0RLUk9PVCkKKwkJWENPREVfT1BUSU9OUyArPSBTREtST09U PSQoU0RLUk9PVCkKIAllbmRpZgogZW5kaWYKIApAQCAtMzMsNiArMzIsNyBAQCBpZm5lcSAoLCQo QVJDSFMpKQogCQllbmRpZgogCWVuZGlmCiBlbmRpZgorWENPREVfT1BUSU9OUyA6PSBgcGVybCAt SSQoU0NSSVBUU19QQVRIKSAtTXdlYmtpdGRpcnMgLWUgJ3ByaW50IFhjb2RlT3B0aW9uU3RyaW5n KCknICQoWENPREVfT1BUSU9OUykgLS0gJChCVUlMRF9XRUJLSVRfT1BUSU9OUylgCiAKIGlmbmVx ICgsJChTREtfVkFSSUFOVCkpCiAJWENPREVfT1BUSU9OUyArPSBTREtfVkFSSUFOVD0iJChTREtf VkFSSUFOVCkiCkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNTUwODYpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwxNSBAQAorMjAyMC0wMS0yNCAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFy ZEBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZWZpbGVzIHNob3VsZCBtYWtlIHdlYmtpdGRpcnMg YXdhcmUgb2YgdGhlIEFyY2hpdGVjdHVyZSwgU0RLCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDY2MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAg KGRldGVybWluZUFyY2hpdGVjdHVyZSk6IENoZWNrIGFyZ3VtZW50cyBmb3IgdXNlciBzcGVjaWZp ZWQgYXJjaGl0ZWN0dXJlcy4KKyAgICAgICAgKGRldGVybWluZVhjb2RlU0RLKTogQ2hlY2sgZm9y IFNES1JPT1Q9KiBpbiBwYXNzZWQgYXJndW1lbnRzIHNvIHRoYXQgd2UgY2FuCisgICAgICAgIGFw cGx5IHRoZSBjb3JyZWN0IGFyZ3VtZW50cyBmb3IgYSBzcGVjaWZpYyBTREsuCisKIDIwMjAtMDEt MjMgIE1hdHQgTGV3aXMgIDxqbGV3aXMzQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgQXBw bGUgd2luZG93cyA3IHF1ZXVlcy4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlzaW9uIDI1NTA4 NikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5KQpAQCAtMzY4 LDE1ICszNjgsMTUgQEAgc3ViIGRldGVybWluZUFyY2hpdGVjdHVyZQogICAgICAgICB9CiAgICAg ICAgIGlmICgkYXJjaGl0ZWN0dXJlKSB7CiAgICAgICAgICAgICBjaG9tcCAkYXJjaGl0ZWN0dXJl OwotICAgICAgICB9IGVsc2UgeworICAgICAgICB9IGVsc2lmICghY2hlY2tGb3JBcmd1bWVudEFu ZFJlbW92ZUZyb21BUkdWR2V0dGluZ1ZhbHVlKCJBUkNIUyIsIFwkYXJjaGl0ZWN0dXJlKSkgewog ICAgICAgICAgICAgaWYgKG5vdCBkZWZpbmVkICR4Y29kZVNESyBvciAkeGNvZGVTREsgPX4gL14o XC8kfG1hY29zeCkvKSB7CiAgICAgICAgICAgICAgICAgbXkgJHN1cHBvcnRzNjRCaXQgPSBgc3lz Y3RsIC1uIGh3Lm9wdGlvbmFsLng4Nl82NGA7CiAgICAgICAgICAgICAgICAgY2hvbXAgJHN1cHBv cnRzNjRCaXQ7CiAgICAgICAgICAgICAgICAgJGFyY2hpdGVjdHVyZSA9ICd4ODZfNjQnIGlmICRz dXBwb3J0czY0Qml0OwotICAgICAgICAgICAgfSBlbHNpZiAoJHhjb2RlU0RLID1+IC9eaXBob25l c2ltdWxhdG9yLykgeworICAgICAgICAgICAgfSBlbHNpZiAoJHhjb2RlU0RLID1+IC9eaXBob25l b3MvIHx8ICR4Y29kZVNESyA9fiAvXndhdGNob3MvIHx8ICR4Y29kZVNESyA9fiAvXmFwcGxldHZv cy8pIHsKKyAgICAgICAgICAgICAgICAkYXJjaGl0ZWN0dXJlID0gJ2FybTY0ZSc7CisgICAgICAg ICAgICB9IGVsc2lmICgkeGNvZGVTREsgPX4gL3NpbXVsYXRvci8pIHsKICAgICAgICAgICAgICAg ICAkYXJjaGl0ZWN0dXJlID0gJ3g4Nl82NCc7Ci0gICAgICAgICAgICB9IGVsc2lmICgkeGNvZGVT REsgPX4gL15pcGhvbmVvcy8pIHsKLSAgICAgICAgICAgICAgICAkYXJjaGl0ZWN0dXJlID0gJ2Fy bTY0JzsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0gZWxzaWYgKGlzQ01ha2VCdWls ZCgpKSB7CkBAIC01ODcsNiArNTg3LDExIEBAIHN1YiBkZXRlcm1pbmVYY29kZVNESwogICAgICAg ICAkeGNvZGVTREsgPSAkc2RrOwogICAgICAgICByZXR1cm47CiAgICAgfQorICAgIGlmIChjaGVj a0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1ZHZXR0aW5nVmFsdWUoIlNES1JPT1QiLCBcJHNk aykpIHsKKyAgICAgICAgJHhjb2RlU0RLID0gJHNkazsKKyAgICAgICAgcmV0dXJuOworICAgIH0K KwogICAgIGlmIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tZGV2aWNlIikg fHwgY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLWlvcy1kZXZpY2UiKSkgewog ICAgICAgICAkeGNvZGVTREsgfHw9ICJpcGhvbmVvcyI7CiAgICAgfQo=