192153 2018-11-29 09:05:27 -0800 webkitpy: Unify ios_version/watchos_version code 2018-11-29 10:00:25 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard commit-queue ews-watchlist glenn lforschler webkit-bug-importer oldest_to_newest 1482961 0 jbedard 2018-11-29 09:05:27 -0800 iOS and watchOS version should be accessed from the same function, 'device_version' 1482962 1 webkit-bug-importer 2018-11-29 09:06:03 -0800 <rdar://problem/46343642> 1482967 2 356010 jbedard 2018-11-29 09:12:39 -0800 Created attachment 356010 Patch 1482993 3 356010 commit-queue 2018-11-29 10:00:24 -0800 Comment on attachment 356010 Patch Clearing flags on attachment: 356010 Committed r238672: <https://trac.webkit.org/changeset/238672> 1482994 4 commit-queue 2018-11-29 10:00:25 -0800 All reviewed patches have been landed. Closing bug. 356010 2018-11-29 09:12:39 -0800 2018-11-29 10:00:24 -0800 Patch bug-192153-20181129091238.patch text/plain 10980 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzODY3MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDQxIEBACisyMDE4LTExLTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogVW5pZnkgaW9zX3ZlcnNpb24vd2F0Y2hvc192ZXJzaW9u IGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 MjE1MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDYzNDM2NDI+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVHJlYXRpbmcgd2F0Y2hPUyBhbmQgaU9T IHZlcnNpb25zIGRpZmZlcmVudGx5IG1ha2VzIGl0IGhhcmRlciB0byBzaGFyZSBjb2RlIGJldHdl ZW4gdGhlIHNpbWlsYXIgcG9ydHMuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQv ZGV2aWNlX3BvcnQucHk6CisgICAgICAgIChEZXZpY2VQb3J0KToKKyAgICAgICAgKERldmljZVBv cnQuZGV2aWNlX3ZlcnNpb24pOiBBZGRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Bv cnQvaW9zLnB5OgorICAgICAgICAoSU9TUG9ydC5kZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRo KTogVXNlIGRldmljZV92ZXJzaW9uKCkgaW5zdGVhZCBvZiBpb3NfdmVyc2lvbigpLgorICAgICAg ICAoSU9TUG9ydC5pb3NfdmVyc2lvbik6IERlbGV0ZWQuCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9wb3J0L2lvc19kZXZpY2UucHk6CisgICAgICAgIChJT1NEZXZpY2VQb3J0LmRldmljZV92 ZXJzaW9uKTogUmVuYW1lZCBmcm9tIGlvc192ZXJzaW9uKCkuCisgICAgICAgIChJT1NEZXZpY2VQ b3J0Lmlvc192ZXJzaW9uKTogRGVsZXRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Bv cnQvaW9zX3NpbXVsYXRvci5weToKKyAgICAgICAgKElPU1NpbXVsYXRvclBvcnQuZGV2aWNlX3Zl cnNpb24pOiBSZW5hbWVkIGZyb20gaW9zX3ZlcnNpb24oKS4KKyAgICAgICAgKElPU1NpbXVsYXRv clBvcnQuZGVmYXVsdF9jaGlsZF9wcm9jZXNzZXMuYm9vdGVkX2lvc19kZXZpY2VzX2ZpbHRlcik6 IFVzZSBkZXZpY2VfdmVyc2lvbigpIGluc3RlYWQgb2YgaW9zX3ZlcnNpb24oKS4KKyAgICAgICAg KElPU1NpbXVsYXRvclBvcnQuX2NyZWF0ZV9kZXZpY2VzKTogRGl0dG8uCisgICAgICAgIChJT1NT aW11bGF0b3JQb3J0LmNoZWNrX3N5c19kZXBzKTogRGl0dG8uCisgICAgICAgIChJT1NTaW11bGF0 b3JQb3J0Lmlvc192ZXJzaW9uKTogRGVsZXRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L3BvcnQvd2F0Y2gucHk6CisgICAgICAgIChXYXRjaFBvcnQuZGVmYXVsdF9iYXNlbGluZV9zZWFy Y2hfcGF0aCk6IFVzZSBkZXZpY2VfdmVyc2lvbigpIGluc3RlYWQgb2Ygd2F0Y2hvc192ZXJzaW9u KCkuCisgICAgICAgIChXYXRjaFBvcnQud2F0Y2hvc192ZXJzaW9uKTogRGVsZXRlZC4KKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2F0Y2hfZGV2aWNlLnB5OgorICAgICAgICAoV2F0 Y2hEZXZpY2VQb3J0LmRldmljZV92ZXJzaW9uKTogUmVuYW1lZCBmcm9tIHdhdGNob3NfdmVyc2lv bigpLgorICAgICAgICAoV2F0Y2hEZXZpY2VQb3J0LndhdGNob3NfdmVyc2lvbik6IERlbGV0ZWQu CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L3dhdGNoX3NpbXVsYXRvci5weToKKyAg ICAgICAgKFdhdGNoU2ltdWxhdG9yUG9ydC5kZXZpY2VfdmVyc2lvbik6IFJlbmFtZWQgZnJvbSB3 YXRjaG9zX3ZlcnNpb24oKS4KKyAgICAgICAgKFdhdGNoU2ltdWxhdG9yUG9ydC5kZWZhdWx0X2No aWxkX3Byb2Nlc3Nlcy5maWx0ZXJfYm9vdGVkX3dhdGNob3NfZGV2aWNlcyk6IFVzZSBkZXZpY2Vf dmVyc2lvbigpIGluc3RlYWQgb2Ygd2F0Y2hvc192ZXJzaW9uKCkuCisgICAgICAgIChXYXRjaFNp bXVsYXRvclBvcnQuX2NyZWF0ZV9kZXZpY2VzKTogRGl0dG8uCisgICAgICAgIChXYXRjaFNpbXVs YXRvclBvcnQuY2hlY2tfc3lzX2RlcHMpOiBEaXR0by4KKyAgICAgICAgKFdhdGNoU2ltdWxhdG9y UG9ydC53YXRjaG9zX3ZlcnNpb24pOiBEZWxldGVkLgorCiAyMDE4LTExLTI4ICBXZW5zb24gSHNp ZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NNYWNdIERyb3BwaW5n IHRleHQgc2VsZWN0aW9ucyBmcm9tIHdlYiBjb250ZW50IGludG8gZWRpdGFibGUgZWxlbWVudHMg Y3Jhc2hlcyB0aGUgd2ViIHByb2Nlc3MKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9y dC9kZXZpY2VfcG9ydC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv cnQvZGV2aWNlX3BvcnQucHkJKHJldmlzaW9uIDIzODY3MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcG9ydC9kZXZpY2VfcG9ydC5weQkod29ya2luZyBjb3B5KQpAQCAtMTYwLDMgKzE2MCw2 IEBAIGNsYXNzIERldmljZVBvcnQoRGFyd2luUG9ydCk6CiAgICAgICAgICAgICBzZWxmLl9hcHBl bmRfdmFsdWVfY29sb25fc2VwYXJhdGVkKGVudiwgJ19fWFBDX0RZTERfSU5TRVJUX0xJQlJBUklF UycsICcvdXNyL2xpYi9saWJnbWFsbG9jLmR5bGliJykKICAgICAgICAgZW52WydYTUxfQ0FUQUxP R19GSUxFUyddID0gJycgICMgd29yayBhcm91bmQgbWlzc2luZyAvZXRjL2NhdGFsb2cgPHJkYXI6 Ly9wcm9ibGVtLzQyOTI5OTU+CiAgICAgICAgIHJldHVybiBlbnYKKworICAgIGRlZiBkZXZpY2Vf dmVyc2lvbihzZWxmKToKKyAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcgpJbmRleDog VG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvcy5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5CShyZXZpc2lvbiAyMzg2NzApCisrKyBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5CSh3b3JraW5nIGNvcHkpCkBAIC01NiwxMCArNTYs MTAgQEAgY2xhc3MgSU9TUG9ydChEZXZpY2VQb3J0KToKICAgICAgICAgICAgIHdrX3N0cmluZyA9 ICd3azInCiAKICAgICAgICAgdmVyc2lvbnNfdG9fZmFsbGJhY2sgPSBbXQotICAgICAgICBpZiBz ZWxmLmlvc192ZXJzaW9uKCkubWFqb3IgPT0gc2VsZi5DVVJSRU5UX1ZFUlNJT04ubWFqb3I6Cisg ICAgICAgIGlmIHNlbGYuZGV2aWNlX3ZlcnNpb24oKS5tYWpvciA9PSBzZWxmLkNVUlJFTlRfVkVS U0lPTi5tYWpvcjoKICAgICAgICAgICAgIHZlcnNpb25zX3RvX2ZhbGxiYWNrID0gW3NlbGYuQ1VS UkVOVF9WRVJTSU9OXQotICAgICAgICBlbGlmIHNlbGYuaW9zX3ZlcnNpb24oKToKLSAgICAgICAg ICAgIHRlbXBfdmVyc2lvbiA9IFZlcnNpb24oc2VsZi5pb3NfdmVyc2lvbigpLm1ham9yKQorICAg ICAgICBlbGlmIHNlbGYuZGV2aWNlX3ZlcnNpb24oKToKKyAgICAgICAgICAgIHRlbXBfdmVyc2lv biA9IFZlcnNpb24oc2VsZi5kZXZpY2VfdmVyc2lvbigpLm1ham9yKQogICAgICAgICAgICAgd2hp bGUgdGVtcF92ZXJzaW9uICE9IHNlbGYuQ1VSUkVOVF9WRVJTSU9OOgogICAgICAgICAgICAgICAg IHZlcnNpb25zX3RvX2ZhbGxiYWNrLmFwcGVuZChWZXJzaW9uLmZyb21faXRlcmFibGUodGVtcF92 ZXJzaW9uKSkKICAgICAgICAgICAgICAgICBpZiB0ZW1wX3ZlcnNpb24gPCBzZWxmLkNVUlJFTlRf VkVSU0lPTjoKQEAgLTEwOSw2ICsxMDksMyBAQCBjbGFzcyBJT1NQb3J0KERldmljZVBvcnQpOgog CiAgICAgZGVmIHRlc3RfZXhwZWN0YXRpb25zX2ZpbGVfcG9zaXRpb24oc2VsZik6CiAgICAgICAg IHJldHVybiA0Ci0KLSAgICBkZWYgaW9zX3ZlcnNpb24oc2VsZik6Ci0gICAgICAgIHJhaXNlIE5v dEltcGxlbWVudGVkRXJyb3IKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3Nf ZGV2aWNlLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3Nf ZGV2aWNlLnB5CShyZXZpc2lvbiAyMzg2NzApCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv cnQvaW9zX2RldmljZS5weQkod29ya2luZyBjb3B5KQpAQCAtODcsNyArODcsNyBAQCBjbGFzcyBJ T1NEZXZpY2VQb3J0KElPU1BvcnQpOgogICAgICAgICByZXR1cm4gKHN0ZGVyciwgTm9uZSkKIAog ICAgIEBtZW1vaXplZAotICAgIGRlZiBpb3NfdmVyc2lvbihzZWxmKToKKyAgICBkZWYgZGV2aWNl X3ZlcnNpb24oc2VsZik6CiAgICAgICAgIGlmIHNlbGYuZ2V0X29wdGlvbigndmVyc2lvbicpOgog ICAgICAgICAgICAgcmV0dXJuIFZlcnNpb24uZnJvbV9zdHJpbmcoc2VsZi5nZXRfb3B0aW9uKCd2 ZXJzaW9uJykpCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3Nfc2ltdWxh dG9yLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3Nfc2lt dWxhdG9yLnB5CShyZXZpc2lvbiAyMzg2NzApCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv cnQvaW9zX3NpbXVsYXRvci5weQkod29ya2luZyBjb3B5KQpAQCAtNjAsNyArNjAsNyBAQCBjbGFz cyBJT1NTaW11bGF0b3JQb3J0KElPU1BvcnQpOgogICAgICAgICByZXR1cm4gTm9uZQogCiAgICAg QG1lbW9pemVkCi0gICAgZGVmIGlvc192ZXJzaW9uKHNlbGYpOgorICAgIGRlZiBkZXZpY2VfdmVy c2lvbihzZWxmKToKICAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd2ZXJzaW9uJyk6CiAgICAg ICAgICAgICByZXR1cm4gVmVyc2lvbi5mcm9tX3N0cmluZyhzZWxmLmdldF9vcHRpb24oJ3ZlcnNp b24nKSkKICAgICAgICAgcmV0dXJuIElPU1NpbXVsYXRvclBvcnQuX3ZlcnNpb25fZnJvbV9uYW1l KHNlbGYuX25hbWUpIGlmIElPU1NpbXVsYXRvclBvcnQuX3ZlcnNpb25fZnJvbV9uYW1lKHNlbGYu X25hbWUpIGVsc2Ugc2VsZi5ob3N0LnBsYXRmb3JtLnhjb2RlX3Nka192ZXJzaW9uKCdpcGhvbmVz aW11bGF0b3InKQpAQCAtNzAsOCArNzAsNyBAQCBjbGFzcyBJT1NTaW11bGF0b3JQb3J0KElPU1Bv cnQpOgogICAgICAgICBkZWYgYm9vdGVkX2lvc19kZXZpY2VzX2ZpbHRlcihkZXZpY2UpOgogICAg ICAgICAgICAgaWYgbm90IGRldmljZS5wbGF0Zm9ybV9kZXZpY2UuaXNfYm9vdGVkX29yX2Jvb3Rp bmcoKToKICAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UKLSAgICAgICAgICAgIHJldHVybiBk ZXZpY2UucGxhdGZvcm1fZGV2aWNlLmRldmljZV90eXBlIGluIERldmljZVR5cGUoc29mdHdhcmVf dmFyaWFudD0naU9TJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgc29mdHdhcmVfdmVyc2lvbj1zZWxmLmlvc192ZXJz aW9uKCkpCisgICAgICAgICAgICByZXR1cm4gZGV2aWNlLnBsYXRmb3JtX2RldmljZS5kZXZpY2Vf dHlwZSBpbiBEZXZpY2VUeXBlKHNvZnR3YXJlX3ZhcmlhbnQ9J2lPUycsIHNvZnR3YXJlX3ZlcnNp b249c2VsZi5kZXZpY2VfdmVyc2lvbigpKQogCiAgICAgICAgIGlmIG5vdCBzZWxmLmdldF9vcHRp b24oJ2RlZGljYXRlZF9zaW11bGF0b3JzJywgRmFsc2UpOgogICAgICAgICAgICAgbnVtX2Jvb3Rl ZF9zaW1zID0gbGVuKFNpbXVsYXRlZERldmljZU1hbmFnZXIuZGV2aWNlX2J5X2ZpbHRlcihib290 ZWRfaW9zX2RldmljZXNfZmlsdGVyLCBob3N0PXNlbGYuaG9zdCkpCkBAIC04NCw3ICs4Myw3IEBA IGNsYXNzIElPU1NpbXVsYXRvclBvcnQoSU9TUG9ydCk6CiAKICAgICBkZWYgX2NyZWF0ZV9kZXZp Y2VzKHNlbGYsIGRldmljZV9jbGFzcyk6CiAgICAgICAgIHNlbGYuX3NldF9kZXZpY2VfY2xhc3Mo ZGV2aWNlX2NsYXNzKQotICAgICAgICBkZXZpY2VfdHlwZSA9IERldmljZVR5cGUuZnJvbV9zdHJp bmcoc2VsZi5fZGV2aWNlX2NsYXNzLCBzZWxmLmlvc192ZXJzaW9uKCkpCisgICAgICAgIGRldmlj ZV90eXBlID0gRGV2aWNlVHlwZS5mcm9tX3N0cmluZyhzZWxmLl9kZXZpY2VfY2xhc3MsIHNlbGYu ZGV2aWNlX3ZlcnNpb24oKSkKIAogICAgICAgICBfbG9nLmRlYnVnKCdcbkNyZWF0aW5nIGRldmlj ZXMgZm9yIHt9Jy5mb3JtYXQoZGV2aWNlX3R5cGUpKQogCkBAIC0xMjgsNyArMTI3LDcgQEAgY2xh c3MgSU9TU2ltdWxhdG9yUG9ydChJT1NQb3J0KToKICAgICAgICAgcmV0dXJuICdpb3Mtc2ltdWxh dG9yJwogCiAgICAgZGVmIGNoZWNrX3N5c19kZXBzKHNlbGYpOgotICAgICAgICB0YXJnZXRfZGV2 aWNlX3R5cGUgPSBEZXZpY2VUeXBlKHNvZnR3YXJlX3ZhcmlhbnQ9J2lPUycsIHNvZnR3YXJlX3Zl cnNpb249c2VsZi5pb3NfdmVyc2lvbigpKQorICAgICAgICB0YXJnZXRfZGV2aWNlX3R5cGUgPSBE ZXZpY2VUeXBlKHNvZnR3YXJlX3ZhcmlhbnQ9J2lPUycsIHNvZnR3YXJlX3ZlcnNpb249c2VsZi5k ZXZpY2VfdmVyc2lvbigpKQogICAgICAgICBmb3IgZGV2aWNlIGluIFNpbXVsYXRlZERldmljZU1h bmFnZXIuYXZhaWxhYmxlX2RldmljZXMoc2VsZi5ob3N0KToKICAgICAgICAgICAgIGlmIGRldmlj ZS5wbGF0Zm9ybV9kZXZpY2UuZGV2aWNlX3R5cGUgaW4gdGFyZ2V0X2RldmljZV90eXBlOgogICAg ICAgICAgICAgICAgIHJldHVybiBzdXBlcihJT1NTaW11bGF0b3JQb3J0LCBzZWxmKS5jaGVja19z eXNfZGVwcygpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2F0Y2gucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dhdGNoLnB5CShyZXZpc2lv biAyMzg2NzApCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2F0Y2gucHkJKHdvcmtp bmcgY29weSkKQEAgLTU5LDEwICs1OSwxMCBAQCBjbGFzcyBXYXRjaFBvcnQoRGV2aWNlUG9ydCk6 CiAgICAgQG1lbW9pemVkCiAgICAgZGVmIGRlZmF1bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2Vs Zik6CiAgICAgICAgIHZlcnNpb25zX3RvX2ZhbGxiYWNrID0gW10KLSAgICAgICAgaWYgc2VsZi53 YXRjaG9zX3ZlcnNpb24oKSA9PSBzZWxmLkNVUlJFTlRfVkVSU0lPTjoKKyAgICAgICAgaWYgc2Vs Zi5kZXZpY2VfdmVyc2lvbigpID09IHNlbGYuQ1VSUkVOVF9WRVJTSU9OOgogICAgICAgICAgICAg dmVyc2lvbnNfdG9fZmFsbGJhY2sgPSBbc2VsZi5DVVJSRU5UX1ZFUlNJT05dCi0gICAgICAgIGVs aWYgc2VsZi53YXRjaG9zX3ZlcnNpb24oKToKLSAgICAgICAgICAgIHRlbXBfdmVyc2lvbiA9IFZl cnNpb24oc2VsZi53YXRjaG9zX3ZlcnNpb24oKS5tYWpvcikKKyAgICAgICAgZWxpZiBzZWxmLmRl dmljZV92ZXJzaW9uKCk6CisgICAgICAgICAgICB0ZW1wX3ZlcnNpb24gPSBWZXJzaW9uKHNlbGYu ZGV2aWNlX3ZlcnNpb24oKS5tYWpvcikKICAgICAgICAgICAgIHdoaWxlIHRlbXBfdmVyc2lvbi5t YWpvciAhPSBzZWxmLkNVUlJFTlRfVkVSU0lPTi5tYWpvcjoKICAgICAgICAgICAgICAgICB2ZXJz aW9uc190b19mYWxsYmFjay5hcHBlbmQoVmVyc2lvbi5mcm9tX2l0ZXJhYmxlKHRlbXBfdmVyc2lv bikpCiAgICAgICAgICAgICAgICAgaWYgdGVtcF92ZXJzaW9uIDwgc2VsZi5DVVJSRU5UX1ZFUlNJ T046CkBAIC05Nyw3ICs5NywzIEBAIGNsYXNzIFdhdGNoUG9ydChEZXZpY2VQb3J0KToKICAgICAg ICAgZXhwZWN0YXRpb25zLmFwcGVuZChzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aCgnd2syJykp CiAKICAgICAgICAgcmV0dXJuIGV4cGVjdGF0aW9ucwotCi0gICAgZGVmIHdhdGNob3NfdmVyc2lv bihzZWxmKToKLSAgICAgICAgIyBUaGUgaW1wbGVtZW50YXRpb24gb2YgdGhpcyBmdW5jdGlvbiBk aWZmZXJzIGJldHdlZW4gb24tZGV2aWNlIGFuZCBzaW11bGF0b3IgdGVzdGluZy4KLSAgICAgICAg cmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9w b3J0L3dhdGNoX2RldmljZS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvd2F0Y2hfZGV2aWNlLnB5CShyZXZpc2lvbiAyMzg2NzApCisrKyBUb29scy9TY3JpcHRz L3dlYmtpdHB5L3BvcnQvd2F0Y2hfZGV2aWNlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC04NSw3ICs4 NSw3IEBAIGNsYXNzIFdhdGNoRGV2aWNlUG9ydChXYXRjaFBvcnQpOgogICAgICAgICByZXR1cm4g KHN0ZGVyciwgTm9uZSkKIAogICAgIEBtZW1vaXplZAotICAgIGRlZiB3YXRjaG9zX3ZlcnNpb24o c2VsZik6CisgICAgZGVmIGRldmljZV92ZXJzaW9uKHNlbGYpOgogICAgICAgICBpZiBzZWxmLmdl dF9vcHRpb24oJ3ZlcnNpb24nKToKICAgICAgICAgICAgIHJldHVybiBWZXJzaW9uLmZyb21fc3Ry aW5nKHNlbGYuZ2V0X29wdGlvbigndmVyc2lvbicpKQogCkluZGV4OiBUb29scy9TY3JpcHRzL3dl YmtpdHB5L3BvcnQvd2F0Y2hfc2ltdWxhdG9yLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC93YXRjaF9zaW11bGF0b3IucHkJKHJldmlzaW9uIDIzODY3MCkKKysr IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93YXRjaF9zaW11bGF0b3IucHkJKHdvcmtpbmcg Y29weSkKQEAgLTYyLDcgKzYyLDcgQEAgY2xhc3MgV2F0Y2hTaW11bGF0b3JQb3J0KFdhdGNoUG9y dCk6CiAgICAgICAgIHJldHVybiBOb25lCiAKICAgICBAbWVtb2l6ZWQKLSAgICBkZWYgd2F0Y2hv c192ZXJzaW9uKHNlbGYpOgorICAgIGRlZiBkZXZpY2VfdmVyc2lvbihzZWxmKToKICAgICAgICAg aWYgc2VsZi5nZXRfb3B0aW9uKCd2ZXJzaW9uJyk6CiAgICAgICAgICAgICByZXR1cm4gVmVyc2lv bi5mcm9tX3N0cmluZyhzZWxmLmdldF9vcHRpb24oJ3ZlcnNpb24nKSkKICAgICAgICAgcmV0dXJu IFdhdGNoU2ltdWxhdG9yUG9ydC5fdmVyc2lvbl9mcm9tX25hbWUoc2VsZi5fbmFtZSkgb3Igc2Vs Zi5ob3N0LnBsYXRmb3JtLnhjb2RlX3Nka192ZXJzaW9uKCd3YXRjaHNpbXVsYXRvcicpCkBAIC04 Myw3ICs4Myw3IEBAIGNsYXNzIFdhdGNoU2ltdWxhdG9yUG9ydChXYXRjaFBvcnQpOgogICAgICAg ICBkZWYgZmlsdGVyX2Jvb3RlZF93YXRjaG9zX2RldmljZXMoZGV2aWNlKToKICAgICAgICAgICAg IGlmIG5vdCBkZXZpY2UucGxhdGZvcm1fZGV2aWNlLmlzX2Jvb3RlZF9vcl9ib290aW5nKCk6CiAg ICAgICAgICAgICAgICAgcmV0dXJuIEZhbHNlCi0gICAgICAgICAgICByZXR1cm4gZGV2aWNlLnBs YXRmb3JtX2RldmljZS5kZXZpY2VfdHlwZSBpbiBEZXZpY2VUeXBlKHNvZnR3YXJlX3ZhcmlhbnQ9 J3dhdGNoT1MnLCBzb2Z0d2FyZV92ZXJzaW9uPXNlbGYud2F0Y2hvc192ZXJzaW9uKCkpCisgICAg ICAgICAgICByZXR1cm4gZGV2aWNlLnBsYXRmb3JtX2RldmljZS5kZXZpY2VfdHlwZSBpbiBEZXZp Y2VUeXBlKHNvZnR3YXJlX3ZhcmlhbnQ9J3dhdGNoT1MnLCBzb2Z0d2FyZV92ZXJzaW9uPXNlbGYu ZGV2aWNlX3ZlcnNpb24oKSkKIAogICAgICAgICBpZiBub3Qgc2VsZi5nZXRfb3B0aW9uKCdkZWRp Y2F0ZWRfc2ltdWxhdG9ycycsIEZhbHNlKToKICAgICAgICAgICAgIG51bV9ib290ZWRfc2ltcyA9 IGxlbihTaW11bGF0ZWREZXZpY2VNYW5hZ2VyLmRldmljZV9ieV9maWx0ZXIoZmlsdGVyX2Jvb3Rl ZF93YXRjaG9zX2RldmljZXMsIGhvc3Q9c2VsZi5ob3N0KSkKQEAgLTk2LDcgKzk2LDcgQEAgY2xh c3MgV2F0Y2hTaW11bGF0b3JQb3J0KFdhdGNoUG9ydCk6CiAKICAgICBkZWYgX2NyZWF0ZV9kZXZp Y2VzKHNlbGYsIGRldmljZV9jbGFzcyk6CiAgICAgICAgIHNlbGYuX3NldF9kZXZpY2VfY2xhc3Mo ZGV2aWNlX2NsYXNzKQotICAgICAgICBkZXZpY2VfdHlwZSA9IERldmljZVR5cGUuZnJvbV9zdHJp bmcoc2VsZi5fZGV2aWNlX2NsYXNzLCBzZWxmLndhdGNob3NfdmVyc2lvbigpKQorICAgICAgICBk ZXZpY2VfdHlwZSA9IERldmljZVR5cGUuZnJvbV9zdHJpbmcoc2VsZi5fZGV2aWNlX2NsYXNzLCBz ZWxmLmRldmljZV92ZXJzaW9uKCkpCiAKICAgICAgICAgX2xvZy5kZWJ1ZygnXG5DcmVhdGluZyBk ZXZpY2VzIGZvciB7fScuZm9ybWF0KGRldmljZV90eXBlKSkKIApAQCAtMTEyLDcgKzExMiw3IEBA IGNsYXNzIFdhdGNoU2ltdWxhdG9yUG9ydChXYXRjaFBvcnQpOgogICAgICAgICByZXR1cm4gJ3dh dGNob3Mtc2ltdWxhdG9yJwogCiAgICAgZGVmIGNoZWNrX3N5c19kZXBzKHNlbGYpOgotICAgICAg ICB0YXJnZXRfZGV2aWNlX3R5cGUgPSBEZXZpY2VUeXBlKHNvZnR3YXJlX3ZhcmlhbnQ9J3dhdGNo T1MnLCBzb2Z0d2FyZV92ZXJzaW9uPXNlbGYud2F0Y2hvc192ZXJzaW9uKCkpCisgICAgICAgIHRh cmdldF9kZXZpY2VfdHlwZSA9IERldmljZVR5cGUoc29mdHdhcmVfdmFyaWFudD0nd2F0Y2hPUycs IHNvZnR3YXJlX3ZlcnNpb249c2VsZi5kZXZpY2VfdmVyc2lvbigpKQogICAgICAgICBmb3IgZGV2 aWNlIGluIFNpbXVsYXRlZERldmljZU1hbmFnZXIuYXZhaWxhYmxlX2RldmljZXMoc2VsZi5ob3N0 KToKICAgICAgICAgICAgIGlmIGRldmljZS5wbGF0Zm9ybV9kZXZpY2UuZGV2aWNlX3R5cGUgaW4g dGFyZ2V0X2RldmljZV90eXBlOgogICAgICAgICAgICAgICAgIHJldHVybiBzdXBlcihXYXRjaFNp bXVsYXRvclBvcnQsIHNlbGYpLmNoZWNrX3N5c19kZXBzKCkK