210292 2020-04-09 11:06:13 -0700 [Flatpak SDK] Flatpak build broken when using 'git config core.webkitbranchbuild=true' 2020-04-10 04:07:11 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build PC Linux RESOLVED FIXED InRadar P2 Blocker --- 1 zimmermann pnormand ews-watchlist jbedard pnormand webkit-bug-importer zan oldest_to_newest 1639726 0 zimmermann 2020-04-09 11:06:13 -0700 The baseProductDir() contains the git branch name WebKitBuild/my_branch if that option is activated. The flatpak detection assumes that $baseProductDir/UserFlatpak holds the Flatpak data, that is no longer true within this setup. Let's think about how to fix this :-) 1640099 1 396072 pnormand 2020-04-10 03:29:14 -0700 Created attachment 396072 Patch 1640118 2 pnormand 2020-04-10 04:07:00 -0700 Committed r259864: <https://trac.webkit.org/changeset/259864> 1640119 3 webkit-bug-importer 2020-04-10 04:07:11 -0700 <rdar://problem/61577164> 396072 2020-04-10 03:29:14 -0700 2020-04-10 03:42:26 -0700 Patch bug-210292-20200410112913.patch text/plain 3970 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5ODUxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODAyYTJmNjM3NjAxYmYwODg2ZWQzOGY1OGZlOTI0ZDUw ZmRjY2Y3Mi4uZTEwYTM2MjM2YWRmYmVkODY1Zjk5N2M0ZWJmNjA5MWFmMWI5OGFmYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDIwLTA0LTEwICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIEZsYXRwYWsgYnVpbGQgYnJva2VuIHdoZW4gdXNpbmcg J2dpdCBjb25maWcgY29yZS53ZWJraXRicmFuY2hidWlsZD10cnVlJworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwMjkyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06 CisgICAgICAgIChnZXRVc2VyRmxhdHBha1BhdGgpOiBFbnN1cmUgd2UgcHJvYmUgZm9yIFVzZXJG bGF0cGFrIGFsd2F5cyBpbgorICAgICAgICBXZWJLaXRCdWlsZCwgd2V0aGVyIHdlJ3JlIGRvaW5n IGEgImdpdCBicmFuY2giIGJ1aWxkIG9yIG5vdC4KKyAgICAgICAgKiBmbGF0cGFrL2ZsYXRwYWt1 dGlscy5weToKKyAgICAgICAgKFdlYmtpdEZsYXRwYWsuaXNfYnJhbmNoX2J1aWxkKToKKyAgICAg ICAgKFdlYmtpdEZsYXRwYWsucnVuX2luX3NhbmRib3gpOiBNYWtlIGFuZCBiaW5kLW1vdW50IGRl ZmF1bHQgYnVpbGQKKyAgICAgICAgZGlyZWN0b3J5IG9ubHkgd2hlbiBub3QgZG9pbmcgImdpdCBi cmFuY2giIGJ1aWxkcy4KKwogMjAyMC0wNC0wOCAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5j b20+CiAKICAgICAgICAgW0NvY29hXSBTaW1wbGlmeSBOU0FycmF5LCBOU0RpY3Rpb25hcnksIGFu ZCBOU051bWJlciBpZGlvbXMgdGhyb3VnaG91dCBXZWJLaXQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCA1 MDM2NDJhNzhkNjE0MTIxYjIyYjUzNWMzMzBmYzE5OWMyMjJlMmE3Li4wOGRkMTJlY2I5YWU5ZGVm ZGQyMjY4YzJhYTYyZTRjMmZiMGUyYmVlIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0yMDUyLDcgKzIw NTIsMTIgQEAgc3ViIGdldEpoYnVpbGRQYXRoKCkKIAogc3ViIGdldFVzZXJGbGF0cGFrUGF0aCgp CiB7Ci0gICAgbXkgQGZsYXRwYWtQYXRoID0gRmlsZTo6U3BlYy0+c3BsaXRkaXIoYmFzZVByb2R1 Y3REaXIoKSk7CisgICAgbXkgJHByb2R1Y3REaXIgPSBiYXNlUHJvZHVjdERpcigpOworICAgIGlm IChpc0dpdCgpICYmIGlzR2l0QnJhbmNoQnVpbGQoKSAmJiBnaXRCcmFuY2goKSkgeworICAgICAg ICBteSAkYnJhbmNoID0gZ2l0QnJhbmNoKCk7CisgICAgICAgICRwcm9kdWN0RGlyID1+IHMvJGJy YW5jaC8vOworICAgIH0KKyAgICBteSBAZmxhdHBha1BhdGggPSBGaWxlOjpTcGVjLT5zcGxpdGRp cigkcHJvZHVjdERpcik7CiAgICAgcHVzaChAZmxhdHBha1BhdGgsICJVc2VyRmxhdHBhayIpOwog ICAgIHJldHVybiBGaWxlOjpTcGVjLT5jYXRkaXIoQGZsYXRwYWtQYXRoKTsKIH0KZGlmZiAtLWdp dCBhL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5IGIvVG9vbHMvZmxhdHBhay9mbGF0cGFr dXRpbHMucHkKaW5kZXggNzI3NzY5ZjNjODYzZWI4YjNjOTZjNDFmYTc4YmE1ZDcxZmExOGZhMy4u N2Y5NDY1ZWI2YjM3ZThhMDY0YWM2ZjVlZDBjMjgxNjU0NjgyZmE1OCAxMDA2NDQKLS0tIGEvVG9v bHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkKKysrIGIvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRp bHMucHkKQEAgLTUzOCw2ICs1MzgsMTkgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKIAogICAgICAg ICByZXR1cm4gW29zLnBhdGguam9pbihnc3RfZGlyLCAnZ3N0LWVudi5weScpLCAnLS1idWlsZGRp cicsIGdzdF9idWlsZGRpciwgJy0tc3JjZGlyJywgZ3N0X2Rpcl0KIAorICAgIGRlZiBpc19icmFu Y2hfYnVpbGQoc2VsZik6CisgICAgICAgIGdpdF9icmFuY2hfbmFtZSA9IHN1YnByb2Nlc3MuY2hl Y2tfb3V0cHV0KCgiZ2l0IiwgInJldi1wYXJzZSIsICItLWFiYnJldi1yZWYiLCAiSEVBRCIpKS5k ZWNvZGUoInV0Zi04Iikuc3RyaXAoKQorICAgICAgICBmb3Igb3B0aW9uX25hbWUgaW4gKCJicmFu Y2guJXMud2ViS2l0QnJhbmNoQnVpbGQiICUgZ2l0X2JyYW5jaF9uYW1lLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICJ3ZWJLaXRCcmFuY2hCdWlsZCIpOgorICAgICAgICAgICAgdHJ5Ogor ICAgICAgICAgICAgICAgIG91dHB1dCA9IHN1YnByb2Nlc3MuY2hlY2tfb3V0cHV0KCgiZ2l0Iiwg ImNvbmZpZyIsICItLWJvb2wiLCBvcHRpb25fbmFtZSkpLnN0cmlwKCkKKyAgICAgICAgICAgIGV4 Y2VwdCBzdWJwcm9jZXNzLkNhbGxlZFByb2Nlc3NFcnJvcjoKKyAgICAgICAgICAgICAgICBjb250 aW51ZQorCisgICAgICAgICAgICBpZiBvdXRwdXQgPT0gInRydWUiOgorICAgICAgICAgICAgICAg IHJldHVybiBUcnVlCisgICAgICAgIHJldHVybiBGYWxzZQorCiAgICAgZGVmIHJ1bl9pbl9zYW5k Ym94KHNlbGYsICphcmdzLCAqKmt3YXJncyk6CiAgICAgICAgIHNlbGYuc2V0dXBfYnVpbGRkaXIo c3Rkb3V0PWt3YXJncy5nZXQoInN0ZG91dCIsIHN5cy5zdGRvdXQpKQogICAgICAgICBjd2QgPSBr d2FyZ3MucG9wKCJjd2QiLCBOb25lKQpAQCAtNTc3LDcgKzU5MCw3IEBAIGNsYXNzIFdlYmtpdEZs YXRwYWs6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAiLS1iaW5kLW1vdW50PS9ydW4vc3lz dGVtZC9qb3VybmFsPS9ydW4vc3lzdGVtZC9qb3VybmFsIiwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICItLWJpbmQtbW91bnQ9JXM9JXMiICUgKHNlbGYuc2FuZGJveF9zb3VyY2Vfcm9vdCwg c2VsZi5zb3VyY2Vfcm9vdCldCiAKLSAgICAgICAgaWYgYXJncyBhbmQgYXJnc1swXS5lbmRzd2l0 aCgiYnVpbGQtd2Via2l0Iik6CisgICAgICAgIGlmIGFyZ3MgYW5kIGFyZ3NbMF0uZW5kc3dpdGgo ImJ1aWxkLXdlYmtpdCIpIGFuZCBub3Qgc2VsZi5pc19icmFuY2hfYnVpbGQoKToKICAgICAgICAg ICAgICMgRW5zdXJlIHNlbGYuYnVpbGRfcGF0aCBleGlzdHMuCiAgICAgICAgICAgICB0cnk6CiAg ICAgICAgICAgICAgICAgb3MubWFrZWRpcnMoc2VsZi5idWlsZF9wYXRoKQpAQCAtNTg3LDggKzYw MCw5IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAKICAgICAgICAgIyBXZSBtb3VudCBXZWJLaXRC dWlsZC9QT1JUTkFNRS9CdWlsZFR5cGUgdG8gL2FwcC93ZWJraXQvV2ViS2l0QnVpbGQvQnVpbGRU eXBlCiAgICAgICAgICMgc28gd2UgY2FuIGJ1aWxkIFdQRSBhbmQgR1RLIGluIGEgc2FtZSBzb3Vy Y2UgdHJlZS4KLSAgICAgICAgIyBUaGUgYmluZC1tb3VudCBpcyBhbHdheXMgbmVlZGVkLCBub3Qg b25seSB3aGVuIHJ1bm5pbmcgYnVpbGQtd2Via2l0LgotICAgICAgICBmbGF0cGFrX2NvbW1hbmQu YXBwZW5kKCItLWJpbmQtbW91bnQ9JXM9JXMiICUgKHNhbmRib3hfYnVpbGRfcGF0aCwgc2VsZi5i dWlsZF9wYXRoKSkKKyAgICAgICAgIyBUaGUgYmluZC1tb3VudCBpcyBhbHdheXMgbmVlZGVkLCBl eGNlcHRlZCBkdXJpbmcgdGhlIGluaXRpYWwgc2V0dXAgKFNESyBpbnN0YWxsL3VwZGF0ZXMpLgor ICAgICAgICBpZiBvcy5wYXRoLmlzZGlyKHNlbGYuYnVpbGRfcGF0aCk6CisgICAgICAgICAgICBm bGF0cGFrX2NvbW1hbmQuYXBwZW5kKCItLWJpbmQtbW91bnQ9JXM9JXMiICUgKHNhbmRib3hfYnVp bGRfcGF0aCwgc2VsZi5idWlsZF9wYXRoKSkKIAogICAgICAgICBmb3J3YXJkZWQgPSB7CiAgICAg ICAgICAgICAiV0VCS0lUX1RPUF9MRVZFTCI6ICIvYXBwLyIsCg==