108028 2013-01-27 01:21:51 -0800 REGRESSION (r140912): Broke specifying non-trivial ARCHS value to make / build-webkit 2013-01-27 20:24:03 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Regression P2 Normal --- 1 mrowe dfarler dbates ddkilzer webkit.review.bot oldest_to_newest 817342 0 mrowe 2013-01-27 01:21:51 -0800 Prior to r140912 the following worked and had the expected behavior: > make debug ARGS="ARCHS='x86_64 i386' ONLY_ACTIVE_ARCH=NO" > ./Tools/Scripts/build-webkit ARCHS='$(ARCHS_STANDARD_32_64_BIT)' ONLY_ACTIVE_ARCH=NO The former now results in completely bogus arguments being passed to xcodebuild: > xcodebuild -configuration Debug -sdk / -arch -arch -arch -arch x86_64 As does the latter: > xcodebuild -project WTF.xcodeproj -configuration Debug -sdk / -arch -arch $( -arch ) ONLY_ACTIVE_ARCH=NO This is breaking the nightly builds, since they pass explicit ARCHS flags to the build scripts, and it also breaks our established method of building for non-default / multiple architectures. The fact we're now passing an explicit "-sdk" argument for OS X builds is also not good, but isn't a cause of this breakage. 817358 1 dfarler 2013-01-27 03:30:02 -0800 I think I might like to just revert the previous patch entirely and rethink this. Using ARGS= in the makefile and SDKROOT= ARCHS= with build-webkit / xcodebuild, almost everything will work with the same usage as now. Mixing make variables and unparsed Xcode options in $(ARGS) or un-spliced through webkitdirs.pm doesn’t seem worth it. The only problem leftover is reducing the modules lists in Tools/Makefile and Source/Makefile, which I can shore up in a later patch. 817359 2 184909 dfarler 2013-01-27 03:33:37 -0800 Created attachment 184909 Patch 817487 3 184909 webkit.review.bot 2013-01-27 20:24:00 -0800 Comment on attachment 184909 Patch Clearing flags on attachment: 184909 Committed r140939: <http://trac.webkit.org/changeset/140939> 817488 4 webkit.review.bot 2013-01-27 20:24:03 -0800 All reviewed patches have been landed. Closing bug. 184909 2013-01-27 03:33:37 -0800 2013-01-27 20:24:00 -0800 Patch bug-108028-20130127033026.patch text/plain 10614 dfarler U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwOTI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvTWFrZWZpbGUg Yi9Tb3VyY2UvTWFrZWZpbGUKaW5kZXggZDkzOThhZjQxMmRkYTc4ODFhMzQyYTlmYjE4YmU4YWU5 Zjg3YWY2MC4uMjU4YzJmMmU3NzA1MWFmYWUxNmI0ZjVhY2M2NzJiNzQ1MWQ0MmU5NSAxMDA2NDQK LS0tIGEvU291cmNlL01ha2VmaWxlCisrKyBiL1NvdXJjZS9NYWtlZmlsZQpAQCAtMSwyMiArMSwx NCBAQAogTU9EVUxFUyA9IFdURiBKYXZhU2NyaXB0Q29yZSBUaGlyZFBhcnR5L0FOR0xFIFdlYkNv cmUgV2ViS2l0IFdlYktpdDIKIAotSU9TX0RPTlRfQlVJTEQgPSBXZWJLaXQyCi0KLWlmbmVxICgs JChmaW5kc3RyaW5nIGlwaG9uZW9zLCQoU0RLKSkpCi0JTU9EVUxFUyA9ICQoZmlsdGVyLW91dCAk KElPU19ET05UX0JVSUxEKSwkKE1PRFVMRVMpKQotZWxzZSBpZm5lcSAoLCQoZmluZHN0cmluZyBp cGhvbmVzaW11bGF0b3IsJChTREspKSkKLQlNT0RVTEVTID0gJChzdWJzdCAkKElPU19ET05UX0JV SUxEKSwkKE1PRFVMRVMpKQotZW5kaWYKLQogYWxsOgogCUBmb3IgZGlyIGluICQoTU9EVUxFUyk7 IGRvICR7TUFLRX0gJEAgLUMgJCRkaXI7IGV4aXRfc3RhdHVzPSQkPzsgXAogCWlmIFsgJCRleGl0 X3N0YXR1cyAtbmUgMCBdOyB0aGVuIGV4aXQgJCRleGl0X3N0YXR1czsgZmk7IGRvbmUKIAotZGVi dWcgZDoKK2RlYnVnIGQgZGV2ZWxvcG1lbnQgZGV2IGRldmVsb3A6CiAJQGZvciBkaXIgaW4gJChN T0RVTEVTKTsgZG8gJHtNQUtFfSAkQCAtQyAkJGRpcjsgZXhpdF9zdGF0dXM9JCQ/OyBcCiAJaWYg WyAkJGV4aXRfc3RhdHVzIC1uZSAwIF07IHRoZW4gZXhpdCAkJGV4aXRfc3RhdHVzOyBmaTsgZG9u ZQogCi1yZWxlYXNlIHI6CityZWxlYXNlIHIgZGVwbG95bWVudCBkZXAgZGVwbG95OgogCUBmb3Ig ZGlyIGluICQoTU9EVUxFUyk7IGRvICR7TUFLRX0gJEAgLUMgJCRkaXI7IGV4aXRfc3RhdHVzPSQk PzsgXAogCWlmIFsgJCRleGl0X3N0YXR1cyAtbmUgMCBdOyB0aGVuIGV4aXQgJCRleGl0X3N0YXR1 czsgZmk7IGRvbmUKIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl TG9nCmluZGV4IGMwMDY1MjMxN2Y3YTRmNzJhMTQxNzNmMWMwMzQ5N2Y0MjdlNzg1N2MuLmVjYjVi Y2FlNWFjNDBmMmZhOTNmOTE5NjVlYjBmM2MyNmI5MTNmNjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0No YW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMy0wMS0y NyAgRGF2aWQgRmFybGVyICA8ZGZhcmxlckBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lP TiAocjE0MDkxMik6IEJyb2tlIHNwZWNpZnlpbmcgbm9uLXRyaXZpYWwgQVJDSFMgdmFsdWUgdG8g bWFrZSAvIGJ1aWxkLXdlYmtpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTA4MDI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9NYWtlZmlsZTogUmV2ZXJ0ZWQuCisgICAgICAg ICogTWFrZWZpbGU6IFJldmVydGVkLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbTog UmV2ZXJ0ZWQuCisKIDIwMTMtMDEtMjYgIERhdmlkIEZhcmxlciAgPGRmYXJsZXJAYXBwbGUuY29t PgogCiAgICAgICAgIE1ha2VmaWxlcyBzaG91bGQgd29yayBmb3IgYXJiaXRyYXJ5IFNES3MgYW5k IGFyY2hpdGVjdHVyZXMgb24gQXBwbGUgcG9ydHMKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL01ha2VmaWxlIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvTWFrZWZpbGUKaW5kZXggMzY2 ZjhkOWYxNTg0ODM2MmQ0Yjk3ODZlMmEzNTUxNjgwMjU2NmE5Mi4uMWYxZGJiY2IzMGZkNDc3NDhk YzE4NzIzNjA4MzMwMWY2ZGQ3YjZiNSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUv TWFrZWZpbGUKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvTWFrZWZpbGUKQEAgLTEsOSArMSwy IEBACiBTQ1JJUFRTX1BBVEggPSAuLi9TY3JpcHRzCi0KLWlmbmVxICgsJChmaW5kc3RyaW5nIGlw aG9uZW9zLCQoU0RLKSkpCi0JT1RIRVJfT1BUSU9OUyArPSAtdGFyZ2V0IEFsbC1pT1MKLWVsc2Ug aWZuZXEgKCwkKGZpbmRzdHJpbmcgaXBob25lc2ltdWxhdG9yLCQoU0RLKSkpCi0JT1RIRVJfT1BU SU9OUyArPSAtdGFyZ2V0IEFsbC1pT1MKLWVuZGlmCi0KIGluY2x1ZGUgLi4vLi4vTWFrZWZpbGUu c2hhcmVkCmRpZmYgLS1naXQgYS9Ub29scy9NYWtlZmlsZSBiL1Rvb2xzL01ha2VmaWxlCmluZGV4 IDc3MWYwZTM0YzNmMjEyNWU5MDJlZjZlN2I4NDNkOWM1NGE3NTE3MzcuLmFkYzNhZTYzYWU1Mzli NGNjY2Q3OWNmZWJjZjAyNmQxYjAyM2ZhYzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01ha2VmaWxlCisr KyBiL1Rvb2xzL01ha2VmaWxlCkBAIC0xLDI0ICsxLDE0IEBACiBNT0RVTEVTID0gRHVtcFJlbmRl clRyZWUgV2ViS2l0VGVzdFJ1bm5lciBNaW5pQnJvd3NlciAuLi9Tb3VyY2UvVGhpcmRQYXJ0eS9n dGVzdC94Y29kZSBUZXN0V2ViS2l0QVBJCiAKLUlPU19ET05UX0JVSUxEID0gV2ViS2l0VGVzdFJ1 bm5lciBNaW5pQnJvd3NlciBUZXN0V2ViS2l0QVBJCi1JUEhPTkVPU19ET05UX0JVSUxEID0gRHVt cFJlbmRlclRyZWUKLQotaWZuZXEgKCwkKGZpbmRzdHJpbmcgaXBob25lb3MsJChTREspKSkKLQlN T0RVTEVTID0gJChmaWx0ZXItb3V0ICQoSU9TX0RPTlRfQlVJTEQpLCQoTU9EVUxFUykpCi0JTU9E VUxFUyA9ICQoZmlsdGVyLW91dCAkKElQSE9ORU9TX0RPTlRfQlVJTEQpLCQoTU9EVUxFUykpCi1l bHNlIGlmbmVxICgsJChmaW5kc3RyaW5nIGlwaG9uZXNpbXVsYXRvciwkKFNESykpKQotCU1PRFVM RVMgPSAkKGZpbHRlci1vdXQgJChJT1NfRE9OVF9CVUlMRCksJChNT0RVTEVTKSkKLWVuZGlmCi0K IGFsbDoKIAlAZm9yIGRpciBpbiAkKE1PRFVMRVMpOyBkbyAke01BS0V9ICRAIC1DICQkZGlyOyBl eGl0X3N0YXR1cz0kJD87IFwKIAlpZiBbICQkZXhpdF9zdGF0dXMgLW5lIDAgXTsgdGhlbiBleGl0 ICQkZXhpdF9zdGF0dXM7IGZpOyBkb25lCiAKLWRlYnVnIGQ6CitkZWJ1ZyBkIGRldmVsb3BtZW50 IGRldiBkZXZlbG9wOgogCUBmb3IgZGlyIGluICQoTU9EVUxFUyk7IGRvICR7TUFLRX0gJEAgLUMg JCRkaXI7IGV4aXRfc3RhdHVzPSQkPzsgXAogCWlmIFsgJCRleGl0X3N0YXR1cyAtbmUgMCBdOyB0 aGVuIGV4aXQgJCRleGl0X3N0YXR1czsgZmk7IGRvbmUKIAotcmVsZWFzZSByOgorcmVsZWFzZSBy IGRlcGxveW1lbnQgZGVwIGRlcGxveToKIAlAZm9yIGRpciBpbiAkKE1PRFVMRVMpOyBkbyAke01B S0V9ICRAIC1DICQkZGlyOyBleGl0X3N0YXR1cz0kJD87IFwKIAlpZiBbICQkZXhpdF9zdGF0dXMg LW5lIDAgXTsgdGhlbiBleGl0ICQkZXhpdF9zdGF0dXM7IGZpOyBkb25lCiAKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5w bQppbmRleCBlOTQwNmUzYjkzMzgxZmYzYjc5MzgxNmE4ZGEzNTEwMzY3ODlmMmE0Li44ZDM3YThj ZjI1MmY0ZWEzOWQxNzJhNmQ5ZWMzNGJjZDE2NzA0ZjdmIDEwMDc1NQotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC04 MCw4ICs4MCw2IEBAIG15ICRudW1iZXJPZkNQVXM7CiBteSAkYmFzZVByb2R1Y3REaXI7CiBteSBA YmFzZVByb2R1Y3REaXJPcHRpb247CiBteSAkY29uZmlndXJhdGlvbjsKLW15ICR4Y29kZVNESzsK LW15ICR4Y29kZVNES1ZlcnNpb247CiBteSAkY29uZmlndXJhdGlvbkZvclZpc3VhbFN0dWRpbzsK IG15ICRjb25maWd1cmF0aW9uUHJvZHVjdERpcjsKIG15ICRzb3VyY2VEaXI7CkBAIC0yNzUsMTcg KzI3Myw2IEBAIHN1YiBzZXRCYXNlUHJvZHVjdERpcigkKQogc3ViIGRldGVybWluZUNvbmZpZ3Vy YXRpb24KIHsKICAgICByZXR1cm4gaWYgZGVmaW5lZCAkY29uZmlndXJhdGlvbjsKLQotICAgICMg TG9vayBmb3IgZXhwbGljaXQgc2V0dGluZyBmaXJzdAotICAgIGZvciAobXkgJGkgPSAwOyAkaSA8 PSAkI0FSR1Y7ICRpKyspIHsKLSAgICAgICAgbXkgJG9wdCA9ICRBUkdWWyRpXTsKLSAgICAgICAg aWYgKCRvcHQgPX4gL14tLWNvbmZpZyh1cmF0aW9uKSQvKSB7Ci0gICAgICAgICAgICBzcGxpY2Uo QEFSR1YsICRpLCAxKTsKLSAgICAgICAgICAgICRjb25maWd1cmF0aW9uID0gc3BsaWNlKEBBUkdW LCAkaSwgMSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAgICB9Ci0KICAgICBk ZXRlcm1pbmVCYXNlUHJvZHVjdERpcigpOwogICAgIGlmIChvcGVuIENPTkZJR1VSQVRJT04sICIk YmFzZVByb2R1Y3REaXIvQ29uZmlndXJhdGlvbiIpIHsKICAgICAgICAgJGNvbmZpZ3VyYXRpb24g PSA8Q09ORklHVVJBVElPTj47CkBAIC0zMTUsMzAgKzMwMiw2IEBAIHN1YiBkZXRlcm1pbmVBcmNo aXRlY3R1cmUKIAogICAgIGRldGVybWluZUJhc2VQcm9kdWN0RGlyKCk7CiAKLSAgICAjIExvb2sg Zm9yIGV4cGxpY2l0IHNldHRpbmcgZmlyc3QKLSAgICBteSBAZXhwbGljaXRBcmNoczsKLSAgICBm b3IgKG15ICRpID0gMDsgJGkgPD0gJCNBUkdWOyAkaSsrKSB7Ci0gICAgICAgIG15ICRvcHQgPSAk QVJHVlskaV07Ci0KLSAgICAgICAgaWYgKCRvcHQgPX4gL14tLWFyY2goaXRlY3R1cmUpPyQvKSB7 Ci0gICAgICAgICAgICBzcGxpY2UoQEFSR1YsICRpLCAxKTsKLSAgICAgICAgICAgIHB1c2ggQGV4 cGxpY2l0QXJjaHMsIHNwbGljZShAQVJHViwgJGktLSwgMSk7Ci0gICAgICAgIH0gZWxzaWYgKCRv cHQgPX4gL15BUkNIUz0oLiopJC8pIHsKLSAgICAgICAgICAgIHB1c2ggQGV4cGxpY2l0QXJjaHMs IHNwbGl0KC9cdy8sICQxKTsKLSAgICAgICAgICAgIHNwbGljZShAQVJHViwgJGktLSwgMSk7Ci0g ICAgICAgIH0KLSAgICB9Ci0KLSAgICAjIE1ha2UgZXhwbGljaXQgYXJjaCBzZXR0aW5ncyBmb3Jn aXZpbmcg4oCTIHJlbW92ZSBkdXBsaWNhdGUgc2V0dGluZ3MKLSAgICAjIGFuZCBhbGxvdyBmb3Ig c3BlY2lmeWluZyBhcmNoaXRlY3R1cmVzIHdpdGggYm90aCAtLWFyY2ggYW5kIGFwcGVuZGluZwot ICAgICMgWGNvZGUtc3R5bGUgQVJDSFM9KC4qKQotICAgIEBleHBsaWNpdEFyY2hzID0gc29ydCBr ZXlzICV7eyBtYXAgeyAkXyA9PiAxIH0gQGV4cGxpY2l0QXJjaHMgfX07Ci0KLSAgICBpZiAoc2Nh bGFyKEBleHBsaWNpdEFyY2hzKSkgewotICAgICAgICAkYXJjaGl0ZWN0dXJlID0gam9pbignICcs IEBleHBsaWNpdEFyY2hzKSBpZiBAZXhwbGljaXRBcmNoczsKLSAgICAgICAgcmV0dXJuOwotICAg IH0KLQogICAgIGlmIChpc0d0aygpKSB7CiAgICAgICAgIGRldGVybWluZUNvbmZpZ3VyYXRpb25Q cm9kdWN0RGlyKCk7CiAgICAgICAgIG15ICRob3N0X3RyaXBsZSA9IGBncmVwIC1FICdeaG9zdCA9 ICcgJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyL0dOVW1ha2VmaWxlYDsKQEAgLTQyMCw3ICszODMs NiBAQCBzdWIgYXJndW1lbnRzRm9yQ29uZmlndXJhdGlvbigpCiAgICAgcHVzaChAYXJncywgJy0t ZGVidWcnKSBpZiAkY29uZmlndXJhdGlvbiBlcSAiRGVidWciOwogICAgIHB1c2goQGFyZ3MsICct LXJlbGVhc2UnKSBpZiAkY29uZmlndXJhdGlvbiBlcSAiUmVsZWFzZSI7CiAgICAgcHVzaChAYXJn cywgJy0tMzItYml0JykgaWYgJGFyY2hpdGVjdHVyZSBuZSAieDg2XzY0IjsKLSAgICBwdXNoKEBh cmdzLCAnLS1zZGsnLCAkeGNvZGVTREspIGlmIGRlZmluZWQgJHhjb2RlU0RLOwogICAgIHB1c2go QGFyZ3MsICctLXF0JykgaWYgaXNRdCgpOwogICAgIHB1c2goQGFyZ3MsICctLWd0aycpIGlmIGlz R3RrKCk7CiAgICAgcHVzaChAYXJncywgJy0tZWZsJykgaWYgaXNFZmwoKTsKQEAgLTQzNCwzMyAr Mzk2LDYgQEAgc3ViIGFyZ3VtZW50c0ZvckNvbmZpZ3VyYXRpb24oKQogICAgIHJldHVybiBAYXJn czsKIH0KIAotc3ViIGRldGVybWluZVhjb2RlU0RLCi17Ci0gICAgcmV0dXJuIGlmIGRlZmluZWQg JHhjb2RlU0RLOwotICAgIGZvciAobXkgJGkgPSAwOyAkaSA8PSAkI0FSR1Y7ICRpKyspIHsKLSAg ICAgICAgbXkgJG9wdCA9ICRBUkdWWyRpXTsKLSAgICAgICAgaWYgKCRvcHQgPX4gL14tLXNkayQv aSkgewotICAgICAgICAgICAgc3BsaWNlKEBBUkdWLCAkaSwgMSk7Ci0gICAgICAgICAgICAkeGNv ZGVTREsgPSBzcGxpY2UoQEFSR1YsICRpLCAxKTsKLSAgICAgICAgfSBlbHNpZiAoJG9wdCA9fiAv Xi0tZGV2aWNlJC9pKSB7Ci0gICAgICAgICAgICBzcGxpY2UoQEFSR1YsICRpLCAxKTsKLSAgICAg ICAgICAgICR4Y29kZVNESyA9ICdpcGhvbmVvcy5pbnRlcm5hbCc7Ci0gICAgICAgIH0gZWxzaWYg KCRvcHQgPX4gL14tLXNpbSh1bGF0b3IpPy9pKSB7Ci0gICAgICAgICAgICBzcGxpY2UoQEFSR1Ys ICRpLCAxKTsKLSAgICAgICAgICAgICR4Y29kZVNESyA9ICdpcGhvbmVzaW11bGF0b3InOwotICAg ICAgICB9Ci0gICAgfQotICAgICR4Y29kZVNESyB8fD0gJy8nOwotCi0gICAgY2hvbXAgJHhjb2Rl U0RLOwotfQotCi1zdWIgeGNvZGVTREsKLXsKLSAgICBkZXRlcm1pbmVYY29kZVNESygpOwotICAg IHJldHVybiAkeGNvZGVTREs7Ci19Ci0KIHN1YiBkZXRlcm1pbmVDb25maWd1cmF0aW9uRm9yVmlz dWFsU3R1ZGlvCiB7CiAgICAgcmV0dXJuIGlmIGRlZmluZWQgJGNvbmZpZ3VyYXRpb25Gb3JWaXN1 YWxTdHVkaW87CkBAIC01ODUsOSArNTIwLDcgQEAgc3ViIFhjb2RlT3B0aW9ucwogICAgIGRldGVy bWluZUJhc2VQcm9kdWN0RGlyKCk7CiAgICAgZGV0ZXJtaW5lQ29uZmlndXJhdGlvbigpOwogICAg IGRldGVybWluZUFyY2hpdGVjdHVyZSgpOwotICAgIGRldGVybWluZVhjb2RlU0RLKCk7Ci0gICAg bXkgQGFyY2hGbGFncyA9IG1hcCB7ICgnLWFyY2gnLCAkXykgfSBzcGxpdCgvIC8sICRhcmNoaXRl Y3R1cmUpOwotICAgIHJldHVybiAoQGJhc2VQcm9kdWN0RGlyT3B0aW9uLCAiLWNvbmZpZ3VyYXRp b24iLCAkY29uZmlndXJhdGlvbiwgIi1zZGsiLCAkeGNvZGVTREssIEBhcmNoRmxhZ3MsIGFyZ3Vt ZW50c0Zvclhjb2RlKCkpOworICAgIHJldHVybiAoQGJhc2VQcm9kdWN0RGlyT3B0aW9uLCAiLWNv bmZpZ3VyYXRpb24iLCAkY29uZmlndXJhdGlvbiwgIkFSQ0hTPSRhcmNoaXRlY3R1cmUiLCBhcmd1 bWVudHNGb3JYY29kZSgpKTsKIH0KIAogc3ViIFhjb2RlT3B0aW9uU3RyaW5nCmRpZmYgLS1naXQg YS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggYjk4N2IzZDhjNmU2NzNkMzZmYzYyNDg2NjA3 NjgxNGE4OTQzMjhjYS4uY2E1MjQwODQ5OTQ5ZGJjMTBhZGUwZGQ0YjcyMGJkMTA2MmRkODM2NyAx MDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisy MDEzLTAxLTI3ICBEYXZpZCBGYXJsZXIgIDxkZmFybGVyQGFwcGxlLmNvbT4KKworICAgICAgICBS RUdSRVNTSU9OIChyMTQwOTEyKTogQnJva2Ugc3BlY2lmeWluZyBub24tdHJpdmlhbCBBUkNIUyB2 YWx1ZSB0byBtYWtlIC8gYnVpbGQtd2Via2l0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDgwMjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIE1ha2VmaWxlOiBSZXZlcnRlZC4KKyAgICAgICAgKiBNYWtl ZmlsZS5zaGFyZWQ6IFJldmVydGVkLgorICAgICAgICAqIFNvdXJjZS9NYWtlZmlsZTogUmV2ZXJ0 ZWQuCisKIDIwMTMtMDEtMjYgIERhdmlkIEZhcmxlciAgPGRmYXJsZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIEFsbG93IGJ1aWxkaW5nIHdpdGggYXJiaXRyYXJ5IFNESyBhbmQgQVJDSFMgd2l0aCBt YWtlICsgWGNvZGUKZGlmZiAtLWdpdCBhL01ha2VmaWxlIGIvTWFrZWZpbGUKaW5kZXggMTRlMzMx NTcwMTExNTc3OTdkYWM2MmM0OTRiYWMwYmYyNTRkN2MyZi4uMTlkODg5YWQzOTBjNzgzZWY1YTM3 ZmQ1MjU2NjNmMmNjZTllZDE0NCAxMDA2NDQKLS0tIGEvTWFrZWZpbGUKKysrIGIvTWFrZWZpbGUK QEAgLTQsMTEgKzQsMTEgQEAgYWxsOgogCUBmb3IgZGlyIGluICQoTU9EVUxFUyk7IGRvICR7TUFL RX0gJEAgLUMgJCRkaXI7IGV4aXRfc3RhdHVzPSQkPzsgXAogCWlmIFsgJCRleGl0X3N0YXR1cyAt bmUgMCBdOyB0aGVuIGV4aXQgJCRleGl0X3N0YXR1czsgZmk7IGRvbmUKIAotZGVidWcgZDoKK2Rl YnVnIGQgZGV2ZWxvcG1lbnQgZGV2IGRldmVsb3A6CiAJQGZvciBkaXIgaW4gJChNT0RVTEVTKTsg ZG8gJHtNQUtFfSAkQCAtQyAkJGRpcjsgZXhpdF9zdGF0dXM9JCQ/OyBcCiAJaWYgWyAkJGV4aXRf c3RhdHVzIC1uZSAwIF07IHRoZW4gZXhpdCAkJGV4aXRfc3RhdHVzOyBmaTsgZG9uZQogCi1yZWxl YXNlIHI6CityZWxlYXNlIHIgZGVwbG95bWVudCBkZXAgZGVwbG95OgogCUBmb3IgZGlyIGluICQo TU9EVUxFUyk7IGRvICR7TUFLRX0gJEAgLUMgJCRkaXI7IGV4aXRfc3RhdHVzPSQkPzsgXAogCWlm IFsgJCRleGl0X3N0YXR1cyAtbmUgMCBdOyB0aGVuIGV4aXQgJCRleGl0X3N0YXR1czsgZmk7IGRv bmUKIApkaWZmIC0tZ2l0IGEvTWFrZWZpbGUuc2hhcmVkIGIvTWFrZWZpbGUuc2hhcmVkCmluZGV4 IGFjMmFhMDk1ZGJjMjFiODZmMzYyYmNlODQzNjI3N2E3ZDM0MDMzMDIuLjdjOGRlYjgzY2I3NmJk NmJkMWJkMjg1OWQzYWZlNGFmN2RlNjIwZDcgMTAwNjQ0Ci0tLSBhL01ha2VmaWxlLnNoYXJlZAor KysgYi9NYWtlZmlsZS5zaGFyZWQKQEAgLTEsMTggKzEsNiBAQAogU0NSSVBUU19QQVRIID89IC4u L1Rvb2xzL1NjcmlwdHMKK1hDT0RFX09QVElPTlMgPSBgcGVybCAtSSQoU0NSSVBUU19QQVRIKSAt TXdlYmtpdGRpcnMgLWUgJ3ByaW50IFhjb2RlT3B0aW9uU3RyaW5nKCknYCAkKEFSR1MpCiAKLVNE SyA9IC8KLQotaWZuZXEgKCwkKGZpbmRzdHJpbmcgaXBob25lb3MsJChTREspKSkKLQlBUkNIUyA9 IGFybXY3Ci1lbHNlIGlmbmVxICgsJChmaW5kc3RyaW5nIGlwaG9uZXNpbXVsYXRvciwkKFNESykp KQotCUFSQ0hTID0gaTM4NgotZWxzZSBpZm5lcSAoLCQoZmluZHN0cmluZyBtYWNvc3gsJChTREsp KSkKLQlBUkNIUyA9IHg4Nl82NAotZWxzZQotCUFSQ0hTID0geDg2XzY0Ci1lbmRpZgotCi1BUkNI X0ZMQUdTPSQoYWRkcHJlZml4IC0tYXJjaCAsJChBUkNIUykpCiBERUZBVUxUX1ZFUkJPU0lUWSA6 PSAkKHNoZWxsIGRlZmF1bHRzIHJlYWQgb3JnLndlYmtpdC5CdWlsZENvbmZpZ3VyYXRpb24gQnVp bGRUcmFuc2NyaXB0VmVyYm9zaXR5IDI+L2Rldi9udWxsIHx8IGVjaG8gImRlZmF1bHQiKQogVkVS Qk9TSVRZID89ICQoREVGQVVMVF9WRVJCT1NJVFkpCiAKQEAgLTI2LDIyICsxNCwxOCBAQCBPVVRQ VVRfRklMVEVSID0gJChTQ1JJUFRTX1BBVEgpL2ZpbHRlci1idWlsZC13ZWJraXQKIGVuZGlmCiBl bmRpZgogCi1kZWZpbmUgeGNvZGUtb3B0aW9ucwotCSAkKHNoZWxsIHBlcmwgLUkkKFNDUklQVFNf UEFUSCkgLU13ZWJraXRkaXJzIC1lICdwcmludCBYY29kZU9wdGlvblN0cmluZygpJyAtLSAtLXNk ayAkKFNESykgJDEgJChBUkNIX0ZMQUdTKSAkKEFSR1MpKQotZW5kZWYKLQogYWxsOgotCXhjb2Rl YnVpbGQgJChPVEhFUl9PUFRJT05TKSAkKGNhbGwgeGNvZGUtb3B0aW9ucywpIHwgJChPVVRQVVRf RklMVEVSKSAmJiBleGl0ICQke1BJUEVTVEFUVVNbMF19CisJKCB4Y29kZWJ1aWxkICQoT1RIRVJf T1BUSU9OUykgJChYQ09ERV9PUFRJT05TKSB8ICQoT1VUUFVUX0ZJTFRFUikgJiYgZXhpdCAkJHtQ SVBFU1RBVFVTWzBdfSApCiAKLWRlYnVnIGQ6IGZvcmNlCitkZWJ1ZyBkIGRldmVsb3BtZW50IGRl diBkZXZlbG9wOiBmb3JjZQogCSQoU0NSSVBUU19QQVRIKS9zZXQtd2Via2l0LWNvbmZpZ3VyYXRp b24gLS1kZWJ1ZwotCXhjb2RlYnVpbGQgJChPVEhFUl9PUFRJT05TKSAkKGNhbGwgeGNvZGUtb3B0 aW9ucywgLS1jb25maWd1cmF0aW9uIERlYnVnKSB8ICQoT1VUUFVUX0ZJTFRFUikgJiYgZXhpdCAk JHtQSVBFU1RBVFVTWzBdfQorCSggeGNvZGVidWlsZCAkKE9USEVSX09QVElPTlMpICQoWENPREVf T1BUSU9OUykgfCAkKE9VVFBVVF9GSUxURVIpICYmIGV4aXQgJCR7UElQRVNUQVRVU1swXX0gKQog Ci1yZWxlYXNlIHI6IGZvcmNlCityZWxlYXNlIHIgZGVwbG95bWVudCBkZXAgZGVwbG95OiBmb3Jj ZQogCSQoU0NSSVBUU19QQVRIKS9zZXQtd2Via2l0LWNvbmZpZ3VyYXRpb24gLS1yZWxlYXNlCi0J eGNvZGVidWlsZCAkKE9USEVSX09QVElPTlMpICQoY2FsbCB4Y29kZS1vcHRpb25zLCAtLWNvbmZp Z3VyYXRpb24gUmVsZWFzZSkgfCAkKE9VVFBVVF9GSUxURVIpICYmIGV4aXQgJCR7UElQRVNUQVRV U1swXX0KKwkoIHhjb2RlYnVpbGQgJChPVEhFUl9PUFRJT05TKSAkKFhDT0RFX09QVElPTlMpIHwg JChPVVRQVVRfRklMVEVSKSAmJiBleGl0ICQke1BJUEVTVEFUVVNbMF19ICkKIAogY2xlYW46Ci0J eGNvZGVidWlsZCAkKE9USEVSX09QVElPTlMpIC1hbGx0YXJnZXRzIGNsZWFuICQoY2FsbCB4Y29k ZS1vcHRpb25zLCkgfCAkKE9VVFBVVF9GSUxURVIpICYmIGV4aXQgJCR7UElQRVNUQVRVU1swXX0K KwkoIHhjb2RlYnVpbGQgJChPVEhFUl9PUFRJT05TKSAtYWxsdGFyZ2V0cyBjbGVhbiAkKFhDT0RF X09QVElPTlMpIHwgJChPVVRQVVRfRklMVEVSKSAmJiBleGl0ICQke1BJUEVTVEFUVVNbMF19ICkK IAogZm9yY2U6IDsK