47414 2010-10-08 06:43:32 -0700 [Qt] Get the symbian/linux-armcc compile working properly 2010-12-14 15:18:21 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC S60 3rd edition RESOLVED WONTFIX Qt, QtTriaged P3 Normal --- 1 kamaji webkit-qt-unassigned commit-queue eric hausmann kling kristian.amlie ossy s.mathur t.zander oldest_to_newest 291613 0 kamaji 2010-10-08 06:43:32 -0700 Currently, the symbian/linux-armcc compile is not working properly. Some changes in Qt's symbian/linux-armcc mkspec and webkit Qt project changes are needed in the 'symbian' sections to correct this functionality. 1.) $$QMAKE_MOC is not defined. This is fixed by updates in the qt 4.7 mkspec, however that has not been checked in. The required changes have not been checked into the Qt 4.7 branch yet. I'll attach a patch with the required changes. 2.) Symbian configurations were not taking into account that deployment will be to OUTPUT_DIR. 3.) "TARGET.EPOCSTACKSIZE = 0x14000 // 80 kB" in WebKit.pri symbian configuration section is using the wrong kind of comments. Should be using qmake '#' comments. Similarly, "EPOCHEAPSIZE 0x40000 0x2000000 // Min 256kB, Max 32MB" needed to be changed for the same reason. 4.) "linux-* {" section dealing with shared library rpaths is incorrect -- symbian/linux-armcc doesn't understand them, and was mistakenly selected based on the 'linux-' in it's name. 5.) DumpRenderTree is pulling in fontconfig on symbian/linux-armcc even though it doesn't exist. I'll have a patch to add to this shortly that addresses these problems. 291626 1 70245 kamaji 2010-10-08 07:03:32 -0700 Created attachment 70245 Qt 4.7 symbian/linux-armcc mkspec fix This attachment patches Qt 4.7 with updates to the symbian/linux-armcc mkspec to properly handle expansion of QMAKE_MOC QMAKE_UIC and QMAKE_IDC 291645 2 70249 kamaji 2010-10-08 07:29:18 -0700 Created attachment 70249 Patch 292597 3 kamaji 2010-10-11 12:01:54 -0700 FYI qmake does not need to be rebuilt after applying the patch from comment 1, as it is just changes to the symbian/linux-armcc mkspec, so just apply and then continue on to apply and build with the webkit patch I have provided. 295443 4 kristian.amlie 2010-10-18 04:52:09 -0700 With my limited knowledge of the WebKit build structure I can't do final review, but the changes to file locations look good. For the TARGET.EPOCHEAPSIZE, note that anything added to MMP_RULES has no effect on the symbian/linux-armcc mkspec. Therefore the change you make to comments there is unnecessary. Although I don't see why they do, if they want to define it differently like that, you'll need a separate scope, like this: symbian-abld|symbian-sbsv2 { TARGET.EPOCHEAPSIZE = heapSizeRule = \ "$${LITERAL_HASH}ifdef WINSCW" \ "EPOCHEAPSIZE 0x40000 0x2000000" \ "$${LITERAL_HASH}else" \ "EPOCHEAPSIZE 0x40000 0x6000000" \ "$${LITERAL_HASH}endif" MMP_RULES += heapSizeRule } else { TARGET.EPOCHEAPSIZE = 0x40000 0x2000000 } Also, all the changes that change linux-* into linux-*:!symbian should be regarded as temporary, since the final mkspec will not have that problem. I'm not sure what the WebKit policy is for temporary patches like that, but it would be nice to get it accepted, since it helps a lot in the intermediate stage we're in. 320790 5 70249 eric 2010-12-12 02:44:40 -0800 Comment on attachment 70249 Patch rs=me. 320800 6 70249 commit-queue 2010-12-12 02:59:56 -0800 Comment on attachment 70249 Patch Rejecting attachment 70249 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=eseidel-cq-sl', 'apply-attachment', '--non-interactive', 70249]" exit_code: 2 Last 500 characters of output: rocess.pro patching file WebKitTools/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro patching file WebKitTools/MiniBrowser/qt/MiniBrowser.pro patching file WebKitTools/QtTestBrowser/QtTestBrowser.pro patching file WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro Hunk #1 succeeded at 54 (offset 4 lines). Failed to run "[u'/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Eric Seidel', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/7038005 321852 7 kristian.amlie 2010-12-14 02:51:49 -0800 This issue is a bit old, and the linux-armcc name is going away anyway. I think it can be safely closed. I'll open a new one if necessary. 70245 2010-10-08 07:03:32 -0700 2010-10-08 07:37:04 -0700 Qt 4.7 symbian/linux-armcc mkspec fix symbian-linux-armcc-mkspecfix.patch text/plain 1772 kamaji ZGlmZiAtLWdpdCBhL21rc3BlY3MvY29tbW9uL3N5bWJpYW4vc3ltYmlhbi1tbXAuY29uZiBiL21r c3BlY3MvY29tbW9uL3N5bWJpYW4vc3ltYmlhbi1tbXAuY29uZgppbmRleCA1MjkyNzgxLi4xZmJk MzAyIDEwMDY0NAotLS0gYS9ta3NwZWNzL2NvbW1vbi9zeW1iaWFuL3N5bWJpYW4tbW1wLmNvbmYK KysrIGIvbWtzcGVjcy9jb21tb24vc3ltYmlhbi9zeW1iaWFuLW1tcC5jb25mCkBAIC00LDE2ICs0 LDYgQEAKIAogaW5jbHVkZShzeW1iaWFuLmNvbmYpCiAKLWNvbnRhaW5zKFFNQUtFX0hPU1Qub3Ms ICJXaW5kb3dzIikgewotICAgIFFNQUtFX01PQyAgICAgICA9ICQkW1FUX0lOU1RBTExfQklOU10k JHtESVJfU0VQQVJBVE9SfW1vYy5leGUKLSAgICBRTUFLRV9VSUMgICAgICAgPSAkJFtRVF9JTlNU QUxMX0JJTlNdJCR7RElSX1NFUEFSQVRPUn11aWMuZXhlCi0gICAgUU1BS0VfSURDICAgICAgID0g JCRbUVRfSU5TVEFMTF9CSU5TXSQke0RJUl9TRVBBUkFUT1J9aWRjLmV4ZQotfSBlbHNlIHsKLSAg ICBRTUFLRV9NT0MgICAgICAgPSAkJFtRVF9JTlNUQUxMX0JJTlNdJCR7RElSX1NFUEFSQVRPUn1t b2MKLSAgICBRTUFLRV9VSUMgICAgICAgPSAkJFtRVF9JTlNUQUxMX0JJTlNdJCR7RElSX1NFUEFS QVRPUn11aWMKLSAgICBRTUFLRV9JREMgICAgICAgPSAkJFtRVF9JTlNUQUxMX0JJTlNdJCR7RElS X1NFUEFSQVRPUn1pZGMKLX0KLQogbG9hZChzeW1iaWFuL2FkZF9tbXBfcnVsZXMpCiAKIHN5bWJp YW4tYWJsZCB7CmRpZmYgLS1naXQgYS9ta3NwZWNzL2NvbW1vbi9zeW1iaWFuL3N5bWJpYW4uY29u ZiBiL21rc3BlY3MvY29tbW9uL3N5bWJpYW4vc3ltYmlhbi5jb25mCmluZGV4IGNjNWI3ODguLmQy OThhODcgMTAwNjQ0Ci0tLSBhL21rc3BlY3MvY29tbW9uL3N5bWJpYW4vc3ltYmlhbi5jb25mCisr KyBiL21rc3BlY3MvY29tbW9uL3N5bWJpYW4vc3ltYmlhbi5jb25mCkBAIC05NSw2ICs5NSwxMCBA QCBjb250YWlucyhRTUFLRV9IT1NULm9zLFdpbmRvd3MpIHsKICAgICBRTUFLRV9ERUxfRElSICAg ICAgICA9IHJtZGlyCiAgICAgUU1BS0VfREVMX1RSRUUgICAgICAgPSBybWRpciAvcyAvcQogICAg IFFNQUtFX0NIS19ESVJfRVhJU1RTID0gaWYgbm90IGV4aXN0CisKKyAgICBRTUFLRV9NT0MgICAg ICAgICAgICA9ICQkW1FUX0lOU1RBTExfQklOU10vbW9jLmV4ZQorICAgIFFNQUtFX1VJQyAgICAg ICAgICAgID0gJCRbUVRfSU5TVEFMTF9CSU5TXS91aWMuZXhlCisgICAgUU1BS0VfSURDICAgICAg ICAgICAgPSAkJFtRVF9JTlNUQUxMX0JJTlNdL2lkYy5leGUKIH0gZWxzZSB7CiAgICAgUU1BS0Vf Q09QWSAgICAgICAgICAgPSBjcAogICAgIFFNQUtFX0NPUFlfRElSICAgICAgID0gY3AgLXIKQEAg LTEwNCw3ICsxMDgsMTIgQEAgY29udGFpbnMoUU1BS0VfSE9TVC5vcyxXaW5kb3dzKSB7CiAgICAg UU1BS0VfREVMX0RJUiAgICAgICAgPSBybWRpcgogICAgIFFNQUtFX0RFTF9UUkVFICAgICAgID0g cm0gLXJmCiAgICAgUU1BS0VfQ0hLX0RJUl9FWElTVFMgPSB0ZXN0IC1kCisKKyAgICBRTUFLRV9N T0MgICAgICAgICAgICA9ICQkW1FUX0lOU1RBTExfQklOU10vbW9jCisgICAgUU1BS0VfVUlDICAg ICAgICAgICAgPSAkJFtRVF9JTlNUQUxMX0JJTlNdL3VpYworICAgIFFNQUtFX0lEQyAgICAgICAg ICAgID0gJCRbUVRfSU5TVEFMTF9CSU5TXS9pZGMKIH0KK21lc3NhZ2UoJCRbRElSX1NFUEFSQVRP Ul0gJCRRTUFLRV9NT0MpCiAKIFFNQUtFX0lETAkJICA9IG1pZGwKIFFNQUtFX0xJQgkJICA9IGFy IC1ydQo= 70249 2010-10-08 07:29:18 -0700 2010-12-12 02:59:56 -0800 Patch bug-47414-20101008162955.patch text/plain 12641 kamaji ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA0OTIxZDZjZTAzOWQxOTAy OTI3NTNjN2RiODY5ZjdlZjFlODAzYmY5Li43OTlkNzk1OTRlY2U5OGFjMzIzOWFiMzdkZDk2MDIx NjIxMzA3NGMwIDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTYgQEAKKzIwMTAtMTAtMDggIEtlaXRoIEt5eml2YXQgIDxrZWl0aC5reXppdmF0QG5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb UXRdIEdldCB0aGUgc3ltYmlhbi9saW51eC1hcm1jYyBjb21waWxlIHdvcmtpbmcgcHJvcGVybHkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3NDE0CisK KyAgICAgICAgQ2hhbmdlIEMrKyBzdHlsZSBjb21tZW50cyBpbiBzeW1iaWFuIFRBUkdFVC5FUE9D U1RBQ0tTSVpFIGFuZAorICAgICAgICBUQVJHRVQuRVBPQ0hFQVBTSVpFIHRvIHFtYWtlIGhhc2gg Y29tbWVudHMgc28gdGhhdCB0aGUgbGlua2VyIGlzCisgICAgICAgIGhhcHB5LgorCisgICAgICAg ICogV2ViS2l0LnByaToKKwogMjAxMC0xMC0wNyAgQmFsYXpzIEtlbGVtZW4gIDxrYmFsYXpzQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5z ZW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IDAxYzBlMDJhNTFkYmNiYjFhNGExNWI1MDU2OWY1YzA1N2VkYzI2ZDIuLjI0NmE1OWQ4Yzdl ZTMxNzIwNDZjNTcwODQxYzkxYTkzOWI2MmNhZmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMTAtMDgg IEtlaXRoIEt5eml2YXQgIDxrZWl0aC5reXppdmF0QG5va2lhLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEdldCB0aGUgc3ltYmlhbi9s aW51eC1hcm1jYyBjb21waWxlIHdvcmtpbmcgcHJvcGVybHkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3NDE0CisKKyAgICAgICAgTm8gdGVzdHMgbmVl ZGVkIC0gYnVpbGQgY29uZmlndXJhdGlvbiBpc3N1ZS4KKyAgICAgICAgU3ltYmlhbiBjb25maWd1 cmF0aW9ucyB3ZXJlIG5vdCB0YWtpbmcgaW50byBhY2NvdW50IHRoYXQgZGVwbG95bWVudAorICAg ICAgICB3aWxsIGJlIHRvIE9VVFBVVF9ESVIuCisKKyAgICAgICAgKiBXZWJDb3JlLnBybzoKKwog MjAxMC0xMC0wNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgWGFuIExvcGV6LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9XZWJD b3JlLnBybyBiL1dlYkNvcmUvV2ViQ29yZS5wcm8KaW5kZXggNDA5MjFlNDk4YzdkN2M3OGRjNjI0 YmI4MDM5MmU2MTljYTUyNDIxOS4uNjZlMGNkNzMyNzQ4NzUwYTBhYTNkZDRhMTI0ZDRiNjczM2U1 MWUyOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9XZWJDb3JlLnBybworKysgYi9XZWJDb3JlL1dlYkNv cmUucHJvCkBAIC0xNyw2ICsxNyw0MyBAQCB2ODpleGlzdHMoJCRbUVRfSU5TVEFMTF9QUkVGSVhd L3NyYy8zcmRwYXJ0eS92OC9pbmNsdWRlL3Y4LmgpIHsKICAgICBERUZJTkVTICs9IFVTSU5HX1Y4 X1NIQVJFRAogfQogCisKK2lzRW1wdHkoT1VUUFVUX0RJUik6IE9VVFBVVF9ESVIgPSAuLgoraW5j bHVkZSgkJFBXRC8uLi9XZWJLaXQucHJpKQorCitURU1QTEFURSA9IGxpYgorVEFSR0VUID0gUXRX ZWJLaXQKKworY29udGFpbnMoUVRfQ09ORklHLCBlbWJlZGRlZCk6Q09ORklHICs9IGVtYmVkZGVk CisKK0NPTkZJRyhzdGFuZGFsb25lX3BhY2thZ2UpIHsKKyAgICBpc0VtcHR5KFdDX0dFTkVSQVRF RF9TT1VSQ0VTX0RJUik6V0NfR0VORVJBVEVEX1NPVVJDRVNfRElSID0gJCRQV0QvZ2VuZXJhdGVk CisgICAgaXNFbXB0eShKU0NfR0VORVJBVEVEX1NPVVJDRVNfRElSKTpKU0NfR0VORVJBVEVEX1NP VVJDRVNfRElSID0gJCRQV0QvLi4vSmF2YVNjcmlwdENvcmUvZ2VuZXJhdGVkCisKKyAgICBQUkVD T01QSUxFRF9IRUFERVIgPSAkJFBXRC8uLi9XZWJLaXQvcXQvV2ViS2l0X3BjaC5oCit9IGVsc2Ug eworICAgIGlzRW1wdHkoV0NfR0VORVJBVEVEX1NPVVJDRVNfRElSKTpXQ19HRU5FUkFURURfU09V UkNFU19ESVIgPSBnZW5lcmF0ZWQKKyAgICBpc0VtcHR5KEpTQ19HRU5FUkFURURfU09VUkNFU19E SVIpOkpTQ19HRU5FUkFURURfU09VUkNFU19ESVIgPSAuLi9KYXZhU2NyaXB0Q29yZS9nZW5lcmF0 ZWQKKworICAgICFDT05GSUcocmVsZWFzZSwgZGVidWd8cmVsZWFzZSkgeworICAgICAgICBPQkpF Q1RTX0RJUiA9IG9iai9kZWJ1ZworICAgIH0gZWxzZSB7ICMgUmVsZWFzZQorICAgICAgICBPQkpF Q1RTX0RJUiA9IG9iai9yZWxlYXNlCisgICAgfQorCit9CisKK0NPTkZJRyhRVERJUl9idWlsZCkg eworICAgIGluY2x1ZGUoJCRRVF9TT1VSQ0VfVFJFRS9zcmMvcWJhc2UucHJpKQorfSBlbHNlIHsK KyAgICBERVNURElSID0gJCRPVVRQVVRfRElSL2xpYgorICAgICFzdGF0aWM6IERFRklORVMgKz0g UVRfTUFLRURMTAorICAgIHN5bWJpYW46IFRBUkdFVCA9JCRUQVJHRVQkJHtRVF9MSUJJTkZJWH0K K30KK21vZHVsZUZpbGU9JCRQV0QvLi4vV2ViS2l0L3F0L3F0X3dlYmtpdF92ZXJzaW9uLnByaQor aXNFbXB0eShRVF9CVUlMRF9UUkVFKTppbmNsdWRlKCQkbW9kdWxlRmlsZSkKK1ZFUlNJT04gPSAk JHtRVF9XRUJLSVRfTUFKT1JfVkVSU0lPTn0uJCR7UVRfV0VCS0lUX01JTk9SX1ZFUlNJT059LiQk e1FUX1dFQktJVF9QQVRDSF9WRVJTSU9OfQorCiBzeW1iaWFuOiB7CiAgICAgVEFSR0VULkVQT0NB TExPV0RMTERBVEE9MQogICAgICMgRFJNIGFuZCBBbGxmaWxlcyBjYXBhYmlsaXRlcyBuZWVkIHRv IGJlIGF1ZGl0ZWQgdG8gYmUgc2lnbmVkIG9uIFN5bWJpYW4KQEAgLTMzLDcgKzcwLDcgQEAgc3lt YmlhbjogewogICAgIH0gZWxzZSB7CiAgICAgICAgIFRBUkdFVC5VSUQzID0gMHhFMDAyNjdDMgog ICAgIH0KLSAgICB3ZWJraXRsaWJzLnNvdXJjZXMgPSBRdFdlYktpdCQke1FUX0xJQklORklYfS5k bGwKKyAgICB3ZWJraXRsaWJzLnNvdXJjZXMgPSAkJERFU1RESVIvUXRXZWJLaXQkJHtRVF9MSUJJ TkZJWH0uZGxsCiAgICAgdjggewogICAgICAgICB3ZWJraXRsaWJzLnNvdXJjZXMgKz0gdjguZGxs CiAgICAgICAgIFFNQUtFX0NYWEZMQUdTLkFSTUNDICs9IC1PVGltZSAtTzMKQEAgLTQxLDcgKzc4 LDcgQEAgc3ltYmlhbjogewogICAgICAgICBMSUJTICs9IC1sbGlicHRocmVhZAogICAgIH0KIAot ICAgIENPTkZJRyhRVERJUl9idWlsZCk6IHdlYmtpdGxpYnMuc291cmNlcyA9ICQkUU1BS0VfTElC RElSX1FULyQkd2Via2l0bGlicy5zb3VyY2VzCisgICAgQ09ORklHKFFURElSX2J1aWxkKTogd2Vi a2l0bGlicy5zb3VyY2VzID0gJCRRTUFLRV9MSUJESVJfUVQvUXRXZWJLaXQkJHtRVF9MSUJJTkZJ WH0uZGxsCiAgICAgd2Via2l0bGlicy5wYXRoID0gL3N5cy9iaW4KICAgICB2ZW5kb3JpbmZvID0g XAogICAgICAgICAiOyBMb2NhbGlzZWQgVmVuZG9yIG5hbWUiIFwKQEAgLTU2LDcgKzkzLDggQEAg c3ltYmlhbjogewogICAgIHdlYmtpdGJhY2t1cC5wYXRoID0gL3ByaXZhdGUvMTAyMDJENTYvaW1w b3J0L3BhY2thZ2VzLyQkcmVwbGFjZShUQVJHRVQuVUlEMywgMHgsKQogCiAgICAgY29udGFpbnMo UVRfQ09ORklHLCBkZWNsYXJhdGl2ZSkgewotICAgICAgICAgZGVjbGFyYXRpdmVJbXBvcnQuc291 cmNlcyA9ICQkUVRfQlVJTERfVFJFRS9pbXBvcnRzL1F0V2ViS2l0L3FtbHdlYmtpdHBsdWdpbiQk e1FUX0xJQklORklYfS5kbGwKKyAgICAgICAgIGRlY2xhcmF0aXZlSW1wb3J0LnNvdXJjZXMgPSAk JE9VVFBVVF9ESVIvaW1wb3J0cy9RdFdlYktpdC9xbWx3ZWJraXRwbHVnaW4kJHtRVF9MSUJJTkZJ WH0uZGxsCisgICAgICAgICBDT05GSUcoUVRESVJfYnVpbGQpOiBkZWNsYXJhdGl2ZUltcG9ydC5z b3VyY2VzID0gJCRRVF9CVUlMRF9UUkVFL2ltcG9ydHMvUXRXZWJLaXQvcW1sd2Via2l0cGx1Z2lu JCR7UVRfTElCSU5GSVh9LmRsbAogICAgICAgICAgZGVjbGFyYXRpdmVJbXBvcnQuc291cmNlcyAr PSAuLi9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcW1sZGlyCiAgICAgICAgICBkZWNsYXJhdGl2ZUlt cG9ydC5wYXRoID0gYzokJFFUX0lNUE9SVFNfQkFTRV9ESVIvUXRXZWJLaXQKICAgICAgICAgIERF UExPWU1FTlQgKz0gZGVjbGFyYXRpdmVJbXBvcnQKQEAgLTc2LDQyICsxMTQsNiBAQCBzeW1iaWFu OiB7CiAgICAgQ09ORklHKHJlbGVhc2UsIGRlYnVnfHJlbGVhc2UpOiBRTUFLRV9DWFhGTEFHUy5B Uk1DQyArPSAtT1RpbWUgLU8zCiB9CiAKLWlzRW1wdHkoT1VUUFVUX0RJUik6IE9VVFBVVF9ESVIg PSAuLgotaW5jbHVkZSgkJFBXRC8uLi9XZWJLaXQucHJpKQotCi1URU1QTEFURSA9IGxpYgotVEFS R0VUID0gUXRXZWJLaXQKLQotY29udGFpbnMoUVRfQ09ORklHLCBlbWJlZGRlZCk6Q09ORklHICs9 IGVtYmVkZGVkCi0KLUNPTkZJRyhzdGFuZGFsb25lX3BhY2thZ2UpIHsKLSAgICBpc0VtcHR5KFdD X0dFTkVSQVRFRF9TT1VSQ0VTX0RJUik6V0NfR0VORVJBVEVEX1NPVVJDRVNfRElSID0gJCRQV0Qv Z2VuZXJhdGVkCi0gICAgaXNFbXB0eShKU0NfR0VORVJBVEVEX1NPVVJDRVNfRElSKTpKU0NfR0VO RVJBVEVEX1NPVVJDRVNfRElSID0gJCRQV0QvLi4vSmF2YVNjcmlwdENvcmUvZ2VuZXJhdGVkCi0K LSAgICBQUkVDT01QSUxFRF9IRUFERVIgPSAkJFBXRC8uLi9XZWJLaXQvcXQvV2ViS2l0X3BjaC5o Ci19IGVsc2UgewotICAgIGlzRW1wdHkoV0NfR0VORVJBVEVEX1NPVVJDRVNfRElSKTpXQ19HRU5F UkFURURfU09VUkNFU19ESVIgPSBnZW5lcmF0ZWQKLSAgICBpc0VtcHR5KEpTQ19HRU5FUkFURURf U09VUkNFU19ESVIpOkpTQ19HRU5FUkFURURfU09VUkNFU19ESVIgPSAuLi9KYXZhU2NyaXB0Q29y ZS9nZW5lcmF0ZWQKLQotICAgICFDT05GSUcocmVsZWFzZSwgZGVidWd8cmVsZWFzZSkgewotICAg ICAgICBPQkpFQ1RTX0RJUiA9IG9iai9kZWJ1ZwotICAgIH0gZWxzZSB7ICMgUmVsZWFzZQotICAg ICAgICBPQkpFQ1RTX0RJUiA9IG9iai9yZWxlYXNlCi0gICAgfQotCi19Ci0KLUNPTkZJRyhRVERJ Ul9idWlsZCkgewotICAgIGluY2x1ZGUoJCRRVF9TT1VSQ0VfVFJFRS9zcmMvcWJhc2UucHJpKQot fSBlbHNlIHsKLSAgICBERVNURElSID0gJCRPVVRQVVRfRElSL2xpYgotICAgICFzdGF0aWM6IERF RklORVMgKz0gUVRfTUFLRURMTAotICAgIHN5bWJpYW46IFRBUkdFVCA9JCRUQVJHRVQkJHtRVF9M SUJJTkZJWH0KLX0KLW1vZHVsZUZpbGU9JCRQV0QvLi4vV2ViS2l0L3F0L3F0X3dlYmtpdF92ZXJz aW9uLnByaQotaXNFbXB0eShRVF9CVUlMRF9UUkVFKTppbmNsdWRlKCQkbW9kdWxlRmlsZSkKLVZF UlNJT04gPSAkJHtRVF9XRUJLSVRfTUFKT1JfVkVSU0lPTn0uJCR7UVRfV0VCS0lUX01JTk9SX1ZF UlNJT059LiQke1FUX1dFQktJVF9QQVRDSF9WRVJTSU9OfQotCiB1bml4IHsKICAgICBRTUFLRV9Q S0dDT05GSUdfUkVRVUlSRVMgPSBRdENvcmUgUXRHdWkgUXROZXR3b3JrCiB9CmRpZmYgLS1naXQg YS9XZWJLaXQucHJpIGIvV2ViS2l0LnByaQppbmRleCA5M2JlOTYyNTBkYjcwOGJhZWNjZDFjOGY3 NDdlYjZjZmVkMmRlNmEzLi5hMGM2N2ZkMDhjNDEzZjg1ZjA3ZTg3Mzg3N2I5ZjViODU1ZjhjMjkw IDEwMDY0NAotLS0gYS9XZWJLaXQucHJpCisrKyBiL1dlYktpdC5wcmkKQEAgLTMwLDE0ICszMCwx NyBAQCBidWlsZGluZy1saWJzIHsKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAg ICAgTElCUyArPSAtbFF0V2ViS2l0CiAgICAgICAgICAgICAgICAgc3ltYmlhbiB7Ci0gICAgICAg ICAgICAgICAgICAgIFRBUkdFVC5FUE9DU1RBQ0tTSVpFID0gMHgxNDAwMCAvLyA4MCBrQgorICAg ICAgICAgICAgICAgICAgICAjIEZvciBTeW1iaWFuLCBzZXQgc3RhY2sgc2l6ZSB0byA4MCBrQgor ICAgICAgICAgICAgICAgICAgICBUQVJHRVQuRVBPQ1NUQUNLU0laRSA9IDB4MTQwMDAKICAgICAg ICAgICAgICAgICAgICAgIyBGb3IgRVhFcyBvbmx5OiBzZXQgaGVhcCB0byB1c2FibGUgdmFsdWUK KyAgICAgICAgICAgICAgICAgICAgIyBGb3IgV0lOU0NXIHRhcmdldCwgc2V0IGhlYXAgbWluaW11 bSBzaXplIHRvIDI1NmtCLCBNYXggMzIgTUIKKyAgICAgICAgICAgICAgICAgICAgIyBGb3IgQWxs IG90aGVyIHN5bWJpYW4gdGFyZ2V0cywgc2V0IGhlYXAgbWluaW11bSBzaXplIHRvIDI1NmtCLCBN YXggOTZNQgogICAgICAgICAgICAgICAgICAgICBUQVJHRVQuRVBPQ0hFQVBTSVpFID0gCiAgICAg ICAgICAgICAgICAgICAgIGhlYXBTaXplUnVsZSA9IFwKICAgICAgICAgICAgICAgICAgICAgIiQk e0xJVEVSQUxfSEFTSH1pZmRlZiBXSU5TQ1ciIFwKLSAgICAgICAgICAgICAgICAgICAgICAgICJF UE9DSEVBUFNJWkUgIDB4NDAwMDAgMHgyMDAwMDAwIC8vIE1pbiAyNTZrQiwgTWF4IDMyTUIiIFwK KyAgICAgICAgICAgICAgICAgICAgICAgICJFUE9DSEVBUFNJWkUgIDB4NDAwMDAgMHgyMDAwMDAw IiBcCiAgICAgICAgICAgICAgICAgICAgICIkJHtMSVRFUkFMX0hBU0h9ZWxzZSIgXAotICAgICAg ICAgICAgICAgICAgICAgICAgIkVQT0NIRUFQU0laRSAgMHg0MDAwMCAweDYwMDAwMDAgLy8gTWlu IDI1NmtCLCBNYXggOTZNQiIgXAorICAgICAgICAgICAgICAgICAgICAgICAgIkVQT0NIRUFQU0la RSAgMHg0MDAwMCAweDYwMDAwMDAiIFwKICAgICAgICAgICAgICAgICAgICAgIiQke0xJVEVSQUxf SEFTSH1lbmRpZiIKICAgICAgICAgICAgICAgICAgICAgTU1QX1JVTEVTICs9IGhlYXBTaXplUnVs ZQogICAgICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9X ZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDRlMGFmNTUyZDY1OTA2ZDJkNmE5YmYyOTA4ZWFlYmNm ZjA4ZmRmYzUuLjkwMGJhMDFkNDAzYjgxOWYyNTc4MDMyMDhmYmNhMDEyMmM0NTI1YTcgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAt MSwzICsxLDE0IEBACisyMDEwLTEwLTA4ICBLZWl0aCBLeXppdmF0ICA8a2VpdGgua3l6aXZhdEBu b2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgW1F0XSBHZXQgdGhlIHN5bWJpYW4vbGludXgtYXJtY2MgY29tcGlsZSB3b3JraW5nIHByb3Bl cmx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NzQx NAorCisgICAgICAgIERvbid0IHVzZSBycGF0aCBpbiBzeW1iaWFuIGxpbnV4IGJ1aWxkLgorCisg ICAgICAgICogZGVjbGFyYXRpdmUvZGVjbGFyYXRpdmUucHJvOgorCiAyMDEwLTEwLTA3ICBLZWl0 aCBLeXppdmF0ICA8a2VpdGgua3l6aXZhdEBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvZGVj bGFyYXRpdmUucHJvIGIvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL2RlY2xhcmF0aXZlLnBybwppbmRl eCA1MjZjZjA2MWMwNjAxNTU2YWRkMmU0ZDNmOTA5N2FkYWRiMDUwN2UzLi4zYWUxYzRmODg3MTUw ZDVkYjczYjY2ZGVlOTUyNmVjNGNmYTg2OGQ1IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvZGVjbGFy YXRpdmUvZGVjbGFyYXRpdmUucHJvCisrKyBiL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9kZWNsYXJh dGl2ZS5wcm8KQEAgLTM4LDcgKzM4LDcgQEAgaW5jbHVkZSguLi8uLi8uLi9XZWJLaXQucHJpKQog UVQgKz0gZGVjbGFyYXRpdmUKIAogIUNPTkZJRyhzdGFuZGFsb25lX3BhY2thZ2UpIHsKLSAgICBs aW51eC0qIHsKKyAgICBsaW51eC0qOiFzeW1iaWFuIHsKICAgICAgICAgIyBGcm9tIENyZWF0b3In cyBzcmMvcnBhdGgucHJpOgogICAgICAgICAjIERvIHRoZSBycGF0aCBieSBoYW5kIHNpbmNlIGl0 J3Mgbm90IHBvc3NpYmxlIHRvIHVzZSBPUklHSU4gaW4gUU1BS0VfUlBBVEhESVIKICAgICAgICAg IyB0aGlzIGV4cGFuZHMgdG8gJE9SSUdJTiAoYWZ0ZXIgcW1ha2UgYW5kIG1ha2UpLCBpdCBkb2Vz IE5PVCByZWFkIGEgcW1ha2UgdmFyLgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9X ZWJLaXQyL0NoYW5nZUxvZwppbmRleCAxNTYwMDBhN2U3NWQyNzJmY2ZlMTkyYWNhMDhkNmU1ZDA2 ZDVlNjRmLi4wZWQ5ZDhiYjAyYzA1YTIwOGUyNjczN2RlOWMzMmQwNmE3NTMwMjc0IDEwMDY0NAot LS0gYS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE0IEBACisyMDEwLTEwLTA4ICBLZWl0aCBLeXppdmF0ICA8a2VpdGgua3l6aXZhdEBub2tpYS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0 XSBHZXQgdGhlIHN5bWJpYW4vbGludXgtYXJtY2MgY29tcGlsZSB3b3JraW5nIHByb3Blcmx5Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NzQxNAorCisg ICAgICAgIERvbid0IHVzZSBycGF0aCBpbiBzeW1iaWFuIGxpbnV4IGJ1aWxkLgorCisgICAgICAg ICogV2ViUHJvY2Vzcy5wcm86CisKIDIwMTAtMTAtMDYgIEplc3NpZSBCZXJsaW4gIDxqYmVybGlu QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBKb2huIFN1bGxpdmFuLgpkaWZmIC0t Z2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzLnBybyBiL1dlYktpdDIvV2ViUHJvY2Vzcy5wcm8KaW5k ZXggMmNhYmIwMGY0NjU5NTJmOGJmNDlhZDlkZmExMTFiNzhiNDgxNWM3OC4uY2UxODc4NGY4NWE2 MGEzZjM3OTM1Njc3YjYyNzdiZTdmYjFlZDkyYiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9j ZXNzLnBybworKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MucHJvCkBAIC0xMyw3ICsxMyw3IEBAIERF U1RESVIgPSAkJE9VVFBVVF9ESVIvYmluCiBRVCArPSBuZXR3b3JrCiBtYWN4OlFUKz14bWwKIAot bGludXgtKiB7CitsaW51eC0qOiFzeW1iaWFuIHsKICAgICAjIEZyb20gQ3JlYXRvcidzIHNyYy9y cGF0aC5wcmk6CiAgICAgIyBEbyB0aGUgcnBhdGggYnkgaGFuZCBzaW5jZSBpdCdzIG5vdCBwb3Nz aWJsZSB0byB1c2UgT1JJR0lOIGluIFFNQUtFX1JQQVRIRElSCiAgICAgIyB0aGlzIGV4cGFuZHMg dG8gJE9SSUdJTiAoYWZ0ZXIgcW1ha2UgYW5kIG1ha2UpLCBpdCBkb2VzIE5PVCByZWFkIGEgcW1h a2UgdmFyLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMv Q2hhbmdlTG9nCmluZGV4IGI5YjlhN2RhZmVhMDY5OGU1OGEwMTMwMTEyZmY4N2ZhMmU5MGY3NzEu LjE0MjhjZWEzY2EwMjU2YmI1YmJlOGY4NzQyZjU5MWZlNmFkYTNlY2EgMTAwNjQ0Ci0tLSBhL1dl YktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxOCBAQAorMjAxMC0xMC0wOCAgS2VpdGggS3l6aXZhdCAgPGtlaXRoLmt5eml2YXRAbm9raWEu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtR dF0gR2V0IHRoZSBzeW1iaWFuL2xpbnV4LWFybWNjIGNvbXBpbGUgd29ya2luZyBwcm9wZXJseQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDc0MTQKKwor ICAgICAgICBEb24ndCB1c2UgcnBhdGggaW4gc3ltYmlhbiBsaW51eCBidWlsZC4KKyAgICAgICAg RG9uJ3QgaW5jbHVkZSBmb250Y29uZmlnIGluIHN5bWJpYW4vbGludXgtYXJtY2MgYnVpbGQuCisK KyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZS5wcm86CisgICAgICAg ICogTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXIucHJvOgorICAgICAgICAqIFF0VGVzdEJyb3dz ZXIvUXRUZXN0QnJvd3Nlci5wcm86CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9xdC9XZWJL aXRUZXN0UnVubmVyLnBybzoKKwogMjAxMC0xMC0wNyAgQmFsYXpzIEtlbGVtZW4gIDxrYmFsYXpz QHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRG8gYSByZW5hbWluZyB0aGF0IHdh cyByZWNvbW1lbmRlZCBieSB0aGUgcmV2aWV3ZXIKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1 bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlLnBybyBiL1dlYktpdFRvb2xzL0R1bXBSZW5k ZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlLnBybwppbmRleCA1NGQ1YWY3MDM3Y2IyMWQyYjRjMzQ3 YzQ2NjZlZDkyYmNiNThkNTI5Li5lODgzMWEzYTQ1MDEwMWM1ZDQzMjJmYTE4YjMyYzk3ZDlhYjcx NTRkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVy VHJlZS5wcm8KKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRy ZWUucHJvCkBAIC0xMiw3ICsxMiw3IEBAIElOQ0xVREVQQVRIICs9IC4uLy4uLy4uL0phdmFTY3Jp cHRDb3JlL0ZvcndhcmRpbmdIZWFkZXJzCiBJTkNMVURFUEFUSCArPSAkJEJBU0VESVIKIERFU1RE SVIgPSAuLi8uLi8uLi9iaW4KIAotdW5peDohbWFjIHsKK3VuaXg6IW1hYzohc3ltYmlhbiB7CiAg ICAgQ09ORklHICs9IGxpbmtfcGtnY29uZmlnCiAgICAgUEtHQ09ORklHICs9IGZvbnRjb25maWcK IH0KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyLnBy byBiL1dlYktpdFRvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyLnBybwppbmRleCBlNDJj NDlhMjM1NWM0YWE5NDI5YjE4YmEzZTJkNWM5MTlhMzk3OWQwLi5kNWI5YmM3MDZiYWQzOWM1MDBi Njg4NmFhNmUyMzc4MDFmMDA2MDk3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9NaW5pQnJvd3Nl ci9xdC9NaW5pQnJvd3Nlci5wcm8KKysrIGIvV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIvcXQvTWlu aUJyb3dzZXIucHJvCkBAIC0yOSw3ICsyOSw3IEBAIERFU1RESVIgPSAkJE9VVFBVVF9ESVIvYmlu CiBRVCArPSBuZXR3b3JrCiBtYWN4OlFUKz14bWwKIAotbGludXgtKiB7CitsaW51eC0qOiFzeW1i aWFuIHsKICAgICAjIEZyb20gQ3JlYXRvcidzIHNyYy9ycGF0aC5wcmk6CiAgICAgIyBEbyB0aGUg cnBhdGggYnkgaGFuZCBzaW5jZSBpdCdzIG5vdCBwb3NzaWJsZSB0byB1c2UgT1JJR0lOIGluIFFN QUtFX1JQQVRIRElSCiAgICAgIyB0aGlzIGV4cGFuZHMgdG8gJE9SSUdJTiAoYWZ0ZXIgcW1ha2Ug YW5kIG1ha2UpLCBpdCBkb2VzIE5PVCByZWFkIGEgcW1ha2UgdmFyLgpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvUXRUZXN0QnJvd3Nlci9RdFRlc3RCcm93c2VyLnBybyBiL1dlYktpdFRvb2xzL1F0 VGVzdEJyb3dzZXIvUXRUZXN0QnJvd3Nlci5wcm8KaW5kZXggMDhlMGZiOGJjMDU4Nzc5MjA4NGQ3 ZmE1M2Q2Njk4YzgwNGIwZDI3YS4uMjNiYmZmNDc3OTgxMmJkMTEwYjUzMGE3ODBhZGZmMTQwZDlm NDI5MyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci9RdFRlc3RCcm93c2Vy LnBybworKysgYi9XZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL1F0VGVzdEJyb3dzZXIucHJvCkBA IC0zMyw3ICszMyw3IEBAIERFU1RESVIgPSAkJE9VVFBVVF9ESVIvYmluCiBRVCArPSBuZXR3b3Jr CiBtYWN4OlFUKz14bWwKIAotbGludXgtKiB7CitsaW51eC0qOiFzeW1iaWFuIHsKICAgICAjIEZy b20gQ3JlYXRvcidzIHNyYy9ycGF0aC5wcmk6CiAgICAgIyBEbyB0aGUgcnBhdGggYnkgaGFuZCBz aW5jZSBpdCdzIG5vdCBwb3NzaWJsZSB0byB1c2UgT1JJR0lOIGluIFFNQUtFX1JQQVRIRElSCiAg ICAgIyB0aGlzIGV4cGFuZHMgdG8gJE9SSUdJTiAoYWZ0ZXIgcW1ha2UgYW5kIG1ha2UpLCBpdCBk b2VzIE5PVCByZWFkIGEgcW1ha2UgdmFyLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9xdC9XZWJLaXRUZXN0UnVubmVyLnBybyBiL1dlYktpdFRvb2xzL1dlYktpdFRl c3RSdW5uZXIvcXQvV2ViS2l0VGVzdFJ1bm5lci5wcm8KaW5kZXggYjFhYzcwZWZlYjYyNWE4N2U3 ZjE5Y2ZlOGVmZTJmMjU1NWU0ZGM3NC4uOTZjZmFjNWQ0Yzk4ZTgzYmUyNDMwYzBlNzVlZWE2ZDc2 ZmRjNTZjOSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9xdC9XZWJL aXRUZXN0UnVubmVyLnBybworKysgYi9XZWJLaXRUb29scy9XZWJLaXRUZXN0UnVubmVyL3F0L1dl YktpdFRlc3RSdW5uZXIucHJvCkBAIC01MCw3ICs1MCw3IEBAIFNPVVJDRVMgPSBcCiBQUkVGSVhf SEVBREVSID0gJCRCQVNFRElSL1dlYktpdFRlc3RSdW5uZXJQcmVmaXguaAogUU1BS0VfQ1hYRkxB R1MgKz0gIi1pbmNsdWRlICQkUFJFRklYX0hFQURFUiIKIAotbGludXgtKiB7CitsaW51eC0qOiFz eW1iaWFuIHsKICAgICAjIEZyb20gQ3JlYXRvcidzIHNyYy9ycGF0aC5wcmk6CiAgICAgIyBEbyB0 aGUgcnBhdGggYnkgaGFuZCBzaW5jZSBpdCdzIG5vdCBwb3NzaWJsZSB0byB1c2UgT1JJR0lOIGlu IFFNQUtFX1JQQVRIRElSCiAgICAgIyB0aGlzIGV4cGFuZHMgdG8gJE9SSUdJTiAoYWZ0ZXIgcW1h a2UgYW5kIG1ha2UpLCBpdCBkb2VzIE5PVCByZWFkIGEgcW1ha2UgdmFyLgo=