[PATCH] bitbake-setup: support --update-bb-conf on init and fix site.conf symlink for setup-dir == top-dir #bitbake #yocto

--0000000000002f272006559786aa
Content-Type: text/plain; charset="UTF-8"



--0000000000002f272006559786aa
Content-Type: text/x-patch; charset="US-ASCII"; 
	name="0001-bitbake-setup-support-update-bb-conf-on-init-and-fix.patch"
Content-Disposition: attachment; 
	filename="0001-bitbake-setup-support-update-bb-conf-on-init-and-fix.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_mr2vo45r0>
X-Attachment-Id: f_mr2vo45r0

RnJvbSA0NzI4YzY5ZDY4MjQ1MWIxYjUwOTMwY2NiMzdkYWVkY2ZkMTJmZTgzIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBEYW5pZWwgQ2hhdmVzIDxkY2h2czExQGdtYWlsLmNvbT4KRGF0
ZTogV2VkLCAxIEp1bCAyMDI2IDIwOjAxOjQ2IC0wNjAwClN1YmplY3Q6IFtQQVRDSF0gYml0YmFr
ZS1zZXR1cDogc3VwcG9ydCAtLXVwZGF0ZS1iYi1jb25mIG9uIGluaXQgYW5kIGZpeAogc2l0ZS5j
b25mIGZvciBzZXR1cC1kaXIgPT0gdG9wLWRpcgoKVHdvIGZpeGVzIHRoYXQgd29yayB0b2dldGhl
ciB0byBsZXQgYGJpdGJha2Utc2V0dXAgaW5pdGAgcHJlc2VydmUgYW4KZXhpc3RpbmcgYml0YmFr
ZSBidWlsZCBjb25maWd1cmF0aW9uIChsb2NhbC5jb25mLCBiYmxheWVycy5jb25mKToKCjEuIEV4
cG9zZSB0aGUgZXhpc3RpbmcgYHVwZGF0ZV9iYl9jb25mYCBwYXJhbWV0ZXIgdGhyb3VnaCBhIG5l
dwogICBgLS11cGRhdGUtYmItY29uZmAgQ0xJIGZsYWcgb24gYGluaXRgLCBtYXRjaGluZyB0aGUg
c2VtYW50aWNzIG9mCiAgIGBiaXRiYWtlLXNldHVwIHVwZGF0ZWAuIFRoaXMgbGV0cyBkb3duc3Ry
ZWFtIHByb2plY3RzIHJlLXJ1biBpbml0CiAgIChlLmcuLCB0byByZWZyZXNoIGxheWVycyB2aWEg
LS1zb3VyY2Utb3ZlcnJpZGVzKSB3aXRob3V0IGxvc2luZwogICB0aGVpciB0cmFja2VkIGNvbmYg
ZmlsZXMuIERlZmF1bHQgcmVtYWlucyAieWVzIiBmb3IgYmFja3dhcmQKICAgY29tcGF0aWJpbGl0
eS4KCjIuIEZpeCB0aGUgc2l0ZS5jb25mIHN5bWxpbmsgdGFyZ2V0IHdoZW4gdGhlIHNldHVwIGRp
cmVjdG9yeSBpcyB0aGUKICAgc2FtZSBhcyB0aGUgdG9wIGRpcmVjdG9yeS4gVGhlIHN5bWxpbmsg
dGFyZ2V0IHdhcyBhbHdheXMgY29tcHV0ZWQKICAgYXMgYHNldHVwZGlyLy4uL3NpdGUuY29uZmAs
IHdoaWNoIG9ubHkgbWF0Y2hlcyB0aGUgYWN0dWFsIHNpdGUuY29uZgogICBsb2NhdGlvbiAodG9w
X2Rpci9zaXRlLmNvbmYpIHdoZW4gdGhlIHNldHVwIGRpcmVjdG9yeSBpcyBleGFjdGx5CiAgIG9u
ZSBsZXZlbCBiZWxvdyB0aGUgdG9wIGRpcmVjdG9yeS4gV2hlbiBgLS1zZXR1cC1kaXItbmFtZWAg
aXMgZ2l2ZW4KICAgYW4gYWJzb2x1dGUgcGF0aCBlcXVhbCB0byB0aGUgdG9wIGRpcmVjdG9yeSwg
dGhlIHN5bWxpbmsgZW5kcyB1cAogICBicm9rZW4sIHdoaWNoIGNhdXNlcyBgZGlmZiAtdU5yYCB0
byBmYWlsIHdpdGggZXhpdCBjb2RlIDIgaW5zaWRlCiAgIHNldHVwX2JpdGJha2VfYnVpbGQoKS4g
VGhhdCBleGNlcHRpb24gaXMgcmFpc2VkIGJlZm9yZSB0aGUKICAgYHVwZGF0ZV9iYl9jb25mID09
ICdubydgIGJyYW5jaCBjYW4gcmVzdG9yZSB0aGUgb3JpZ2luYWwgY29uZiwKICAgZGVmZWF0aW5n
IHRoZSBuZXcgZmxhZyBmcm9tICMxLgoKVG9nZXRoZXIsIHRoZXNlIGNoYW5nZXMgbWFrZSBgYml0
YmFrZS1zZXR1cCBpbml0IC0tdXBkYXRlLWJiLWNvbmY9bm9gCmJlaGF2ZSBsaWtlIFlvY3RvJ3Mg
YG9lLWluaXQtYnVpbGQtZW52YDogdGhlIGJ1aWxkIGVudmlyb25tZW50IGlzCnByZXNlcnZlZCBh
Y3Jvc3MgcmUtaW5pdGlhbGl6YXRpb25zLgoKU2lnbmVkLW9mZi1ieTogRGFuaWVsIENoYXZlcyA8
ZGNodnMxMUBnbWFpbC5jb20+Ci0tLQogYmluL2JpdGJha2Utc2V0dXAgfCA5ICsrKysrKystLQog
MSBmaWxlIGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n
aXQgYS9iaW4vYml0YmFrZS1zZXR1cCBiL2Jpbi9iaXRiYWtlLXNldHVwCmluZGV4IDk3ZWEwOGQx
MS4uOWE1OWE1YWFhIDEwMDc1NQotLS0gYS9iaW4vYml0YmFrZS1zZXR1cAorKysgYi9iaW4vYml0
YmFrZS1zZXR1cApAQCAtMzcxLDcgKzM3MSwxMCBAQCBkZWYgc2V0dXBfYml0YmFrZV9idWlsZChi
aXRiYWtlX2NvbmZpZywgbGF5ZXJkaXIsIHNldHVwZGlyLCB0aGlzZGlyLCB1cGRhdGVfYmJfYwog
ICAgIF9wcmVwZW5kX3Bhc3N0aHJvdWdoX3RvX2luaXRfYnVpbGRfZW52KGJpdGJha2VfYnVpbGRk
aXIpCiAKICAgICBzaXRlY29uZl9zeW1saW5rID0gb3MucGF0aC5qb2luKGJpdGJha2VfY29uZmRp
ciwgInNpdGUuY29uZiIpCi0gICAgc2l0ZWNvbmYgPSBvcy5wYXRoLm5vcm1wYXRoKG9zLnBhdGgu
am9pbihzZXR1cGRpciwgJy4uJywgInNpdGUuY29uZiIpKQorICAgIGlmIG9zLnBhdGguZXhpc3Rz
KG9zLnBhdGguam9pbihzZXR1cGRpciwgInNpdGUuY29uZiIpKToKKyAgICAgICAgc2l0ZWNvbmYg
PSBvcy5wYXRoLmpvaW4oc2V0dXBkaXIsICJzaXRlLmNvbmYiKQorICAgIGVsc2U6CisgICAgICAg
IHNpdGVjb25mID0gb3MucGF0aC5ub3JtcGF0aChvcy5wYXRoLmpvaW4oc2V0dXBkaXIsICcuLics
ICJzaXRlLmNvbmYiKSkKICAgICBpZiBvcy5wYXRoLmxleGlzdHMoc2l0ZWNvbmZfc3ltbGluayk6
CiAgICAgICAgIG9zLnJlbW92ZShzaXRlY29uZl9zeW1saW5rKQogICAgIG9zLnN5bWxpbmsob3Mu
cGF0aC5yZWxwYXRoKHNpdGVjb25mLCBiaXRiYWtlX2NvbmZkaXIpLCBzaXRlY29uZl9zeW1saW5r
KQpAQCAtODcwLDcgKzg3Myw3IEBAIGRlZiBpbml0X2NvbmZpZyh0b3BfZGlyLCBzZXR0aW5ncywg
YXJncyk6CiAgICAgYmIuZXZlbnQucmVnaXN0ZXIoImJiLmJ1aWxkLlRhc2tQcm9ncmVzcyIsIGhh
bmRsZV90YXNrX3Byb2dyZXNzLCBkYXRhPWQpCiAKICAgICB3cml0ZV91cHN0cmVhbV9jb25maWco
Y29uZmRpciwgdXBzdHJlYW1fY29uZmlnKQotICAgIHVwZGF0ZV9idWlsZCh1cHN0cmVhbV9jb25m
aWcsIGNvbmZkaXIsIHNldHVwZGlyLCBsYXllcmRpciwgZCwgdXBkYXRlX2JiX2NvbmY9InllcyIs
IGluaXRfdnNjb2RlPWFyZ3MuaW5pdF92c2NvZGUpCisgICAgdXBkYXRlX2J1aWxkKHVwc3RyZWFt
X2NvbmZpZywgY29uZmRpciwgc2V0dXBkaXIsIGxheWVyZGlyLCBkLCB1cGRhdGVfYmJfY29uZj1h
cmdzLnVwZGF0ZV9iYl9jb25mLCBpbml0X3ZzY29kZT1hcmdzLmluaXRfdnNjb2RlKQogCiAgICAg
YmIuZXZlbnQucmVtb3ZlKCJiYi5idWlsZC5UYXNrUHJvZ3Jlc3MiLCBOb25lKQogCkBAIC0xMjY4
LDYgKzEyNzEsOCBAQCBkZWYgbWFpbigpOgogICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0n
U3ltbGluayBsb2NhbCBzb3VyY2UgaW50byBhIGJ1aWxkLCBpbnN0ZWFkIG9mIGdldHRpbmcgaXQg
YXMgcHJlc2NyaWJlZCBieSBhIGNvbmZpZ3VyYXRpb24gKHVzZWZ1bCBmb3IgbG9jYWwgZGV2ZWxv
cG1lbnQpLicpCiAgICAgcGFyc2VyX2luaXQuYWRkX2FyZ3VtZW50KCctLWluaXQtdnNjb2RlJywg
YWN0aW9uPWFyZ3BhcnNlLkJvb2xlYW5PcHRpb25hbEFjdGlvbiwgZGVmYXVsdD1ib29sKHNodXRp
bC53aGljaCgnY29kZScpKSwKICAgICAgICAgICAgICAgICAgICAgICAgIGhlbHA9J0dlbmVyYXRl
IFZTQ29kZSB3b3Jrc3BhY2UgY29uZmlndXJhdGlvbiAoZGVmYXVsdDogJShkZWZhdWx0KXMpJykK
KyAgICBwYXJzZXJfaW5pdC5hZGRfYXJndW1lbnQoJy0tdXBkYXRlLWJiLWNvbmYnLCBjaG9pY2Vz
PVsncHJvbXB0JywgJ3llcycsICdubyddLCBkZWZhdWx0PSd5ZXMnLAorICAgICAgICAgICAgICAg
ICAgICAgICAgaGVscD0nVXBkYXRlIGJpdGJha2UgY29uZmlndXJhdGlvbiBmaWxlcyAoYmJsYXll
cnMuY29uZiwgbG9jYWwuY29uZikgd2hlbiByZS1pbml0aWFsaXppbmcgYW4gZXhpc3Rpbmcgc2V0
dXAgKGRlZmF1bHQ6ICUoZGVmYXVsdClzKScpCiAgICAgcGFyc2VyX2luaXQuc2V0X2RlZmF1bHRz
KGZ1bmM9aW5pdF9jb25maWcpCiAKICAgICBwYXJzZXJfc3RhdHVzID0gc3VicGFyc2Vycy5hZGRf
cGFyc2VyKCdzdGF0dXMnLCBoZWxwPSdDaGVjayBpZiB0aGUgc2V0dXAgbmVlZHMgdG8gYmUgc3lu
Y2hyb25pemVkIHdpdGggY29uZmlndXJhdGlvbicpCg==

--0000000000002f272006559786aa--