205353 2019-12-17 13:12:48 -0800 Force `yasm` to be built for host OS 2022-02-10 16:42:28 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED WONTFIX https://bugs.webkit.org/show_bug.cgi?id=205491 InRadar P2 Normal --- 1 krollin krollin ap dbates eric.carlson ews-watchlist jbedard thorton webkit-bug-importer youennf oldest_to_newest 1599529 0 krollin 2019-12-17 13:12:48 -0800 When using `make` to build for the iOS Simulator, yasm would also get built for that platform, due to the specification of SDKROOT=iphonesimulator on the command line. However, yasm is supposed to be built for the current build host so that it can later be used in the build process. Using yasm on the build host even though it was built for iOS Simulator seems to have worked so far, but that may not always be the case. Fix this by forcing yasm to be built for the host as opposed to whatever it specified in SDKROOT on the `make` command-line. 1599530 1 webkit-bug-importer 2019-12-17 13:13:05 -0800 <rdar://problem/58018752> 1599531 2 385913 krollin 2019-12-17 13:15:15 -0800 Created attachment 385913 Patch 1599542 3 385913 jbedard 2019-12-17 13:30:54 -0800 Comment on attachment 385913 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=385913&action=review > Source/ThirdParty/libwebrtc/Makefile:9 > +OVERRIDE_ARCHS = default While this is generally the correct way to do this, I'd like to better understand why this is the case. The only other place we have precedence of doing this right now is ImageDiff, and we only do it for embedded builds (ie, we conditionality it to iOS, watchOS and tvOS), and that's because we need the binary for testing. I would expect that libwebrtc is built for embedded platforms, is it not? 1599544 4 thorton 2019-12-17 13:36:43 -0800 (In reply to Jonathan Bedard from comment #3) > Comment on attachment 385913 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=385913&action=review > > > Source/ThirdParty/libwebrtc/Makefile:9 > > +OVERRIDE_ARCHS = default > > While this is generally the correct way to do this, I'd like to better > understand why this is the case. > > The only other place we have precedence of doing this right now is > ImageDiff, and we only do it for embedded builds (ie, we conditionality it > to iOS, watchOS and tvOS), and that's because we need the binary for > testing. I would expect that libwebrtc is built for embedded platforms, is > it not? This is a tool used to generate code that is then subsequently built for simulator. The tool runs on Mac; it's the same kind of problem as ImageDiff. 1599547 5 krollin 2019-12-17 13:42:08 -0800 ...and my change affects all of libwebrtc, when I wanted it to affect only yasm. This needs more fixing. 1599552 6 jbedard 2019-12-17 13:44:18 -0800 (In reply to Tim Horton from comment #4) > (In reply to Jonathan Bedard from comment #3) > > Comment on attachment 385913 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=385913&action=review > > > > > Source/ThirdParty/libwebrtc/Makefile:9 > > > +OVERRIDE_ARCHS = default > > > > While this is generally the correct way to do this, I'd like to better > > understand why this is the case. > > > > The only other place we have precedence of doing this right now is > > ImageDiff, and we only do it for embedded builds (ie, we conditionality it > > to iOS, watchOS and tvOS), and that's because we need the binary for > > testing. I would expect that libwebrtc is built for embedded platforms, is > > it not? > > This is a tool used to generate code that is then subsequently built for > simulator. The tool runs on Mac; it's the same kind of problem as ImageDiff. libwebrtc is a tool? That's confusing, I would expect it to be a library based on the name. Should it be included in build archives? Or is it just used in the build process? I think we should do the same thing we did with ImageDiff: ifneq (,$(findstring iphone,$(SDKROOT))) OVERRIDE_SDKROOT = default OVERRIDE_ARCHS = default endif ifneq (,$(findstring watch,$(SDKROOT))) OVERRIDE_SDKROOT = default OVERRIDE_ARCHS = default endif ifneq (,$(findstring tv,$(SDKROOT))) OVERRIDE_SDKROOT = default OVERRIDE_ARCHS = default endif that way if the caller is overriding the Mac SDK, we build with the overwridden Mac SDK 1599553 7 jbedard 2019-12-17 13:45:04 -0800 (In reply to Jonathan Bedard from comment #6) > .... > libwebrtc is a tool? That's confusing, I would expect it to be a library > based on the name. Should it be included in build archives? Or is it just > used in the build process? Keith just answered by question ... 1600073 8 krollin 2019-12-18 17:19:48 -0800 I've got a solution in place. However, it's a little ugly in that it re-invokes xcodebuild in order to build just 'yasm' for macOS. I'm talking with a Developer Tools guy who thinks that there's a cleaner solution. It works for him but it doesn't work for me. I'm going to try to get his project to see how it differs from libwebrtc's. 1600125 9 krollin 2019-12-18 20:41:48 -0800 One Developer Tools guy said "Hey, do <this>". I said "I tried that and it didn't work. May I see your project?" To which he said "Hmm, my approach doesn't seem to be working any more...". Another Developer Tools guy said "Xcode can't build host content simultaneously with device content. You will fight this battle forever and lose." I'm marking this as the selected answer. A third said "Your scripted build should be able to use a -destination argument instead of overriding the SDKROOT build setting to build for different run destinations (aka operating systems etc.)" The "scripted build" refers to building from the command-line as opposed to from within the IDE. I may look into this -destination-based solution down the road, but right now I'm worried that it might be more trouble than it's worth. For instance, it seems to be workspace/scheme based rather than project-based, as we operate now. Also, some of the destinations we'd want to specify seem hands-off: % xcodebuild -showdestinations -workspace WebKit.xcworkspace -scheme 'All Source' ... Ineligible destinations for the "All Source" scheme: { platform:iOS, id:dvtdevice-DVTiPhonePlaceholder-iphoneos:placeholder, name:Generic iOS Device } { platform:iOS Simulator, id:dvtdevice-DVTiOSDeviceSimulatorPlaceholder-iphonesimulator:placeholder, name:Generic iOS Simulator Device } ... So I'll test that my current approach (which re-invokes xcodebuild to build yasm) works and upload that for review. 1600581 10 386167 krollin 2019-12-19 17:21:06 -0800 Created attachment 386167 Patch 1600751 11 386167 jbedard 2019-12-20 09:24:37 -0800 Comment on attachment 386167 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=386167&action=review > Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj:15944 > + shellScript = "ARGS=(\n -project \"${PROJECT_FILE_PATH}\"\n -target yasm\n -sdk macosx\n -arch \"${NATIVE_ARCH_ACTUAL}\"\n -configuration Release\n OBJROOT=${PROJECT_TEMP_DIR}/Build_yasm/Intermediates.noindex\n SYMROOT=${PROJECT_TEMP_DIR}/Build_yasm/Products\n )\n\nxcodebuild \"${ARGS[@]}\"\n\nYASM_PATH=$(xcodebuild \"${ARGS[@]}\" -showBuildSettings | grep -w BUILT_PRODUCTS_DIR | sed -Ee 's/[^=]* = (.*)/\\1/')\nYASM_NAME=$(xcodebuild \"${ARGS[@]}\" -showBuildSettings | grep -w EXECUTABLE_NAME | sed -Ee 's/[^=]* = (.*)/\\1/')\n\nSRC=\"${YASM_PATH}/${YASM_NAME}\"\nDEST=\"${BUILT_PRODUCTS_DIR}/yasm\"\n\n[[ -e \"${SRC}\" ]] || exit 1\n[[ -e \"${DEST}\" ]] && { cmp \"${SRC}\" \"${DEST}\" && exit 0; }\ncp \"${SRC}\" \"${DEST}\" || exit 1\n\nexit 0\n"; I'm pretty confused where this is actually triggered. I applied the patch and I can't find this script in Xcode. 1600829 12 krollin 2019-12-20 11:22:20 -0800 I guess I don't know why you can't find it. It's 'a custom build step in the "vpx" target'. If you look at the build steps for vpx, you should see it as the second build step, called "Build yasm for macOS". Regardless, this is all moot. Youenn is taking a different approach in Bug 205491, where yasm is no longer needed for non-macOS platforms. I'll be closing this bug as NTBF once that one lands. 385913 2019-12-17 13:15:15 -0800 2019-12-19 17:21:05 -0800 Patch bug-205353-20191217131514.patch text/plain 1780 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n ZUxvZwppbmRleCA2MzkyODQ4MzcwYzE3YzA5NzNlZTM1OTRmY2VkODg1ODBkNzg4ZTAyLi5iOGU3 MmE3YTQ3MjgxMDk4MDU2MmIyODhkOGUwMGM2MWQ2MWE3ZjliIDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxOS0xMi0xNyAgS2VpdGggUm9s bGluICA8a3JvbGxpbkBhcHBsZS5jb20+CisKKyAgICAgICAgRm9yY2UgYHlhc21gIHRvIGJlIGJ1 aWx0IGZvciBob3N0IE9TCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMDUzNTMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU4MDE4NzUyPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gdXNpbmcgYG1h a2VgIHRvIGJ1aWxkIGZvciB0aGUgaU9TIFNpbXVsYXRvciwgeWFzbSB3b3VsZCBhbHNvIGdldAor ICAgICAgICBidWlsdCBmb3IgdGhhdCBwbGF0Zm9ybSwgZHVlIHRvIHRoZSBzcGVjaWZpY2F0aW9u IG9mCisgICAgICAgIFNES1JPT1Q9aXBob25lc2ltdWxhdG9yIG9uIHRoZSBjb21tYW5kIGxpbmUu IEhvd2V2ZXIsIHlhc20gaXMgc3VwcG9zZWQKKyAgICAgICAgdG8gYmUgYnVpbHQgZm9yIHRoZSBj dXJyZW50IGJ1aWxkIGhvc3Qgc28gdGhhdCBpdCBjYW4gbGF0ZXIgYmUgdXNlZCBpbgorICAgICAg ICB0aGUgYnVpbGQgcHJvY2Vzcy4gVXNpbmcgeWFzbSBvbiB0aGUgYnVpbGQgaG9zdCBldmVuIHRo b3VnaCBpdCB3YXMKKyAgICAgICAgYnVpbHQgZm9yIGlPUyBTaW11bGF0b3Igc2VlbXMgdG8gaGF2 ZSB3b3JrZWQgc28gZmFyLCBidXQgdGhhdCBtYXkgbm90CisgICAgICAgIGFsd2F5cyBiZSB0aGUg Y2FzZS4gRml4IHRoaXMgYnkgZm9yY2luZyB5YXNtIHRvIGJlIGJ1aWx0IGZvciB0aGUgaG9zdAor ICAgICAgICBhcyBvcHBvc2VkIHRvIHdoYXRldmVyIGl0IHNwZWNpZmllZCBpbiBTREtST09UIG9u IHRoZSBgbWFrZWAKKyAgICAgICAgY29tbWFuZC1saW5lLgorCisgICAgICAgICogTWFrZWZpbGU6 CisKIDIwMTktMTItMDggIHlvdWVubiBmYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAg ICAgIEFkZCBtb3JlIGxvZ2dpbmcgdG8gcGh5c2ljYWwgc29ja2V0IHNlcnZlciB3aGVuIGEgc29j a2V0IGZpbGUgZGVzY3JpcHRvciBpcyBpbnZhbGlkCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQ YXJ0eS9saWJ3ZWJydGMvTWFrZWZpbGUgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvTWFr ZWZpbGUKaW5kZXggOTc1NjZiODBiNjhkMDc5NmI2YWQ3NjdkNWFjNDMyOTNhZGQzYzg3Yi4uMjk4 MWMxYjNlNWI0YWM3MzliMGRkOWRmMWJhNTJjZGViYmUwZTc2MyAxMDA2NDQKLS0tIGEvU291cmNl L1RoaXJkUGFydHkvbGlid2VicnRjL01ha2VmaWxlCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9NYWtlZmlsZQpAQCAtNCw0ICs0LDggQEAgaWZuZXEgKCwkKFNES1JPT1QpKQogCWVu ZGlmCiBlbmRpZgogCisjIEFsd2F5cyBidWlsZCBmb3IgaG9zdCBTREsuCitPVkVSUklERV9TREtS T09UID0gZGVmYXVsdAorT1ZFUlJJREVfQVJDSFMgPSBkZWZhdWx0CisKIGluY2x1ZGUgLi4vTWFr ZWZpbGUuc2hhcmVkCg== 386167 2019-12-19 17:21:06 -0800 2022-02-10 16:42:28 -0800 Patch bug-205353-20191219172106.patch text/plain 7774 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNzk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n ZUxvZwppbmRleCA2MzkyODQ4MzcwYzE3YzA5NzNlZTM1OTRmY2VkODg1ODBkNzg4ZTAyLi4xNDNi ZThiYjg4NmQwYTdlM2VlMzYwOTJkNDhkZjlkYmUwZDgxZmM5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSw1MSBAQAorMjAxOS0xMi0xOSAgS2VpdGggUm9s bGluICA8a3JvbGxpbkBhcHBsZS5jb20+CisKKyAgICAgICAgRm9yY2UgYHlhc21gIHRvIGJlIGJ1 aWx0IGZvciBob3N0IE9TCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMDUzNTMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU4MDE4NzUyPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gYnVpbGRpbmcg bGlid2VicnRjLCBzb21lICouYXNtIGZpbGVzIG5lZWQgdG8gYmUgcHJvY2Vzc2VkLiBUaGlzCisg ICAgICAgIHByb2Nlc3NpbmcgaXMgcGVyZm9ybWVkIHZpYSBhIGN1c3RvbSBhc3NlbWJsZXIgY2Fs bGVkICJ5YXNtIiB0aGF0CisgICAgICAgIGNvbWVzIHdpdGggdGhlIHByb2plY3QuIFRoZSB0YXJn ZXQgaW4gdGhlIHByb2plY3QgdGhhdCBuZWVkcyB0byBoYXZlCisgICAgICAgIHRoZSAuYXNtIGZp bGVzIHByb2Nlc3NlZCBpcyBtYXJrZWQgYXMgYmVpbmcgZGVwZW5kZW50IG9uIHRoZSB0YXJnZXQK KyAgICAgICAgdGhhdCBidWlsZHMgeWFzbS4gSW4gdGhhdCB3YXksIHRoZSB5YXNtIHRvb2wgaXMg YnVpbHQgYW5kIGF2YWlsYWJsZQorICAgICAgICBiZWZvcmUgdGhlIHByb2plY3Qgd2l0aCB0aGUg LmFzbSBmaWxlcyBuZWVkcyBpdC4KKworICAgICAgICBIb3dldmVyLCBiZWNhdXNlIG9mIHRoZSB3 YXkgWGNvZGUgcHJvamVjdHMgYXJlIGJ1aWx0LCBhbGwgdGFyZ2V0cyBhcmUKKyAgICAgICAgYnVp bHQgZm9yIHRoZSBzYW1lIHBsYXRmb3JtLiBUaGlzIG1lYW5zIHRoYXQgeWFzbSB3b3VsZCBiZSBi dWlsdCBmb3IKKyAgICAgICAgbWFjT1MsIGlPUywgYW5kIGlPUyBTaW11bGF0b3IgLS0gdGhlIHRo cmVlIHBsYXRmb3JtcyBmb3Igd2hpY2ggd2UKKyAgICAgICAgYnVpbGQgbGlid2VicnRjLiBJdCB0 dXJucyBvdXQgdGhhdCB3ZSBkb24ndCBhY3R1YWxseSBuZWVkIG9yIHVzZSB5YXNtCisgICAgICAg IHdoZW4gYnVpbGRpbmcgZm9yIGlPUywgc28geWFzbSB3YXMgb25seSBpbnZva2VkIGZvciBtYWNP UyBhbmQgaU9TCisgICAgICAgIFNpbXVsYXRvci4gQW5kIGV2ZW4gdGhvdWdoIHdlIHdlcmUgdHJ5 aW5nIHRvIHJ1biBhbiBpT1MgU2ltdWxhdG9yCisgICAgICAgIHZlcnNpb24gb2YgeWFzbSBvbiBt YWNPUywgaXQgc3RpbGwgdHVybmVkIG91dCB0byAiY29tcGF0aWJsZSBlbm91Z2giCisgICAgICAg IHRvIGFjdHVhbGx5IHJ1biBvbiBtYWNPUyBhcyBhIG5hdGl2ZSB0b29sLgorCisgICAgICAgIEJh Y2sgaW4gSnVuZSwgaG93ZXZlciwgc29tZSBjaGFuZ2Ugd2FzIG1hZGUgdG8gbWFjT1Mgb3IgWGNv ZGUgc3VjaAorICAgICAgICB0aGF0IHdlIGNvdWxkIG5vIGxvbmdlciBydW4gdGhlIGlPUyBTaW11 bGF0b3IgdmVyc2lvbiBvZiB5YXNtIG9uCisgICAgICAgIG1hY09TLiBBIHdvcmthcm91bmQgd2Fz IGRldGVybWluZWQgYW5kIGltcGVsZW1lbnRlZCBhcyBwYXJ0IG9mCisgICAgICAgIGh0dHBzOi8v d2Via2l0Lm9yZy9iLzE5OTMzNy4gVGhpcyB3b3JrYXJvdW5kIGludm9sdmVkIHNldHRpbmcKKyAg ICAgICAgRFlMRF9ST09UX1BBVEggdG8gIi8iIGluIG9yZGVyICJ0byBhbGxvdyB0aGUgeWFzbSBi aW5hcnkgdG8gcnVuIG9uCisgICAgICAgIG1hY09TIGlmIGl0IHdhcyBidWlsdCBmb3IgYW5vdGhl ciBwbGF0Zm9ybSAoZS5nLiBpcGhvbmVzaW11bGF0b3IpIgorICAgICAgICAodGhhdCBxdW90ZSBp cyBmcm9tIGEgY29tbWVudCBzdWJtaXR0ZWQgd2l0aCB0aGUgY2l0ZWQgcGF0Y2gpLgorCisgICAg ICAgIEhvd2V2ZXIsIHRoaXMgd29ya2Fyb3VuZCBpcyBhIGhhY2sgYW5kIG1heSBub3Qgd29yayBp biB0aGUgZnV0dXJlLiBBcworICAgICAgICB3ZWxsLCB0aGlzIGFwcHJvYWNoIHdvbid0IHdvcmsg aWYgd2UgbmVlZCB0byB1c2UgeWFzbSB3aGVuIGJ1aWxkaW5nCisgICAgICAgIGZvciBhbnkgb2Yg dGhlIGVtYmVkZGVkIHBsYXRmb3Jtcy4KKworICAgICAgICBUaGVyZWZvcmUsIHdlIG5lZWQgYW4g YXBwcm9hY2ggdGhhdCBlbnN1cmVzIHRoYXQgeWFzbSBpcyBidWlsdCBmb3IgdGhlCisgICAgICAg IGhvc3QgYnVpbGQgc3lzdGVtIHJlZ2FyZGxlc3Mgb2YgdGhlIHBsYXRmb3JtIGZvciB3aGljaCB3 ZSBhcmUgYnVpbGRpbmcKKyAgICAgICAgdGhlIHJlc3Qgb2YgbGlid2VicnRjLiBJbiBvcmRlciB0 byBkbyB0aGlzLCB3ZSBub3c6CisKKyAgICAgICAgLSBSZW1vdmUgdGhlIGhhY2sgb2Ygc2V0dGlu ZyBEWUxEX1JPT1RfUEFUSCBpbiB0aGUgY3VzdG9tIGJ1aWxkIHJ1bGUKKyAgICAgICAgICB0aGF0 IGludm9rZXMgeWFzbS4KKyAgICAgICAgLSBSZW1vdmUgeWFzbSBhcyBhIGRlcGVuZGVuY3kgb2Yg dGhlICJ2cHgiIHRhcmdldCBpbiBsaWJ3ZWJydGMuCisgICAgICAgIC0gQWRkIGEgY3VzdG9tIGJ1 aWxkIHN0ZXAgaW4gdGhlICJ2cHgiIHRhcmdldCB0aGF0IHN1Yi1pbnZva2VzCisgICAgICAgICAg eGNvZGVidWlsZCB0byBidWlsZCB5YXNtIHNwZWNpZmljYWxseSBmb3IgbWFjT1MuCisKKyAgICAg ICAgKiBsaWJ3ZWJydGMueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKwogMjAxOS0xMi0wOCAg eW91ZW5uIGZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIG1vcmUgbG9n Z2luZyB0byBwaHlzaWNhbCBzb2NrZXQgc2VydmVyIHdoZW4gYSBzb2NrZXQgZmlsZSBkZXNjcmlw dG9yIGlzIGludmFsaWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9s aWJ3ZWJydGMueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9saWJ3ZWJydGMueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCBmYzY0Mjc5 YWYyYzUxMDVmYjk4NzE2ZGFhZTQzYjJkNzEwNjc2NjEzLi4yYTBlMjBmZDNiN2RmMjM1Y2Y2YjMy ZmIwZDEyMGJkNDAzZDY1NTk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJy dGMvbGlid2VicnRjLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1RoaXJk UGFydHkvbGlid2VicnRjL2xpYndlYnJ0Yy54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0z NTQ0LDcgKzM1NDQsNyBAQAogCQkJb3V0cHV0RmlsZXMgPSAoCiAJCQkJIiR7T0JKRUNUX0ZJTEVf RElSX25vcm1hbH0vJHtDVVJSRU5UX0FSQ0h9LyR7SU5QVVRfRklMRV9CQVNFfS5vIiwKIAkJCSk7 Ci0JCQlzY3JpcHQgPSAiIyBUaGlzIERZTERfUk9PVF9QQVRIIGhhY2sgaXMgdGhlcmUgdG8gYWxs b3cgdGhlIHlhc20gYmluYXJ5IHRvIHJ1biBvbiBtYWNPUyBpZiBpdCB3YXMgYnVpbHQgZm9yIGFu b3RoZXIgcGxhdGZvcm0gKGUuZy4gaXBob25lc2ltdWxhdG9yKSAtIHJkYXI6Ly81MjAyMDg0MSBh bmQgcmRhcjovLzUwNDc5NDY1XG5EWUxEX1JPT1RfUEFUSD0vICR7QlVJTFRfUFJPRFVDVFNfRElS fS95YXNtIC1mbWFjaG82NCAtSSAke1NSQ1JPT1R9L1NvdXJjZS90aGlyZF9wYXJ0eS9saWJ2cHgv c291cmNlL2NvbmZpZyAtSSAke1NSQ1JPT1R9L1NvdXJjZS90aGlyZF9wYXJ0eS9saWJ2cHgvc291 cmNlL2NvbmZpZy9tYWMveDY0IC1JICR7U1JDUk9PVH0vU291cmNlL3RoaXJkX3BhcnR5L2xpYnZw eC9zb3VyY2UvbGlidnB4IC1vICR7T0JKRUNUX0ZJTEVfRElSX25vcm1hbH0vJHtDVVJSRU5UX0FS Q0h9LyR7SU5QVVRfRklMRV9CQVNFfS5vICR7SU5QVVRfRklMRV9ESVJ9LyR7SU5QVVRfRklMRV9C QVNFfS5hc21cbiI7CisJCQlzY3JpcHQgPSAiJHtCVUlMVF9QUk9EVUNUU19ESVJ9L3lhc20gLWZt YWNobzY0IC1JICR7U1JDUk9PVH0vU291cmNlL3RoaXJkX3BhcnR5L2xpYnZweC9zb3VyY2UvY29u ZmlnIC1JICR7U1JDUk9PVH0vU291cmNlL3RoaXJkX3BhcnR5L2xpYnZweC9zb3VyY2UvY29uZmln L21hYy94NjQgLUkgJHtTUkNST09UfS9Tb3VyY2UvdGhpcmRfcGFydHkvbGlidnB4L3NvdXJjZS9s aWJ2cHggLW8gJHtPQkpFQ1RfRklMRV9ESVJfbm9ybWFsfS8ke0NVUlJFTlRfQVJDSH0vJHtJTlBV VF9GSUxFX0JBU0V9Lm8gJHtJTlBVVF9GSUxFX0RJUn0vJHtJTlBVVF9GSUxFX0JBU0V9LmFzbVxu IjsKIAkJfTsKIC8qIEVuZCBQQlhCdWlsZFJ1bGUgc2VjdGlvbiAqLwogCkBAIC0zNTYzLDEzICsz NTYzLDYgQEAKIAkJCXJlbW90ZUdsb2JhbElEU3RyaW5nID0gNDEwNUVCNjkyMTJFMDFEMjAwOEMw QzIwOwogCQkJcmVtb3RlSW5mbyA9IGxpYnZweDsKIAkJfTsKLQkJNDFCRTcxNzMyMTVCRjQyMzAw QTdCMTk2IC8qIFBCWENvbnRhaW5lckl0ZW1Qcm94eSAqLyA9IHsKLQkJCWlzYSA9IFBCWENvbnRh aW5lckl0ZW1Qcm94eTsKLQkJCWNvbnRhaW5lclBvcnRhbCA9IEZCMzlEMDcwMTIwMEVEOTIwMDA4 OEU2OSAvKiBQcm9qZWN0IG9iamVjdCAqLzsKLQkJCXByb3h5VHlwZSA9IDE7Ci0JCQlyZW1vdGVH bG9iYWxJRFN0cmluZyA9IDQxRjc3RDE1MjE1QkU0NUUwMEU3Mjk2NzsKLQkJCXJlbW90ZUluZm8g PSB5YXNtOwotCQl9OwogCQk1QzA4ODQ4RDFFNEE5N0UzMDA0MDM5OTUgLyogUEJYQ29udGFpbmVy SXRlbVByb3h5ICovID0gewogCQkJaXNhID0gUEJYQ29udGFpbmVySXRlbVByb3h5OwogCQkJY29u dGFpbmVyUG9ydGFsID0gRkIzOUQwNzAxMjAwRUQ5MjAwMDg4RTY5IC8qIFByb2plY3Qgb2JqZWN0 ICovOwpAQCAtMTU2NzksNiArMTU2NzIsNyBAQAogCQkJaXNhID0gUEJYTmF0aXZlVGFyZ2V0Owog CQkJYnVpbGRDb25maWd1cmF0aW9uTGlzdCA9IDQxMDVFQjdGMjEyRTAxRDIwMDhDMEMyMCAvKiBC dWlsZCBjb25maWd1cmF0aW9uIGxpc3QgZm9yIFBCWE5hdGl2ZVRhcmdldCAidnB4IiAqLzsKIAkJ CWJ1aWxkUGhhc2VzID0gKAorCQkJCTUzOTA4QkMxMjNBQUYyMjQwMDNFQUNDNyAvKiBCdWlsZCB5 YXNtIGZvciBtYWNPUyAqLywKIAkJCQk0MTA1RUI2QzIxMkUwMUQyMDA4QzBDMjAgLyogSGVhZGVy cyAqLywKIAkJCQk0MTA1RUI3NDIxMkUwMUQyMDA4QzBDMjAgLyogU291cmNlcyAqLywKIAkJCQk0 MTA1RUI3QzIxMkUwMUQyMDA4QzBDMjAgLyogRnJhbWV3b3JrcyAqLywKQEAgLTE1Njg5LDcgKzE1 NjgzLDYgQEAKIAkJCQk0MUNCMEE1NzIxNUM4RTA2MDA5N0I4QUEgLyogUEJYQnVpbGRSdWxlICov LAogCQkJKTsKIAkJCWRlcGVuZGVuY2llcyA9ICgKLQkJCQk0MUJFNzE3NDIxNUJGNDIzMDBBN0Ix OTYgLyogUEJYVGFyZ2V0RGVwZW5kZW5jeSAqLywKIAkJCQk0MTA1RUI2QTIxMkUwMUQyMDA4QzBD MjAgLyogUEJYVGFyZ2V0RGVwZW5kZW5jeSAqLywKIAkJCSk7CiAJCQluYW1lID0gdnB4OwpAQCAt MTU5MzEsNiArMTU5MjQsMjUgQEAKIAkJCXNoZWxsUGF0aCA9IC9iaW4vc2g7CiAJCQlzaGVsbFNj cmlwdCA9ICJpZiBbIFwiJHtBQ1RJT059XCIgPSBcImluc3RhbGxoZHJzXCIgLW8gXCIke0FDVElP Tn1cIiA9IFwiaW5zdGFsbGFwaVwiIF07IHRoZW5cbiAgICBleGl0IDA7XG5maVxuXG5pZiBbIC1m IC4uLy4uLy4uL1Rvb2xzL1NjcmlwdHMvY2hlY2stZm9yLWluYXBwcm9wcmlhdGUtb2JqYy1jbGFz cy1uYW1lcyBdOyB0aGVuXG4gICAgLi4vLi4vLi4vVG9vbHMvU2NyaXB0cy9jaGVjay1mb3ItaW5h cHByb3ByaWF0ZS1vYmpjLWNsYXNzLW5hbWVzIFdLX1JUQyB8fCBleGl0ICQ/XG5maVxuIjsKIAkJ fTsKKwkJNTM5MDhCQzEyM0FBRjIyNDAwM0VBQ0M3IC8qIEJ1aWxkIHlhc20gZm9yIG1hY09TICov ID0geworCQkJaXNhID0gUEJYU2hlbGxTY3JpcHRCdWlsZFBoYXNlOworCQkJYnVpbGRBY3Rpb25N YXNrID0gMjE0NzQ4MzY0NzsKKwkJCWZpbGVzID0gKAorCQkJKTsKKwkJCWlucHV0RmlsZUxpc3RQ YXRocyA9ICgKKwkJCSk7CisJCQlpbnB1dFBhdGhzID0gKAorCQkJKTsKKwkJCW5hbWUgPSAiQnVp bGQgeWFzbSBmb3IgbWFjT1MiOworCQkJb3V0cHV0RmlsZUxpc3RQYXRocyA9ICgKKwkJCSk7CisJ CQlvdXRwdXRQYXRocyA9ICgKKwkJCQkiJHtCVUlMVF9QUk9EVUNUU19ESVJ9L3lhc20iLAorCQkJ KTsKKwkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOworCQkJc2hlbGxQ YXRoID0gL2Jpbi9iYXNoOworCQkJc2hlbGxTY3JpcHQgPSAiQVJHUz0oXG4gICAgLXByb2plY3Qg XCIke1BST0pFQ1RfRklMRV9QQVRIfVwiXG4gICAgLXRhcmdldCB5YXNtXG4gICAgLXNkayBtYWNv c3hcbiAgICAtYXJjaCBcIiR7TkFUSVZFX0FSQ0hfQUNUVUFMfVwiXG4gICAgLWNvbmZpZ3VyYXRp b24gUmVsZWFzZVxuICAgIE9CSlJPT1Q9JHtQUk9KRUNUX1RFTVBfRElSfS9CdWlsZF95YXNtL0lu dGVybWVkaWF0ZXMubm9pbmRleFxuICAgIFNZTVJPT1Q9JHtQUk9KRUNUX1RFTVBfRElSfS9CdWls ZF95YXNtL1Byb2R1Y3RzXG4gKVxuXG54Y29kZWJ1aWxkIFwiJHtBUkdTW0BdfVwiXG5cbllBU01f UEFUSD0kKHhjb2RlYnVpbGQgXCIke0FSR1NbQF19XCIgLXNob3dCdWlsZFNldHRpbmdzIHwgZ3Jl cCAtdyBCVUlMVF9QUk9EVUNUU19ESVIgfCBzZWQgLUVlICdzL1tePV0qID0gKC4qKS9cXDEvJylc bllBU01fTkFNRT0kKHhjb2RlYnVpbGQgXCIke0FSR1NbQF19XCIgLXNob3dCdWlsZFNldHRpbmdz IHwgZ3JlcCAtdyBFWEVDVVRBQkxFX05BTUUgfCBzZWQgLUVlICdzL1tePV0qID0gKC4qKS9cXDEv JylcblxuU1JDPVwiJHtZQVNNX1BBVEh9LyR7WUFTTV9OQU1FfVwiXG5ERVNUPVwiJHtCVUlMVF9Q Uk9EVUNUU19ESVJ9L3lhc21cIlxuXG5bWyAtZSBcIiR7U1JDfVwiIF1dIHx8IGV4aXQgMVxuW1sg LWUgXCIke0RFU1R9XCIgXV0gJiYgeyBjbXAgXCIke1NSQ31cIiBcIiR7REVTVH1cIiAmJiBleGl0 IDA7IH1cbmNwIFwiJHtTUkN9XCIgXCIke0RFU1R9XCIgfHwgZXhpdCAxXG5cbmV4aXQgMFxuIjsK KwkJfTsKIAkJNUM2M0Y2NjYxRTQxNEFCQTAwMkNBNTMxIC8qIFNoZWxsU2NyaXB0ICovID0gewog CQkJaXNhID0gUEJYU2hlbGxTY3JpcHRCdWlsZFBoYXNlOwogCQkJYnVpbGRBY3Rpb25NYXNrID0g MjE0NzQ4MzY0NzsKQEAgLTE3OTk3LDExICsxODAwOSw2IEBACiAJCQl0YXJnZXQgPSA0MTA1RUI2 OTIxMkUwMUQyMDA4QzBDMjAgLyogdnB4ICovOwogCQkJdGFyZ2V0UHJveHkgPSA0MTFFRDAzRjIx MkUwODExMDA0MzIwQkEgLyogUEJYQ29udGFpbmVySXRlbVByb3h5ICovOwogCQl9OwotCQk0MUJF NzE3NDIxNUJGNDIzMDBBN0IxOTYgLyogUEJYVGFyZ2V0RGVwZW5kZW5jeSAqLyA9IHsKLQkJCWlz YSA9IFBCWFRhcmdldERlcGVuZGVuY3k7Ci0JCQl0YXJnZXQgPSA0MUY3N0QxNTIxNUJFNDVFMDBF NzI5NjcgLyogeWFzbSAqLzsKLQkJCXRhcmdldFByb3h5ID0gNDFCRTcxNzMyMTVCRjQyMzAwQTdC MTk2IC8qIFBCWENvbnRhaW5lckl0ZW1Qcm94eSAqLzsKLQkJfTsKIAkJNUMwODg0OEMxRTRBOTdF MzAwNDAzOTk1IC8qIFBCWFRhcmdldERlcGVuZGVuY3kgKi8gPSB7CiAJCQlpc2EgPSBQQlhUYXJn ZXREZXBlbmRlbmN5OwogCQkJdGFyZ2V0ID0gNUM2M0Y2NjExRTQxNEFCNjAwMkNBNTMxIC8qIENv cHkgd2VicnRjIGhlYWRlcnMgKi87Cg==