109052 2013-02-06 07:29:00 -0800 [Qt] Use GNU ar's thin archive format for intermediate static libs 2013-02-07 03:04:40 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 abecsi abecsi hausmann jturcotte ossy vestbo webkit.review.bot oldest_to_newest 826430 0 abecsi 2013-02-06 07:29:00 -0800 [Qt] Use GNU ar's thin archive format for intermediate static libs 826431 1 186851 abecsi 2013-02-06 07:30:11 -0800 Created attachment 186851 Patch 826438 2 186851 jturcotte 2013-02-06 07:42:16 -0800 Comment on attachment 186851 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186851&action=review > Tools/ChangeLog:16 > + Currently qmake does not support GNU ar's thin archive format so for What kind of support would we need from qmake? > Tools/qmake/mkspecs/features/default_post.prf:275 > + gnu_thin_archives { Why do we need the extra flag, can't we just scope it to *-g++* directly here and use it even in release? I'm wondering if it's possible to try supporting less different configurations in the build system. > Tools/qmake/mkspecs/features/functions.prf:28 > defineReplace(activeBuildConfig) { > - CONFIG(debug, debug|release): return(debug) > + # The paths to the elements of the thin archive are stored It feels like this doesn't fit with the name of the function, could you do it where activeBuildConfig is called? 826441 3 ossy 2013-02-06 07:45:32 -0800 Great patch, many thanks for it! ;) This patch decreased the size of the WebKitBuild directory from 15Gb to 9.3G. Not mentioning sparing IO operations after touching a simple file. (read objets write the archive, read the archive for linking the shared object) HDDs of the debug buildbots would be very happy. :) 826453 4 abecsi 2013-02-06 07:53:23 -0800 (In reply to comment #2) > (From update of attachment 186851 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=186851&action=review > > > Tools/ChangeLog:16 > > + Currently qmake does not support GNU ar's thin archive format so for > > What kind of support would we need from qmake? An extra configuration option (see: https://bugreports.qt-project.org/browse/QTBUG-27218). Especially because of the issues related to DESTDIR, where the library is created and then moved, which break the build with thin archives. > > > Tools/qmake/mkspecs/features/default_post.prf:275 > > + gnu_thin_archives { > > Why do we need the extra flag, can't we just scope it to *-g++* directly here and use it even in release? > I'm wondering if it's possible to try supporting less different configurations in the build system. That would be a possibility, but because of the relative paths to the objects in the archive this is just a "glorified workaround". I'm also hesitating to make it default for debug builds. > > > Tools/qmake/mkspecs/features/functions.prf:28 > > defineReplace(activeBuildConfig) { > > - CONFIG(debug, debug|release): return(debug) > > + # The paths to the elements of the thin archive are stored > > It feels like this doesn't fit with the name of the function, could you do it where activeBuildConfig is called? The problem is that activeBuildDir is called in a lot of places, and this would make the patch much bigger than needed, so I would rather leave this hack in there. 826498 5 186870 abecsi 2013-02-06 09:23:23 -0800 Created attachment 186870 Patch 826501 6 abecsi 2013-02-06 09:26:18 -0800 (In reply to comment #5) > Created an attachment (id=186870) [details] > Patch As discussed on IRC, this patch creates thin archives by default unless it is a debug_and_release build. 826512 7 186870 jturcotte 2013-02-06 09:43:45 -0800 Comment on attachment 186870 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186870&action=review > Tools/qmake/mkspecs/features/default_post.prf:280 > + debug_and_release: DESTDIR = $$targetSubDir()) The old isEmpty line would still work here since you added some logic inside targetSubDir that would return an empty string. Looks good to me otherwise, r=me if you revert that line (and if what I'm saying makes any sense). 827235 8 abecsi 2013-02-07 03:03:50 -0800 Committed r142088: <http://trac.webkit.org/changeset/142088> 827238 9 186870 abecsi 2013-02-07 03:04:40 -0800 Comment on attachment 186870 Patch Clearing flags from attachment. 186851 2013-02-06 07:30:11 -0800 2013-02-06 09:23:20 -0800 Patch bug-109052-20130206162655.patch text/plain 4550 abecsi U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxOTk4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzk0YzFjOWFiMzZkY2M2NmUxZjFhZjEyOTFlOWQ3MzM0 ZWY1NTIxYy4uNThkNTY1OWU2ZjRhMzA3NjAxZGYxNjA2ZmRkNDZmODI4Y2JiMzI3NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDEzLTAyLTA2ICBBbmRyYXMgQmVjc2kgIDxhbmRyYXMuYmVjc2lAZGlnaWEuY29tPgor CisgICAgICAgIFtRdF0gVXNlIEdOVSBhcidzIHRoaW4gYXJjaGl2ZSBmb3JtYXQgZm9yIGludGVy bWVkaWF0ZSBzdGF0aWMgbGlicworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTA5MDUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV2l0aCBkZWJ1ZyBidWlsZHMgd2UgZXhjZWVkIHRoZSA0R2lCIGxpbWl0IG9m IEdOVSBhciB3aGVuIGNyZWF0aW5nIHRoZSBXZWJDb3JlCisgICAgICAgIGludGVybWVkaWF0ZSBz dGF0aWMgbGlicmFyeSB3aGljaCByZXN1bHRzIGluIGJ1aWxkIGZhaWx1cmUgZXZlbiB3aXRoIGEg eDg2XzY0CisgICAgICAgIHRvb2xjaGFpbiAoaHR0cDovL3NvdXJjZXdhcmUub3JnL2J1Z3ppbGxh L3Nob3dfYnVnLmNnaT9pZD0xNDYyNSkuCisKKyAgICAgICAgV2hlbiB1c2luZyBhIEdOVSB0b29s Y2hhaW4gd2UgY2FuIHVzZSB0aGUgdGhpbiBhcmNoaXZlIGZvcm1hdCBmb3IgdGhlc2Ugc3RhdGlj CisgICAgICAgIGxpYnJhcmllcyB3aGljaCBhbHNvIGhhcyB0aGUgYmVuZWZpdCBvZiBub3QgY29w eWluZyB0aGUgb2JqZWN0IGZpbGVzLCB0aHVzCisgICAgICAgIGRyYXN0aWNhbGx5IHJlZHVjaW5n IGRpc2sgdXNhZ2UgYW5kIG92ZXJhbGwgY29tcGlsZSB0aW1lLgorCisgICAgICAgIEN1cnJlbnRs eSBxbWFrZSBkb2VzIG5vdCBzdXBwb3J0IEdOVSBhcidzIHRoaW4gYXJjaGl2ZSBmb3JtYXQgc28g Zm9yCisgICAgICAgIG5vdyB3ZSBuZWVkIHRvIGRvIHRoZSBtYWdpYyBpbiB0aGUgYnVpbGQgc3lz dGVtIGFzIGEgc3RvcGdhcCBzb2x1dGlvbgorICAgICAgICB0byBtYWtlIGRlYnVnIGJ1aWxkcyBw b3NzaWJsZSBhZ2Fpbi4KKworICAgICAgICAqIHFtYWtlL21rc3BlY3MvZmVhdHVyZXMvY29uZmln dXJlLnByZjoKKyAgICAgICAgKiBxbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2RlZmF1bHRfcG9zdC5w cmY6CisgICAgICAgICogcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9mdW5jdGlvbnMucHJmOgorCiAy MDEzLTAyLTA2ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAog ICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTQxOTkxLgpkaWZmIC0tZ2l0IGEvVG9v bHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9jb25maWd1cmUucHJmIGIvVG9vbHMvcW1ha2UvbWtz cGVjcy9mZWF0dXJlcy9jb25maWd1cmUucHJmCmluZGV4IDgxYjZmMGVhMTI2ZThiZjJlNGRiOTBi YzI0M2Y0M2U0ZTNmZjlhMGMuLmI4N2U4YTE5Y2E4NzMxNjJkZjIyNmI3ZGM0OWMwYWRkOTg1Mzc0 ZmEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL3FtYWtlL21rc3BlY3MvZmVhdHVyZXMvY29uZmlndXJlLnBy ZgorKysgYi9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2NvbmZpZ3VyZS5wcmYKQEAgLTIw Nyw2ICsyMDcsNyBAQCBkZWZpbmVUZXN0KGZpbmFsaXplQ29uZmlndXJlKSB7CiAgICAgICAgIGxv ZyhBbGwtaW4tb25lIGZpbGVzIC4uLi4uLi4uLi4uLi4uICQkY29uZmlnRW5hYmxlZCh1c2VfYWxs X2luX29uZV9maWxlcykkJEVPTCkKICAgICAgICAgbG9nKEdOVW1ha2UgLi4uLi4uLi4uLi4uLi4u Li4uLi4uLi4gJCRjb25maWdFbmFibGVkKEdOVW1ha2UpJCRFT0wpCiAgICAgICAgIGxvZyhTdGF0 aWMgbGlicyBhcyBzaGFyZWQgLi4uLi4uLi4uICQkY29uZmlnRW5hYmxlZChmb3JjZV9zdGF0aWNf bGlic19hc19zaGFyZWQpJCRFT0wpCisgICAgICAgIGxvZyhTdGF0aWMgbGlicyBhcyB0aGluIGFy Y2hpdmVzIC4uICQkY29uZmlnRW5hYmxlZChnbnVfdGhpbl9hcmNoaXZlcykkJEVPTCkKICAgICAg ICAgbG9nKFByb2R1Y3Rpb24gYnVpbGQgLi4uLi4uLi4uLi4uLi4gJCRjb25maWdFbmFibGVkKHBy b2R1Y3Rpb25fYnVpbGQpJCRFT0wpCiAgICAgICAgIGxvZygkJEVPTCkKIApkaWZmIC0tZ2l0IGEv VG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9kZWZhdWx0X3Bvc3QucHJmIGIvVG9vbHMvcW1h a2UvbWtzcGVjcy9mZWF0dXJlcy9kZWZhdWx0X3Bvc3QucHJmCmluZGV4IDU3YmZhYWRkNjM2NTEy YjIyNjY3MmUxY2FkMDkwMjBhNzY0ODdkZDMuLmE5OTZjNTRjYmM5ZWM5Y2IyNmI0ZWJkYmRmOGE0 ZGQ4OTIyYzE2MzQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL3FtYWtlL21rc3BlY3MvZmVhdHVyZXMvZGVm YXVsdF9wb3N0LnByZgorKysgYi9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2RlZmF1bHRf cG9zdC5wcmYKQEAgLTEzLDcgKzEzLDEwIEBAIENPTkZJRyArPSBjb25maWdfc3RlcAogIyBFbmFi bGUgZHluYW1pYyBpbnN0ZWFkIG9mIHN0YXRpYyBsaWJyYXJpZXMgZm9yIGRldmVsb3BtZW50CiAj IEF2b2lkIGl0IHdpdGggZGVidWdfYW5kX3JlbGVhc2UsIGl0IGNhbiBjYXVzZSB0aGUgYXBwbGlj YXRpb24gdG8gbG9hZCBib3RoIHRoZSBkZWJ1ZyBhbmQgcmVsZWFzZQogIyBkZXBlbmRlbnQgbGli cmFyaWVzIHdoZW4gdXNpbmcgZnJhbWV3b3JrcyBvbiBNYWMuCi0hcHJvZHVjdGlvbl9idWlsZDoh ZGVidWdfYW5kX3JlbGVhc2U6IWJ1aWxkYm90OiF3aW4qOiFidWlsZD8od2Via2l0Mik6IENPTkZJ RyArPSBmb3JjZV9zdGF0aWNfbGlic19hc19zaGFyZWQKKyFwcm9kdWN0aW9uX2J1aWxkOiFkZWJ1 Z19hbmRfcmVsZWFzZSB7CisgICAgIWJ1aWxkYm90OiF3aW4qOiFidWlsZD8od2Via2l0Mik6IENP TkZJRyArPSBmb3JjZV9zdGF0aWNfbGlic19hc19zaGFyZWQKKyAgICBkZWJ1ZzohZm9yY2Vfc3Rh dGljX2xpYnNfYXNfc2hhcmVkOiotZysrKjogQ09ORklHICs9IGdudV90aGluX2FyY2hpdmVzCit9 CiAKICMgRG9uJ3QgY3JlYXRlIC5wcmwgZmlsZXMgZm9yIGludGVybWVkaWF0ZSBsaWJyYXJpZXMg YmVjYXVzZSB0aGVpciBjb250ZW50cyBnZXQgdXNlZCB3aGVuIGxpbmtpbmcgYWdhaW5zdAogIyB0 aGVtLCBicmVha2luZyAiLVdsLC13aG9sZS1hcmNoaXZlIC1sTXlJbnRlcm1lZGlhdGVMaWIgLS1X bCwtbm8td2hvbGUtYXJjaGl2ZSIKQEAgLTI2OSw2ICsyNzIsMTMgQEAgY29udGFpbnMoVEVNUExB VEUsIGxpYikgewogICAgICMgc3lzdGVtIGFscmVhZHkgdGFrZXMgY2FyZSBvZiB0aGlzIGZvciB0 aGUgdG9wIGxldmVsIFF0V2ViS2l0IGxpYnJhcnkuCiAgICAgIXF0X2luc3RhbGxfbW9kdWxlOmRl YnVnX2FuZF9yZWxlYXNlOiBUQVJHRVQgPSAkJHF0TGlicmFyeVRhcmdldCgkJFRBUkdFVCkKIAor ICAgIGdudV90aGluX2FyY2hpdmVzIHsKKyAgICAgICAgIyBSZXBsYWNlIHRoZSBoYXJkY29kZWQg YXJjaGl2ZXIgY29tbWFuZCBsaW5lCisgICAgICAgICMgb3B0aW9ucyB0byB1c2UgR05VIGFyJ3Mg dGhpbiBhcmNoaXZlIGZvcm1hdC4KKyAgICAgICAgQVJfQ09NTUFORCA9ICQkc3BsaXQoUU1BS0Vf QVIsICIgIikKKyAgICAgICAgUU1BS0VfQVIgPSAkJG1lbWJlcihBUl9DT01NQU5ELCAwKSBjcnVU CisgICAgfQorCiAgICAgaXNFbXB0eShERVNURElSKTogREVTVERJUiA9ICQkYWN0aXZlQnVpbGRD b25maWcoKQogCiAgICAgREVGSU5FUyArPSBRVF9BU0NJSV9DQVNUX1dBUk5JTkdTCmRpZmYgLS1n aXQgYS9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2Z1bmN0aW9ucy5wcmYgYi9Ub29scy9x bWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2Z1bmN0aW9ucy5wcmYKaW5kZXggNGUzOTQwZjg3MDY3MDhi MzNmMGI5YmQ2YjEyOTA2N2E1MzAzNDIyNy4uZjE1ZWU3MjBhZDJjMzA4NmIzM2Q2ZGVkNTg3MWY3 ZTJkMDdkMjlmZCAxMDA2NDQKLS0tIGEvVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9mdW5j dGlvbnMucHJmCisrKyBiL1Rvb2xzL3FtYWtlL21rc3BlY3MvZmVhdHVyZXMvZnVuY3Rpb25zLnBy ZgpAQCAtMjUsNyArMjUsMTEgQEAgZGVmaW5lUmVwbGFjZSh0b0V2YWx1YXRhYmxlUGF0aCkgewog fQogCiBkZWZpbmVSZXBsYWNlKGFjdGl2ZUJ1aWxkQ29uZmlnKSB7Ci0gICAgQ09ORklHKGRlYnVn LCBkZWJ1Z3xyZWxlYXNlKTogcmV0dXJuKGRlYnVnKQorICAgICMgVGhlIHBhdGhzIHRvIHRoZSBl bGVtZW50cyBvZiB0aGUgdGhpbiBhcmNoaXZlIGFyZSBzdG9yZWQKKyAgICAjIHJlbGF0aXZlIHRv IHRoZSBhcmNoaXZlIGl0c2VsZiwgdGh1cyB3ZSBoYXZlIHRvIHByZXZlbnQKKyAgICAjIHFtYWtl IGZyb20gbW92aW5nIHRoZSBhcmNoaXZlIGFmdGVyIGNyZWF0aW9uLgorICAgIGdudV90aGluX2Fy Y2hpdmVzOiByZXR1cm4oKQorICAgIGVsc2U6IENPTkZJRyhkZWJ1ZywgZGVidWd8cmVsZWFzZSk6 IHJldHVybihkZWJ1ZykKICAgICBlbHNlOiByZXR1cm4ocmVsZWFzZSkKIH0KIAo= 186870 2013-02-06 09:23:23 -0800 2013-02-07 03:04:40 -0800 Patch bug-109052-20130206181757.patch text/plain 7272 abecsi U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxOTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 ZThjZjhlZTQ4OTFjOTI0MTc1ZTUwNGYwZTAwNjM5OTE0NzFiNTI0Li43MTY4ZDIyZGJiYTQ0ZDNj ZTA4MWU3NjdlNmNlZWRkZTA2MjM5YTg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxMy0wMi0wNiAgQW5kcmFzIEJlY3NpICA8YW5kcmFzLmJlY3NpQGRpZ2lh LmNvbT4KKworICAgICAgICBbUXRdIFVzZSBHTlUgYXIncyB0aGluIGFyY2hpdmUgZm9ybWF0IGZv ciBpbnRlcm1lZGlhdGUgc3RhdGljIGxpYnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEwOTA1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkanVzdCBwcm9qZWN0IGZpbGVzIHRoYXQgdXNlZCBhY3RpdmVC dWlsZENvbmZpZygpCisgICAgICAgIHRvIHVzZSB0YXJnZXRTdWJEaXIoKS4KKworICAgICAgICAq IEphdmFTY3JpcHRDb3JlLnByaToKKyAgICAgICAgKiBMTEludE9mZnNldHNFeHRyYWN0b3IucHJv OgorICAgICAgICAqIFRhcmdldC5wcmk6CisKIDIwMTMtMDItMDYgIE1pa2UgV2VzdCAgPG1rd3N0 QGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGQgYW4gRU5BQkxFX05PU05JRkYgZmVhdHVyZSBm bGFnLgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnBy aSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5wcmkKaW5kZXggNTJhODNj M2I1N2E2OTQwMThkYmUyYTQxMTEwODY5N2MxN2ZlMTYxYy4uYjYzNmU1ODdjZWU3YzE2YjBlMTkw YTJhYzk1NTIxMGVkMmQ4MjM3ZiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0ph dmFTY3JpcHRDb3JlLnByaQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENv cmUucHJpCkBAIC0zMyw3ICszMyw3IEBAIElOQ0xVREVQQVRIICs9IFwKICAgICAkJEpBVkFTQ1JJ UFRDT1JFX0dFTkVSQVRFRF9TT1VSQ0VTX0RJUgogCiAjIFBpY2sgdXAgdGhlIHJpZ2h0IHZlcnNp b24gb2YgTExJbnRBc3NlbWJseS5oCi1tYWN4OiBJTkNMVURFUEFUSCArPSAkJEpBVkFTQ1JJUFRD T1JFX0dFTkVSQVRFRF9TT1VSQ0VTX0RJUi8kJGFjdGl2ZUJ1aWxkQ29uZmlnKCkKK21hY3g6IElO Q0xVREVQQVRIICs9ICQkSkFWQVNDUklQVENPUkVfR0VORVJBVEVEX1NPVVJDRVNfRElSLyQkdGFy Z2V0U3ViRGlyKCkKIAogd2luMzItKjogTElCUyArPSAtbHdpbm1tCiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9MTEludE9mZnNldHNFeHRyYWN0b3IucHJvIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0xMSW50T2Zmc2V0c0V4dHJhY3Rvci5wcm8KaW5kZXggNTBjZGQ0NGVmNjQ0 MzczZTJhZDEwNTNmZjNmNjhiN2YwN2Q5ZGI1Yi4uYjY2NzNiNWFiOWQxYzI2YmUxOTJiNWI4YWY2 NDg3NTBmNGRjMDk4OSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0xMSW50T2Zm c2V0c0V4dHJhY3Rvci5wcm8KKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0xMSW50T2Zmc2V0 c0V4dHJhY3Rvci5wcm8KQEAgLTgsNyArOCw3IEBACiBURU1QTEFURSA9IGFwcAogVEFSR0VUID0g TExJbnRPZmZzZXRzRXh0cmFjdG9yCiAKLW1hY3g6IERFU1RESVIgPSAkJGFjdGl2ZUJ1aWxkQ29u ZmlnKCkKK21hY3g6IERFU1RESVIgPSAkJHRhcmdldFN1YkRpcigpCiAKIGRlYnVnX2FuZF9yZWxl YXNlIHsKICAgICBDT05GSUcgKz0gZm9yY2VfYnVpbGRfYWxsCmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvVGFyZ2V0LnByaSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9UYXJnZXQu cHJpCmluZGV4IDhjMWQwN2U2NTcwMzk1MTM5MmYyNzlhMDNjZDc4YjUzZTNjM2FjMzMuLjdiZjQ5 MDZlZWM2Yjg1OWI1Njk3ZWE1OWQ3NGZlYTRhOTc4YWQzZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9UYXJnZXQucHJpCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9UYXJn ZXQucHJpCkBAIC0zMCw3ICszMCw3IEBAIGluY2x1ZGUoeWFyci95YXJyLnByaSkKIAogSU5TVEFM TERFUFMgKz0gYWxsCiAKLWRlYnVnX2FuZF9yZWxlYXNlOiBJTkNMVURFUEFUSCArPSAkJEpBVkFT Q1JJUFRDT1JFX0dFTkVSQVRFRF9TT1VSQ0VTX0RJUi8kJGFjdGl2ZUJ1aWxkQ29uZmlnKCkKK2Rl YnVnX2FuZF9yZWxlYXNlOiBJTkNMVURFUEFUSCArPSAkJEpBVkFTQ1JJUFRDT1JFX0dFTkVSQVRF RF9TT1VSQ0VTX0RJUi8kJHRhcmdldFN1YkRpcigpCiAKIFNPVVJDRVMgKz0gXAogICAgIEFQSS9K U0Jhc2UuY3BwIFwKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxv ZwppbmRleCBmOTMxZjZjMzk5NjU2NjdjYWEwMTI5MTRkM2Q2NTdhOTc2OTIyYzhjLi4zZTMwZjY0 OTVjN2U2NGY1MWE2MjM0ZTI5Y2NmYTJkZjEzZjY5NGVjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFu Z2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTMtMDItMDYg IEFuZHJhcyBCZWNzaSAgPGFuZHJhcy5iZWNzaUBkaWdpYS5jb20+CisKKyAgICAgICAgW1F0XSBV c2UgR05VIGFyJ3MgdGhpbiBhcmNoaXZlIGZvcm1hdCBmb3IgaW50ZXJtZWRpYXRlIHN0YXRpYyBs aWJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDkw NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaXRo IGRlYnVnIGJ1aWxkcyB3ZSBleGNlZWQgdGhlIDRHaUIgbGltaXQgb2YgR05VIGFyIHdoZW4gY3Jl YXRpbmcgdGhlIFdlYkNvcmUKKyAgICAgICAgaW50ZXJtZWRpYXRlIHN0YXRpYyBsaWJyYXJ5IHdo aWNoIHJlc3VsdHMgaW4gYnVpbGQgZmFpbHVyZSBldmVuIHdpdGggYSB4ODZfNjQKKyAgICAgICAg dG9vbGNoYWluIChodHRwOi8vc291cmNld2FyZS5vcmcvYnVnemlsbGEvc2hvd19idWcuY2dpP2lk PTE0NjI1KS4KKworICAgICAgICBXaGVuIHVzaW5nIGEgR05VIHRvb2xjaGFpbiB3ZSBjYW4gdXNl IHRoZSB0aGluIGFyY2hpdmUgZm9ybWF0IGZvciB0aGVzZSBzdGF0aWMKKyAgICAgICAgbGlicmFy aWVzIHdoaWNoIGFsc28gaGFzIHRoZSBiZW5lZml0IG9mIG5vdCBjb3B5aW5nIHRoZSBvYmplY3Qg ZmlsZXMsIHRodXMKKyAgICAgICAgZHJhc3RpY2FsbHkgcmVkdWNpbmcgZGlzayB1c2FnZSBhbmQg b3ZlcmFsbCBjb21waWxlIHRpbWUuCisKKyAgICAgICAgQ3VycmVudGx5IHFtYWtlIGRvZXMgbm90 IHN1cHBvcnQgR05VIGFyJ3MgdGhpbiBhcmNoaXZlIGZvcm1hdCBzbyBmb3IKKyAgICAgICAgbm93 IHdlIG5lZWQgdG8gZG8gdGhlIG1hZ2ljIGluIHRoZSBidWlsZCBzeXN0ZW0gYXMgYSBzdG9wZ2Fw IHNvbHV0aW9uLgorCisgICAgICAgICogcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9jb25maWd1cmUu cHJmOgorICAgICAgICAqIHFtYWtlL21rc3BlY3MvZmVhdHVyZXMvZGVmYXVsdF9wb3N0LnByZjoK KyAgICAgICAgKiBxbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2Z1bmN0aW9ucy5wcmY6CisKIDIwMTMt MDItMDYgIE1pa2UgV2VzdCAgPG1rd3N0QGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGQgYW4g RU5BQkxFX05PU05JRkYgZmVhdHVyZSBmbGFnLgpkaWZmIC0tZ2l0IGEvVG9vbHMvcW1ha2UvbWtz cGVjcy9mZWF0dXJlcy9jb25maWd1cmUucHJmIGIvVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJl cy9jb25maWd1cmUucHJmCmluZGV4IDgxYjZmMGVhMTI2ZThiZjJlNGRiOTBiYzI0M2Y0M2U0ZTNm ZjlhMGMuLmI4N2U4YTE5Y2E4NzMxNjJkZjIyNmI3ZGM0OWMwYWRkOTg1Mzc0ZmEgMTAwNjQ0Ci0t LSBhL1Rvb2xzL3FtYWtlL21rc3BlY3MvZmVhdHVyZXMvY29uZmlndXJlLnByZgorKysgYi9Ub29s cy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2NvbmZpZ3VyZS5wcmYKQEAgLTIwNyw2ICsyMDcsNyBA QCBkZWZpbmVUZXN0KGZpbmFsaXplQ29uZmlndXJlKSB7CiAgICAgICAgIGxvZyhBbGwtaW4tb25l IGZpbGVzIC4uLi4uLi4uLi4uLi4uICQkY29uZmlnRW5hYmxlZCh1c2VfYWxsX2luX29uZV9maWxl cykkJEVPTCkKICAgICAgICAgbG9nKEdOVW1ha2UgLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4gJCRj b25maWdFbmFibGVkKEdOVW1ha2UpJCRFT0wpCiAgICAgICAgIGxvZyhTdGF0aWMgbGlicyBhcyBz aGFyZWQgLi4uLi4uLi4uICQkY29uZmlnRW5hYmxlZChmb3JjZV9zdGF0aWNfbGlic19hc19zaGFy ZWQpJCRFT0wpCisgICAgICAgIGxvZyhTdGF0aWMgbGlicyBhcyB0aGluIGFyY2hpdmVzIC4uICQk Y29uZmlnRW5hYmxlZChnbnVfdGhpbl9hcmNoaXZlcykkJEVPTCkKICAgICAgICAgbG9nKFByb2R1 Y3Rpb24gYnVpbGQgLi4uLi4uLi4uLi4uLi4gJCRjb25maWdFbmFibGVkKHByb2R1Y3Rpb25fYnVp bGQpJCRFT0wpCiAgICAgICAgIGxvZygkJEVPTCkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvcW1ha2Uv bWtzcGVjcy9mZWF0dXJlcy9kZWZhdWx0X3Bvc3QucHJmIGIvVG9vbHMvcW1ha2UvbWtzcGVjcy9m ZWF0dXJlcy9kZWZhdWx0X3Bvc3QucHJmCmluZGV4IDU3YmZhYWRkNjM2NTEyYjIyNjY3MmUxY2Fk MDkwMjBhNzY0ODdkZDMuLjFhNDg2MzcxZWE0YTVmNWYyYmY4Mjc0OGU5ZDAzZmU2YWZjOWM5NmIg MTAwNjQ0Ci0tLSBhL1Rvb2xzL3FtYWtlL21rc3BlY3MvZmVhdHVyZXMvZGVmYXVsdF9wb3N0LnBy ZgorKysgYi9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2RlZmF1bHRfcG9zdC5wcmYKQEAg LTE0LDYgKzE0LDcgQEAgQ09ORklHICs9IGNvbmZpZ19zdGVwCiAjIEF2b2lkIGl0IHdpdGggZGVi dWdfYW5kX3JlbGVhc2UsIGl0IGNhbiBjYXVzZSB0aGUgYXBwbGljYXRpb24gdG8gbG9hZCBib3Ro IHRoZSBkZWJ1ZyBhbmQgcmVsZWFzZQogIyBkZXBlbmRlbnQgbGlicmFyaWVzIHdoZW4gdXNpbmcg ZnJhbWV3b3JrcyBvbiBNYWMuCiAhcHJvZHVjdGlvbl9idWlsZDohZGVidWdfYW5kX3JlbGVhc2U6 IWJ1aWxkYm90OiF3aW4qOiFidWlsZD8od2Via2l0Mik6IENPTkZJRyArPSBmb3JjZV9zdGF0aWNf bGlic19hc19zaGFyZWQKKyFkZWJ1Z19hbmRfcmVsZWFzZToqLWcrKyo6IENPTkZJRyArPSBnbnVf dGhpbl9hcmNoaXZlcwogCiAjIERvbid0IGNyZWF0ZSAucHJsIGZpbGVzIGZvciBpbnRlcm1lZGlh dGUgbGlicmFyaWVzIGJlY2F1c2UgdGhlaXIgY29udGVudHMgZ2V0IHVzZWQgd2hlbiBsaW5raW5n IGFnYWluc3QKICMgdGhlbSwgYnJlYWtpbmcgIi1XbCwtd2hvbGUtYXJjaGl2ZSAtbE15SW50ZXJt ZWRpYXRlTGliIC0tV2wsLW5vLXdob2xlLWFyY2hpdmUiCkBAIC0yNjksNyArMjcwLDE0IEBAIGNv bnRhaW5zKFRFTVBMQVRFLCBsaWIpIHsKICAgICAjIHN5c3RlbSBhbHJlYWR5IHRha2VzIGNhcmUg b2YgdGhpcyBmb3IgdGhlIHRvcCBsZXZlbCBRdFdlYktpdCBsaWJyYXJ5LgogICAgICFxdF9pbnN0 YWxsX21vZHVsZTpkZWJ1Z19hbmRfcmVsZWFzZTogVEFSR0VUID0gJCRxdExpYnJhcnlUYXJnZXQo JCRUQVJHRVQpCiAKLSAgICBpc0VtcHR5KERFU1RESVIpOiBERVNURElSID0gJCRhY3RpdmVCdWls ZENvbmZpZygpCisgICAgZ251X3RoaW5fYXJjaGl2ZXMgeworICAgICAgICAjIFJlcGxhY2UgdGhl IGhhcmRjb2RlZCBhcmNoaXZlciBjb21tYW5kIGxpbmUKKyAgICAgICAgIyBvcHRpb25zIHRvIHVz ZSBHTlUgYXIncyB0aGluIGFyY2hpdmUgZm9ybWF0LgorICAgICAgICBBUl9DT01NQU5EID0gJCRz cGxpdChRTUFLRV9BUiwgIiAiKQorICAgICAgICBRTUFLRV9BUiA9ICQkbWVtYmVyKEFSX0NPTU1B TkQsIDApIGNydVQKKyAgICB9CisKKyAgICBkZWJ1Z19hbmRfcmVsZWFzZTogREVTVERJUiA9ICQk dGFyZ2V0U3ViRGlyKCkpCiAKICAgICBERUZJTkVTICs9IFFUX0FTQ0lJX0NBU1RfV0FSTklOR1MK IApkaWZmIC0tZ2l0IGEvVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9mdW5jdGlvbnMucHJm IGIvVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9mdW5jdGlvbnMucHJmCmluZGV4IDRlMzk0 MGY4NzA2NzA4YjMzZjBiOWJkNmIxMjkwNjdhNTMwMzQyMjcuLmE4YjIzYWM0MjEwZmYzMTc1MjQ0 YTZhZWE3NTlhYTVlMGU4NDYxOGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL3FtYWtlL21rc3BlY3MvZmVh dHVyZXMvZnVuY3Rpb25zLnByZgorKysgYi9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2Z1 bmN0aW9ucy5wcmYKQEAgLTI0LDggKzI0LDEyIEBAIGRlZmluZVJlcGxhY2UodG9FdmFsdWF0YWJs ZVBhdGgpIHsKICAgICByZXR1cm4oJCRyZXBsYWNlKDEsIFxcXFwsIFxcXFxcXFxcKSkKIH0KIAot ZGVmaW5lUmVwbGFjZShhY3RpdmVCdWlsZENvbmZpZykgewotICAgIENPTkZJRyhkZWJ1ZywgZGVi dWd8cmVsZWFzZSk6IHJldHVybihkZWJ1ZykKK2RlZmluZVJlcGxhY2UodGFyZ2V0U3ViRGlyKSB7 CisgICAgIyBUaGUgcGF0aHMgdG8gdGhlIGVsZW1lbnRzIG9mIHRoZSB0aGluIGFyY2hpdmUgYXJl IHN0b3JlZAorICAgICMgcmVsYXRpdmUgdG8gdGhlIGFyY2hpdmUgaXRzZWxmLCB0aHVzIHdlIGhh dmUgdG8gcHJldmVudAorICAgICMgcW1ha2UgZnJvbSBtb3ZpbmcgdGhlIGFyY2hpdmUgYWZ0ZXIg Y3JlYXRpb24uCisgICAgZ251X3RoaW5fYXJjaGl2ZXM6IHJldHVybigpCisgICAgZWxzZTogQ09O RklHKGRlYnVnLCBkZWJ1Z3xyZWxlYXNlKTogcmV0dXJuKGRlYnVnKQogICAgIGVsc2U6IHJldHVy bihyZWxlYXNlKQogfQogCkBAIC0yNDUsNyArMjQ5LDcgQEAgZGVmaW5lVGVzdChsaW5rQWdhaW5z dExpYnJhcnkpIHsKIAogICAgIHRhcmdldCA9ICQkcmVzb2x2ZUZpbmFsTGlicmFyeU5hbWUoJCR0 YXJnZXQpCiAKLSAgICBwYXRoID0gJCRyZXBsYWNlKHNvdXJjZV9kaXIsICQkcmVfZXNjYXBlKCQk e1JPT1RfV0VCS0lUX0RJUn0pLCAkJHtST09UX0JVSUxEX0RJUn0pLyQkYWN0aXZlQnVpbGRDb25m aWcoKQorICAgIHBhdGggPSAkJHJlcGxhY2Uoc291cmNlX2RpciwgJCRyZV9lc2NhcGUoJCR7Uk9P VF9XRUJLSVRfRElSfSksICQke1JPT1RfQlVJTERfRElSfSkvJCR0YXJnZXRTdWJEaXIoKQogCiAg ICAgZm9yY2Vfc3RhdGljX2xpYnNfYXNfc2hhcmVkIHsKICAgICAgICAgICAgIExJQlMgKz0gLUwk JHtST09UX0JVSUxEX0RJUn0vbGliIC1sJCR0YXJnZXQK