12751 2018-05-15 11:23:41 +0000 Rocko needs backport of custom.xml issue (bug 12554) 2018-06-14 15:14:24 +0000 1 1 7 Build System, Metadata & Runtime Toaster toaster 2.5 x86 Multiple RESOLVED FIXED Medium+ normal 2.4.3 1 david.reyna david.reyna jessica.zhang richard.purdie stanciux.mihail toaster --- --- No (bug/feature does not impact docs) oldest_to_newest 80588 0 4302 david.reyna 2018-05-15 11:23:41 +0000 Created attachment 4302 Fixed checksetting file 1. Rocko needs the patch from bug 12554, which was only applied to master/sumo. 2. Here is the workaround Copy the attached file to "bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py" 3. Here is the patch: diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py b/bitbake/lib/toaster/bldcontrol/management/commands/checks index 582114a..823c6f1 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py @@ -107,7 +107,10 @@ class Command(BaseCommand): action="ignore", message="^.*No fixture named.*$") print("Importing custom settings if present") - call_command("loaddata", "custom") + try: + call_command("loaddata", "custom") + except: + print("NOTE: optional fixture 'custom' not found") # we run lsupdates after config update print("\nFetching information from the layer index, " 80795 1 richard.purdie 2018-06-14 15:14:24 +0000 http://git.yoctoproject.org/cgit.cgi/poky/commit/?h=rocko&id=9c3da34ec6c2c9a9abc30c72d6a8f9b996250862 4302 2018-05-15 11:23:41 +0000 2018-05-15 11:23:41 +0000 Fixed checksetting file checksettings.py application/octet-stream 7212 david.reyna ZnJvbSBkamFuZ28uY29yZS5tYW5hZ2VtZW50LmJhc2UgaW1wb3J0IEJhc2VDb21tYW5kLCBDb21t YW5kRXJyb3IKZnJvbSBkamFuZ28uZGIgaW1wb3J0IHRyYW5zYWN0aW9uCgpmcm9tIGRqYW5nby5j b3JlLm1hbmFnZW1lbnQgaW1wb3J0IGNhbGxfY29tbWFuZApmcm9tIGJsZGNvbnRyb2wuYmJjb250 cm9sbGVyIGltcG9ydCBnZXRCdWlsZEVudmlyb25tZW50Q29udHJvbGxlciwgU2hlbGxDbWRFeGNl cHRpb24KZnJvbSBibGRjb250cm9sLm1vZGVscyBpbXBvcnQgQnVpbGRSZXF1ZXN0LCBCdWlsZEVu dmlyb25tZW50LCBCUkVycm9yCmZyb20gb3JtLm1vZGVscyBpbXBvcnQgVG9hc3RlclNldHRpbmcs IEJ1aWxkLCBMYXllcgoKaW1wb3J0IG9zCmltcG9ydCB0cmFjZWJhY2sKaW1wb3J0IHdhcm5pbmdz CgoKZGVmIEROKHBhdGgpOgogICAgaWYgcGF0aCBpcyBOb25lOgogICAgICAgIHJldHVybiAiIgog ICAgZWxzZToKICAgICAgICByZXR1cm4gb3MucGF0aC5kaXJuYW1lKHBhdGgpCgoKY2xhc3MgQ29t bWFuZChCYXNlQ29tbWFuZCk6CiAgICBhcmdzID0gIiIKICAgIGhlbHAgPSAiVmVyaWZpZXMgdGhh dCB0aGUgY29uZmlndXJlZCBzZXR0aW5ncyBhcmUgdmFsaWQgYW5kIHVzYWJsZSwgb3IgcHJvbXB0 cyB0aGUgdXNlciB0byBmaXggdGhlIHNldHRpbmdzLiIKCiAgICBkZWYgX19pbml0X18oc2VsZiwg KmFyZ3MsICoqa3dhcmdzKToKICAgICAgICBzdXBlcihDb21tYW5kLCBzZWxmKS5fX2luaXRfXygq YXJncywgKiprd2FyZ3MpCiAgICAgICAgc2VsZi5ndWVzc3BhdGggPSBETihETihETihETihETihE TihETihfX2ZpbGVfXykpKSkpKSkKCiAgICBkZWYgX3ZlcmlmeV9idWlsZF9lbnZpcm9ubWVudChz ZWxmKToKICAgICAgICAjIHByb3ZpZGUgYSBsb2NhbCBidWlsZCBlbnYuIFRoaXMgd2lsbCBiZSBl eHRlbmRlZCBsYXRlciB0byBpbmNsdWRlIG5vbiBsb2NhbAogICAgICAgIGlmIEJ1aWxkRW52aXJv bm1lbnQub2JqZWN0cy5jb3VudCgpID09IDA6CiAgICAgICAgICAgIEJ1aWxkRW52aXJvbm1lbnQu b2JqZWN0cy5jcmVhdGUoYmV0eXBlPUJ1aWxkRW52aXJvbm1lbnQuVFlQRV9MT0NBTCkKCiAgICAg ICAgIyB3ZSBtYWtlIHN1cmUgd2UgaGF2ZSBidWlsZGRpciBhbmQgc291cmNlZGlyIGZvciBhbGwg ZGVmaW5lZCBidWlsZCBlbnZpb25tZW50cwogICAgICAgIGZvciBiZSBpbiBCdWlsZEVudmlyb25t ZW50Lm9iamVjdHMuYWxsKCk6CiAgICAgICAgICAgIGJlLm5lZWRzX2ltcG9ydCA9IEZhbHNlCiAg ICAgICAgICAgIGRlZiBfdmVyaWZ5X2JlKCk6CiAgICAgICAgICAgICAgICBpc19jaGFuZ2VkID0g RmFsc2UKCiAgICAgICAgICAgICAgICBkZWYgX3VwZGF0ZV9zb3VyY2VkaXIoKToKICAgICAgICAg ICAgICAgICAgICBiZS5zb3VyY2VkaXIgPSBvcy5lbnZpcm9uLmdldCgnVE9BU1RFUl9ESVInKQog ICAgICAgICAgICAgICAgICAgIHJldHVybiBUcnVlCgogICAgICAgICAgICAgICAgaWYgbGVuKGJl LnNvdXJjZWRpcikgPT0gMDoKICAgICAgICAgICAgICAgICAgICBpc19jaGFuZ2VkID0gX3VwZGF0 ZV9zb3VyY2VkaXIoKQoKICAgICAgICAgICAgICAgIGlmIG5vdCBiZS5zb3VyY2VkaXIuc3RhcnRz d2l0aCgiLyIpOgogICAgICAgICAgICAgICAgICAgIHByaW50KCJcbiAtLSBWYWxpZGF0aW9uOiBU aGUgbGF5ZXJzIGNoZWNrb3V0IGRpcmVjdG9yeSBtdXN0IGJlIHNldCB0byBhbiBhYnNvbHV0ZSBw YXRoLiIpCiAgICAgICAgICAgICAgICAgICAgaXNfY2hhbmdlZCA9IF91cGRhdGVfc291cmNlZGly KCkKCiAgICAgICAgICAgICAgICBpZiBpc19jaGFuZ2VkOgogICAgICAgICAgICAgICAgICAgIGlm IGJlLmJldHlwZSA9PSBCdWlsZEVudmlyb25tZW50LlRZUEVfTE9DQUw6CiAgICAgICAgICAgICAg ICAgICAgICAgIGJlLm5lZWRzX2ltcG9ydCA9IFRydWUKICAgICAgICAgICAgICAgICAgICByZXR1 cm4gVHJ1ZQoKICAgICAgICAgICAgICAgIGRlZiBfdXBkYXRlX2J1aWxkZGlyKCk6CiAgICAgICAg ICAgICAgICAgICAgYmUuYnVpbGRkaXIgPSBvcy5lbnZpcm9uLmdldCgnVE9BU1RFUl9ESVInKSsi L2J1aWxkIgogICAgICAgICAgICAgICAgICAgIHJldHVybiBUcnVlCgogICAgICAgICAgICAgICAg aWYgbGVuKGJlLmJ1aWxkZGlyKSA9PSAwOgogICAgICAgICAgICAgICAgICAgIGlzX2NoYW5nZWQg PSBfdXBkYXRlX2J1aWxkZGlyKCkKCiAgICAgICAgICAgICAgICBpZiBub3QgYmUuYnVpbGRkaXIu c3RhcnRzd2l0aCgiLyIpOgogICAgICAgICAgICAgICAgICAgIHByaW50KCJcbiAtLSBWYWxpZGF0 aW9uOiBUaGUgYnVpbGQgZGlyZWN0b3J5IG11c3QgdG8gYmUgc2V0IHRvIGFuIGFic29sdXRlIHBh dGguIikKICAgICAgICAgICAgICAgICAgICBpc19jaGFuZ2VkID0gX3VwZGF0ZV9idWlsZGRpcigp CgogICAgICAgICAgICAgICAgaWYgaXNfY2hhbmdlZDoKICAgICAgICAgICAgICAgICAgICBwcmlu dCgiXG5CdWlsZCBjb25maWd1cmF0aW9uIHNhdmVkIikKICAgICAgICAgICAgICAgICAgICBiZS5z YXZlKCkKICAgICAgICAgICAgICAgICAgICByZXR1cm4gVHJ1ZQoKICAgICAgICAgICAgICAgIGlm IGJlLm5lZWRzX2ltcG9ydDoKICAgICAgICAgICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAg ICAgICAgICAgIHByaW50KCJMb2FkaW5nIGRlZmF1bHQgc2V0dGluZ3MiKQogICAgICAgICAgICAg ICAgICAgICAgICBjYWxsX2NvbW1hbmQoImxvYWRkYXRhIiwgInNldHRpbmdzIikKICAgICAgICAg ICAgICAgICAgICAgICAgdGVtcGxhdGVfY29uZiA9IG9zLmVudmlyb24uZ2V0KCJURU1QTEFURUNP TkYiLCAiIikKCiAgICAgICAgICAgICAgICAgICAgICAgIGlmIFRvYXN0ZXJTZXR0aW5nLm9iamVj dHMuZmlsdGVyKG5hbWU9J0NVU1RPTV9YTUxfT05MWScpLmNvdW50KCkgPiAwOgogICAgICAgICAg ICAgICAgICAgICAgICAgICAgIyBvbmx5IHVzZSB0aGUgY3VzdG9tIHNldHRpbmdzCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICBwYXNzCiAgICAgICAgICAgICAgICAgICAgICAgIGVsaWYgInBv a3kiIGluIHRlbXBsYXRlX2NvbmY6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcmludCgi TG9hZGluZyBwb2t5IGNvbmZpZ3VyYXRpb24iKQogICAgICAgICAgICAgICAgICAgICAgICAgICAg Y2FsbF9jb21tYW5kKCJsb2FkZGF0YSIsICJwb2t5IikKICAgICAgICAgICAgICAgICAgICAgICAg ZWxzZToKICAgICAgICAgICAgICAgICAgICAgICAgICAgIHByaW50KCJMb2FkaW5nIE9FLUNvcmUg Y29uZmlndXJhdGlvbiIpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBjYWxsX2NvbW1hbmQo ImxvYWRkYXRhIiwgIm9lLWNvcmUiKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgdGVt cGxhdGVfY29uZjoKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvZV9jb3JlX3BhdGgg PSBvcy5wYXRoLnJlYWxwYXRoKAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0 ZW1wbGF0ZV9jb25mICsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi8uLi8i KQogICAgICAgICAgICAgICAgICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBwcmludCgiVEVNUExBVEVDT05GIG5vdCBmb3VuZC4gWW91IG1heSBoYXZlIHRv IgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIgbWFudWFsbHkgY29uZmln dXJlIGxheWVyIHBhdGhzIikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvZV9jb3Jl X3BhdGggPSBpbnB1dCgiUGxlYXNlIGVudGVyIHRoZSBwYXRoIG9mIgogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIgeW91ciBvcGVuZW1iZWRkZWQt Y29yZSAiCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgImxheWVyOiAiKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIyBVcGRhdGUgdGhlIGxh eWVyIGluc3RhbmNlcyBvZiBvcGVuZW1lYmVkZGVkLWNvcmUKICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGZvciBsYXllciBpbiBMYXllci5vYmplY3RzLmZpbHRlcigKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbmFtZT0ib3BlbmVtYmVkZGVkLWNvcmUiLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBsb2NhbF9zb3VyY2VfZGlyPSJPRS1DT1JFLUxBWUVS LURJUiIpOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxheWVyLmxvY2FsX3BhdGgg PSBvZV9jb3JlX3BhdGgKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsYXllci5zYXZl KCkKCiAgICAgICAgICAgICAgICAgICAgICAgICMgSW1wb3J0IHRoZSBjdXN0b20gZml4dHVyZSBp ZiBpdCdzIHByZXNlbnQKICAgICAgICAgICAgICAgICAgICAgICAgd2l0aCB3YXJuaW5ncy5jYXRj aF93YXJuaW5ncygpOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgd2FybmluZ3MuZmlsdGVy d2FybmluZ3MoCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYWN0aW9uPSJpZ25vcmUi LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1lc3NhZ2U9Il4uKk5vIGZpeHR1cmUg bmFtZWQuKiQiKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJpbnQoIkltcG9ydGluZyBj dXN0b20gc2V0dGluZ3MgaWYgcHJlc2VudCIpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICB0 cnk6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2FsbF9jb21tYW5kKCJsb2FkZGF0 YSIsICJjdXN0b20iKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgZXhjZXB0OgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHByaW50KCJOT1RFOiBvcHRpb25hbCBmaXh0dXJlICdj dXN0b20nIG5vdCBmb3VuZCIpCgogICAgICAgICAgICAgICAgICAgICAgICAjIHdlIHJ1biBsc3Vw ZGF0ZXMgYWZ0ZXIgY29uZmlnIHVwZGF0ZQogICAgICAgICAgICAgICAgICAgICAgICBwcmludCgi XG5GZXRjaGluZyBpbmZvcm1hdGlvbiBmcm9tIHRoZSBsYXllciBpbmRleCwgIgogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAicGxlYXNlIHdhaXQuXG5Zb3UgY2FuIHJlLXVwZGF0ZSBhbnkg dGltZSBsYXRlciAiCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJieSBydW5uaW5nIGJp dGJha2UvbGliL3RvYXN0ZXIvbWFuYWdlLnB5ICIKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgImxzdXBkYXRlc1xuIikKICAgICAgICAgICAgICAgICAgICAgICAgY2FsbF9jb21tYW5kKCJs c3VwZGF0ZXMiKQoKICAgICAgICAgICAgICAgICAgICAgICAgIyB3ZSBkb24ndCBsb29rIGZvciBh bnkgb3RoZXIgY29uZmlnIGZpbGVzCiAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBpc19j aGFuZ2VkCiAgICAgICAgICAgICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgogICAgICAg ICAgICAgICAgICAgICAgICBwcmludCgiRmFpbHVyZSB3aGlsZSB0cnlpbmcgdG8gc2V0dXAgdG9h c3RlcjogJXMiCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICUgZSkKICAgICAgICAgICAg ICAgICAgICAgICAgdHJhY2ViYWNrLnByaW50X2V4YygpCgogICAgICAgICAgICAgICAgcmV0dXJu IGlzX2NoYW5nZWQKCiAgICAgICAgICAgIHdoaWxlIF92ZXJpZnlfYmUoKToKICAgICAgICAgICAg ICAgIHBhc3MKICAgICAgICByZXR1cm4gMAoKICAgIGRlZiBfdmVyaWZ5X2RlZmF1bHRfc2V0dGlu Z3Moc2VsZik6CiAgICAgICAgIyB2ZXJpZnkgdGhhdCBkZWZhdWx0IHNldHRpbmdzIGFyZSB0aGVy ZQogICAgICAgIGlmIFRvYXN0ZXJTZXR0aW5nLm9iamVjdHMuZmlsdGVyKG5hbWU9J0RFRkFVTFRf UkVMRUFTRScpLmNvdW50KCkgIT0gMToKICAgICAgICAgICAgVG9hc3RlclNldHRpbmcub2JqZWN0 cy5maWx0ZXIobmFtZT0nREVGQVVMVF9SRUxFQVNFJykuZGVsZXRlKCkKICAgICAgICAgICAgVG9h c3RlclNldHRpbmcub2JqZWN0cy5nZXRfb3JfY3JlYXRlKG5hbWU9J0RFRkFVTFRfUkVMRUFTRScs IHZhbHVlPScnKQogICAgICAgIHJldHVybiAwCgogICAgZGVmIF92ZXJpZnlfYnVpbGRzX2luX3By b2dyZXNzKHNlbGYpOgogICAgICAgICMgd2UgYXJlIGp1c3Qgc3RhcnRpbmcgdXAuIHdlIG11c3Qg bm90IGhhdmUgYW55IGJ1aWxkcyBpbiBwcm9ncmVzcywgb3IgYnVpbGQgZW52aXJvbm1lbnRzIHRh a2VuCiAgICAgICAgZm9yIGIgaW4gQnVpbGRSZXF1ZXN0Lm9iamVjdHMuZmlsdGVyKHN0YXRlPUJ1 aWxkUmVxdWVzdC5SRVFfSU5QUk9HUkVTUyk6CiAgICAgICAgICAgIEJSRXJyb3Iub2JqZWN0cy5j cmVhdGUocmVxPWIsIGVycnR5cGU9InRvYXN0ZXIiLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGVycm1zZz0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiVG9h c3RlciBmb3VuZCB0aGlzIGJ1aWxkIElOIFBST0dSRVNTIHdoaWxlIFRvYXN0ZXIgc3RhcnRlZCB1 cC4gVGhpcyBpcyBhbiBpbmNvbnNpc3RlbnQgc3RhdGUsIGFuZCB0aGUgYnVpbGQgd2FzIG1hcmtl ZCBhcyBmYWlsZWQiKQoKICAgICAgICBCdWlsZFJlcXVlc3Qub2JqZWN0cy5maWx0ZXIoc3RhdGU9 QnVpbGRSZXF1ZXN0LlJFUV9JTlBST0dSRVNTKS51cGRhdGUoc3RhdGU9QnVpbGRSZXF1ZXN0LlJF UV9GQUlMRUQpCgogICAgICAgIEJ1aWxkRW52aXJvbm1lbnQub2JqZWN0cy51cGRhdGUobG9jaz1C dWlsZEVudmlyb25tZW50LkxPQ0tfRlJFRSkKCiAgICAgICAgIyBhbHNvIG1hcmsgIkluIFByb2dy ZXNzIGJ1aWxkcyBhcyBmYWlsdXJlcyIKICAgICAgICBmcm9tIGRqYW5nby51dGlscyBpbXBvcnQg dGltZXpvbmUKICAgICAgICBCdWlsZC5vYmplY3RzLmZpbHRlcihvdXRjb21lPUJ1aWxkLklOX1BS T0dSRVNTKS51cGRhdGUob3V0Y29tZT1CdWlsZC5GQUlMRUQsIGNvbXBsZXRlZF9vbj10aW1lem9u ZS5ub3coKSkKCiAgICAgICAgcmV0dXJuIDAKCgoKICAgIGRlZiBoYW5kbGUoc2VsZiwgKipvcHRp b25zKToKICAgICAgICByZXR2YWwgPSAwCiAgICAgICAgcmV0dmFsICs9IHNlbGYuX3ZlcmlmeV9i dWlsZF9lbnZpcm9ubWVudCgpCiAgICAgICAgcmV0dmFsICs9IHNlbGYuX3ZlcmlmeV9kZWZhdWx0 X3NldHRpbmdzKCkKICAgICAgICByZXR2YWwgKz0gc2VsZi5fdmVyaWZ5X2J1aWxkc19pbl9wcm9n cmVzcygpCgogICAgICAgIHJldHVybiByZXR2YWwK