5305 2013-10-03 08:40:21 +0000 Make sanitized kernel headers available 2026-02-26 16:00:09 +0000 1 1 7 Build System, Metadata & Runtime OE-Core kernel unspecified All Multiple IN PROGRESS REVIEW Medium enhancement 6.99 1 peter.kjellerstedt bruce.ashfield bluelightning bruce.ashfield karthik.poduval leon.woestenberg mark.asselstine pokylinux randy.macleod richard.purdie Rondom sgw tom.zanussi --- --- Don't know oldest_to_newest 37513 0 1542 peter.kjellerstedt 2013-10-03 08:40:21 +0000 Created attachment 1542 bbclass to make sanitized kernel headers available for a recipe In a recent commit (http://cgit.openembedded.org/openembedded-core/commit/?id=c27ac156bcaf3193d52f456480947b0cfaef3c72), Richard added a big warning about not forking the linux-libc-headers recipe to get at specific kernel headers for user space. As a consequence I thought I should remove our fork of linux-libc-headers and instead use the suggested method of including the needed files from ${STAGING_KERNEL_DIR} in the recipes that need them. However, I soon realized that what I need are the sanitized headers that are generated by running "make headers_install" in the kernel sources. So what I then did was to create a simple bbclass that generates them for me and makes them available for my recipe (see attachment). After that I could simply do 'inherit kernel-headers' and 'CFLAGS += "-I${KINCLUDES}/includes"' in my recipe to get at the sanitized kernel headers. But, it seems somewhat wasteful for each recipe that need those headers to do that. It would be better if the sanitized headers were provided once for all to use (similar to ${STAGING_KERNEL_DIR} for the kernel sources). When I asked about this on the OE mailing list, Bruce Ashfield replied: I've proposed similar solutions in the past, including installing the headers into the sysroot along side of the libc-headers in "usr-alt/", or "kernel-headers/", rather than within the kernel staging dir, since the staging dir is often tar'd up and added to things like the kernel-dev package or SDKs .. and if not properly installed, you can clash with the libc usr/include/linux headers. But yes, either way, I'm all for doing this once, making them available in a oe-core "standard" location, as long as it isn't picked up by default include paths. If you want to open up something in the bugzilla, we can take care of this early in the yocto 1.6 cycle, since at this point in 1.5, we don't want to jiggle much of anything :) 37548 1 bruce.ashfield 2013-10-03 12:46:49 +0000 I'll grab this one. Thanks for the report. 41971 2 bruce.ashfield 2014-03-31 16:34:18 +0000 Moving this to 1.7, since it better matches the developer experience theme. In flight patches will be rebased and submitted then. 41976 3 bruce.ashfield 2014-03-31 18:04:04 +0000 *** Bug 4119 has been marked as a duplicate of this bug. *** 51881 4 leon.woestenberg 2015-06-23 12:20:35 +0000 *** Bug 7866 has been marked as a duplicate of this bug. *** 86659 5 bruce.ashfield 2020-03-04 18:53:37 +0000 working on cleaning this up, to have two modes .. one that does something like the attached bbclass, and another that packages the alternate headers (so it can be reused). 86670 6 4647 bruce.ashfield 2020-03-05 20:01:13 +0000 Created attachment 4647 dual mode headers patch 86679 7 peter.kjellerstedt 2020-03-07 13:01:20 +0000 (In reply to comment #6) > Created attachment 4647 [details] > dual mode headers patch Two comments about the patch: * You should use "${KERNEL_PACKAGE_NAME}-headers-alt" instead of "kernel-headers-alt" as package name. * Some lines in the shell functions use a mix of spaces and tabs for indentation rather than all tabs. 86681 8 bruce.ashfield 2020-03-07 16:41:45 +0000 (In reply to comment #7) > (In reply to comment #6) > > Created attachment 4647 [details] > > dual mode headers patch > > Two comments about the patch: > > * You should use "${KERNEL_PACKAGE_NAME}-headers-alt" instead of > "kernel-headers-alt" as package name. Actually, I named it this way on purpose. It isn't actually supposed to be used, it is a placeholder against QA errors. But yes, there's no harm in following whatever naming is in a given kernel recipe. > * Some lines in the shell functions use a mix of spaces and tabs for > indentation rather than all tabs. Noted. This isn't the final version, just a placeholder. This isn't being sent out until post release and will have more revision before then. People were asking about this, so I wanted to put the WIP someplace they could find. 86682 9 bruce.ashfield 2020-03-07 16:55:13 +0000 (In reply to comment #8) > (In reply to comment #7) > > (In reply to comment #6) > > > Created attachment 4647 [details] > > > dual mode headers patch > > > > Two comments about the patch: > > > > * You should use "${KERNEL_PACKAGE_NAME}-headers-alt" instead of > > "kernel-headers-alt" as package name. > > Actually, I named it this way on purpose. It isn't actually supposed to be > used, it is a placeholder against QA errors. But yes, there's no harm in > following whatever naming is in a given kernel recipe. > > > * Some lines in the shell functions use a mix of spaces and tabs for > > indentation rather than all tabs. > > Noted. This isn't the final version, just a placeholder. > > This isn't being sent out until post release and will have more revision > before then. People were asking about this, so I wanted to put the WIP > someplace they could find. I've run tabify on the functions, they are all consistent now! 89364 10 karthik.poduval 2021-02-24 01:21:46 +0000 I tried the mode 1 approach with the patch (0001-kernel-provide-alternate-headers-for-package-specifi.patch) applied to my bsp layer (I am using yocto version 3.1 and yoe distro). The target application was able to find the exported kernel headers. However I see one side effect that kernel menuconfig command can't run anymore. bitbake virtual/kernel -c menuconfig *** *** The source tree is not clean, please run 'make mrproper' *** in /home/workspace/yoe-dmabuf/build/tmp/work-shared/qemuarm64/kernel-source *** make[1]: *** [outputmakefile] Error 1 make: *** [sub-make] Error 2 Command failed. Press any key to continue... Is this because make headers_install was run from KERNEL_STAGING_DIRECTORY ? It works after doing a cleanall on virtual/kernel first. 89365 11 karthik.poduval 2021-02-24 02:03:17 +0000 A small change to the patch helps mitigate the side effect. do_compile_prepend() { if [ "${KERNEL_SOURCE_IS_LOCAL}" = "False" ]; then # install from the staging kernel directory oe_runmake -C ${STAGING_KERNEL_DIR} headers_install INSTALL_HDR_PATH=${WORKDIR}/${KERNEL_ALT_HEADER_DIR} oe_runmake -C ${STAGING_KERNEL_DIR} mrproper fi } 89367 12 karthik.poduval 2021-02-24 06:44:10 +0000 mode 2 worked fine. 91265 13 4825 bruce.ashfield 2021-08-25 16:46:54 +0000 Created attachment 4825 updated bbclass for new overrides this is the same bbclass that I've attached before, with the last comment change integrated and update to the new override syntax. 99931 14 randy.macleod 2024-10-17 19:04:14 +0000 Bulk move of medium importance bugs from 5.1 to 5.2 on behalf of Bruce. 1542 2013-10-03 08:40:21 +0000 2013-10-03 08:40:21 +0000 bbclass to make sanitized kernel headers available for a recipe kernel-headers.bbclass application/octet-stream 258 peter.kjellerstedt REVQRU5EUyArPSAidmlydHVhbC9rZXJuZWwiCgpQQUNLQUdFX0FSQ0ggPSAiJHtNQUNISU5FX0FS Q0h9IgoKaW5oZXJpdCBrZXJuZWwtYXJjaAoKS0lOQ0xVREVTID89ICIke1dPUktESVJ9L2tlcm5l bC1pbmNsdWRlcyIKCmRvX2NvbXBpbGVfcHJlcGVuZCgpIHsKCW1rZGlyIC1wICR7S0lOQ0xVREVT fQoJb2VfcnVubWFrZSAtQyAke1NUQUdJTkdfS0VSTkVMX0RJUn0gaGVhZGVyc19pbnN0YWxsIElO U1RBTExfSERSX1BBVEg9JHtLSU5DTFVERVN9Cn0K 4647 2020-03-05 20:01:13 +0000 2020-03-05 20:01:13 +0000 dual mode headers patch 0001-kernel-provide-alternate-headers-for-package-specifi.patch application/octet-stream 4943 bruce.ashfield RnJvbSA0ODlkNGQxZjFhOTQ0MWVhNWZjNDdiNDg4MDZhZjExODAzZTg3ZWU0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCcnVjZSBBc2hmaWVsZCA8YnJ1Y2UuYXNoZmllbGRAZ21haWwu Y29tPgpEYXRlOiBUaHUsIDUgTWFyIDIwMjAgMTQ6NTU6NTYgLTA1MDAKU3ViamVjdDogW1BBVENI XSBrZXJuZWw6IHByb3ZpZGUgYWx0ZXJuYXRlIGhlYWRlcnMgZm9yIHBhY2thZ2Ugc3BlY2lmaWMK IGludGVyZmFjZXMKClByb3ZpZGUgYWx0ZXJuYXRlIHVhcGkgaGVhZGVycyBmcm9tIGEga2VybmVs LCBmb3IgdXNlIGJ5CmEgcmVjaXBlLiBUaGlzIGlzICpub3QqIGEgcmVwbGFjZW1lbnQgZm9yIHRo ZSBsaW51eC1saWJjLWhlYWRlcnMKcGFja2FnZSwgYnV0IGlzIGV4cGVjdGVkIHRvIGJlIHVzZWQg d2hlbiBhIHBhY2thZ2UgaXMgdGlnaHRseQpjb3VwbGVkIHRvIGEgc3BlY2lmaWMga2VybmVsIGFu ZCBuZWVkcyBkZWZpbml0aW9ucyAvIGludGVyZmFjZXMKc3BlY2lmaWMgdG8gdGhhdCBrZXJuZWwu CgpUaGUgY2xhc3Mgd29ya3MgaW4gb25lIG9mIHR3byB3YXlzLCBpdCBjYW4gYmUgaW5jbHVkZWQg YnkgdGhlCnJlY2lwZSB0aGF0IHJlcXVpcmVzIHRoZSBoZWFkZXJzIChtb2RlIDEgYmVsb3cpIG9y IGJ5IGEga2VybmVsCnJlY2lwZSB0aGF0IHByb3ZpZGVzIHRoZSBhbHRlcm5hdGUgaGVhZGVycy4g Qm90aCBhcmUgdmFsaWQsCmFuZCBvbmUgbWF5IGJlIGNob3NlbiBvdmVyIHRoZSBvdGhlciBkZXBl bmRpbmcgb24gaG93IG1hbnkKcGFja2FnZXMgbmVlZCBjdXN0b20gaGVhZGVycywgZXRjLgoKSXQg aXMgdXAgdG8gdGhlIHBhY2thZ2UgdGhhdCBidWlsZHMgYWdhaW5zdCB0aGVzZSBoZWFkZXJzIHRv CmVuc3VyZSB0aGF0IHRoZSBhbHRlcm5hdGUga2VybmVsIGhlYWRlcnMgYXJlIGluIHRoZSBpbmNs dWRlCnBhdGggYW5kIHVzZWQgZm9yIHRoZSBidWlsZC4KCm1vZGUgMTogaW5jbHVkZWQgZGlyZWN0 bHkgZnJvbSBhIHJlY2lwZSB0aGF0IG5lZWRzIGFsdGVybmF0ZQogICAgICAgIGtlcm5lbCBoZWFk ZXJzLiBJbiB0aGlzIG1vZGUgdGhlIGhlYWRlcnMgaW5zdGFsbCBmcm9tCiAgICAgICAgdGhlIHNo YXJlZCBrZXJuZWwgZGlyIHRvIFdPUktESVIuCiAgICAgICAgTm90ZTogaW4gdGhpcyBtb2RlLCB0 aGUga2VybmVsIGRvZXNuJ3QgKG9yIHNob3VsZG4ndCkKICAgICAgICAgICAgICBpbmhlcml0IGtl cm5lbC1hbHQtaGVhZGVycyBpdHNlbGYuCgogICAgICAgIFRoZSBoZWFkZXJzIHdpbGwgYmUgaW46 ICRXT1JLRElSL3Vzci9hbHQtaGVhZGVycwoKbW9kZSAyOiBpbmNsdWRlZCBieSBhIGtlcm5lbCBy ZWNpcGUgdG8gcHJvdmlkZSBhbHQtaGVhZGVycy4KICAgICAgICBJbiB0aGlzIG1vZGUsIHRoZSBr ZXJuZWwgYnVpbGQvaW5zdGFsbCBpcyBtb2RpZmllZCB0bwogICAgICAgIHN0YWdlIHRoZSBoZWFk ZXJzIHRvIHRoZSBzeXNyb290IChhbmQgY3JlYXRlIGEKICAgICAgICBrZXJuZWwtaGVhZGVycy1h bHQgcGFja2FnZSkuCgogICAgICAgIFRoZSBoZWFkZXJzIGFyZSBmb3VuZCBpbjogcmVjaXBlLXN5 c3Jvb3QvdXNyL2FsdC1oZWFkZXJzCgpTaWduZWQtb2ZmLWJ5OiBCcnVjZSBBc2hmaWVsZCA8YnJ1 Y2UuYXNoZmllbGRAZ21haWwuY29tPgotLS0KIG1ldGEvY2xhc3Nlcy9rZXJuZWwtYWx0LWhlYWRl cnMuYmJjbGFzcyB8IDc0ICsrKysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2Vk LCA3NCBpbnNlcnRpb25zKCspCiBjcmVhdGUgbW9kZSAxMDA2NDQgbWV0YS9jbGFzc2VzL2tlcm5l bC1hbHQtaGVhZGVycy5iYmNsYXNzCgpkaWZmIC0tZ2l0IGEvbWV0YS9jbGFzc2VzL2tlcm5lbC1h bHQtaGVhZGVycy5iYmNsYXNzIGIvbWV0YS9jbGFzc2VzL2tlcm5lbC1hbHQtaGVhZGVycy5iYmNs YXNzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAuLjdmZmMyODNmNTMKLS0t IC9kZXYvbnVsbAorKysgYi9tZXRhL2NsYXNzZXMva2VybmVsLWFsdC1oZWFkZXJzLmJiY2xhc3MK QEAgLTAsMCArMSw3NCBAQAorUEFDS0FHRV9BUkNIID0gIiR7TUFDSElORV9BUkNIfSIKKworIwor IyBQcm92aWRlIGFsdGVybmF0ZSB1YXBpIGhlYWRlcnMgZnJvbSBhIGtlcm5lbCwgZm9yIHVzZSBi eQorIyBhIHJlY2lwZS4gVGhpcyBpcyAqbm90KiBhIHJlcGxhY2VtZW50IGZvciB0aGUgbGludXgt bGliYy1oZWFkZXJzCisjIHBhY2thZ2UsIGJ1dCBpcyBleHBlY3RlZCB0byBiZSB1c2VkIHdoZW4g YSBwYWNrYWdlIGlzIHRpZ2h0bHkKKyMgY291cGxlZCB0byBhIHNwZWNpZmljIGtlcm5lbCBhbmQg bmVlZHMgZGVmaW5pdGlvbnMgLyBpbnRlcmZhY2VzCisjIHNwZWNpZmljIHRvIHRoYXQga2VybmVs LgorIworIyBUaGUgY2xhc3Mgd29ya3MgaW4gb25lIG9mIHR3byB3YXlzLCBpdCBjYW4gYmUgaW5j bHVkZWQgYnkgdGhlCisjIHJlY2lwZSB0aGF0IHJlcXVpcmVzIHRoZSBoZWFkZXJzIChtb2RlIDEg YmVsb3cpIG9yIGJ5IGEga2VybmVsCisjIHJlY2lwZSB0aGF0IHByb3ZpZGVzIHRoZSBhbHRlcm5h dGUgaGVhZGVycy4gQm90aCBhcmUgdmFsaWQsCisjIGFuZCBvbmUgbWF5IGJlIGNob3NlbiBvdmVy IHRoZSBvdGhlciBkZXBlbmRpbmcgb24gaG93IG1hbnkKKyMgcGFja2FnZXMgbmVlZCBjdXN0b20g aGVhZGVycywgZXRjLgorIworIyBJdCBpcyB1cCB0byB0aGUgcGFja2FnZSB0aGF0IGJ1aWxkcyBh Z2FpbnN0IHRoZXNlIGhlYWRlcnMgdG8KKyMgZW5zdXJlIHRoYXQgdGhlIGFsdGVybmF0ZSBrZXJu ZWwgaGVhZGVycyBhcmUgaW4gdGhlIGluY2x1ZGUKKyMgcGF0aCBhbmQgdXNlZCBmb3IgdGhlIGJ1 aWxkLgorIworIyBtb2RlIDE6IGluY2x1ZGVkIGRpcmVjdGx5IGZyb20gYSByZWNpcGUgdGhhdCBu ZWVkcyBhbHRlcm5hdGUKKyMgICAgICAgICBrZXJuZWwgaGVhZGVycy4gSW4gdGhpcyBtb2RlIHRo ZSBoZWFkZXJzIGluc3RhbGwgZnJvbQorIyAgICAgICAgIHRoZSBzaGFyZWQga2VybmVsIGRpciB0 byBXT1JLRElSLgorIyAgICAgICAgIE5vdGU6IGluIHRoaXMgbW9kZSwgdGhlIGtlcm5lbCBkb2Vz bid0IChvciBzaG91bGRuJ3QpCisjICAgICAgICAgICAgICAgaW5oZXJpdCBrZXJuZWwtYWx0LWhl YWRlcnMgaXRzZWxmLgorIworIyAgICAgICAgIFRoZSBoZWFkZXJzIHdpbGwgYmUgaW46ICRXT1JL RElSL3Vzci9hbHQtaGVhZGVycworIworIyBtb2RlIDI6IGluY2x1ZGVkIGJ5IGEga2VybmVsIHJl Y2lwZSB0byBwcm92aWRlIGFsdC1oZWFkZXJzLgorIyAgICAgICAgIEluIHRoaXMgbW9kZSwgdGhl IGtlcm5lbCBidWlsZC9pbnN0YWxsIGlzIG1vZGlmaWVkIHRvCisjICAgICAgICAgc3RhZ2UgdGhl IGhlYWRlcnMgdG8gdGhlIHN5c3Jvb3QgKGFuZCBjcmVhdGUgYQorIyAgICAgICAgIGtlcm5lbC1o ZWFkZXJzLWFsdCBwYWNrYWdlKS4KKyMKKyMgICAgICAgICBUaGUgaGVhZGVycyBhcmUgZm91bmQg aW46IHJlY2lwZS1zeXNyb290L3Vzci9hbHQtaGVhZGVycworIworaW5oZXJpdCBrZXJuZWwtYXJj aAorCitLRVJORUxfQUxUX0hFQURFUl9ESVIgPz0gIi91c3IvYWx0LWhlYWRlcnMvIgorREVQRU5E UyArPSAidW5pZmRlZi1uYXRpdmUgYmlzb24tbmF0aXZlIHJzeW5jLW5hdGl2ZSIKKworS0VSTkVM X1NPVVJDRV9JU19MT0NBTCA/PSAiJHtAKGJiLmRhdGEuaW5oZXJpdHNfY2xhc3MoJ2tlcm5lbCcs IGQpKX0iCitweXRob24gX19hbm9ueW1vdXMgKCkgeworICAgIGlmIG5vdCBiYi5kYXRhLmluaGVy aXRzX2NsYXNzKCdrZXJuZWwnLGQpOgorICAgICAgICBkLmFwcGVuZFZhciggJ0RFUEVORFMnLCAi IHZpcnR1YWwva2VybmVsIiApCisgICAgZWxzZToKKyAgICAgICAgIyBXZSBuZWVkIHRvIHBhY2th Z2UgdGhlc2UgdXAsIGV2ZW4gaWYgdGhleSBhcmVuJ3QgZXhwZWN0ZWQgdG8gYmUKKyAgICAgICAg IyB1c2VkIGZvciBhbnl0aGluZworICAgICAgICBkLmFwcGVuZFZhciggJ1BBQ0tBR0VTJywgIiBr ZXJuZWwtaGVhZGVycy1hbHQiICkKKyAgICAgICAgZC5zZXRWYXIoICdGSUxFU19rZXJuZWwtaGVh ZGVycy1hbHQnLCAiJHtLRVJORUxfQUxUX0hFQURFUl9ESVJ9IiApCit9CisKK2RvX2NvbXBpbGVf cHJlcGVuZCgpIHsKKyAgIAlpZiBbICIke0tFUk5FTF9TT1VSQ0VfSVNfTE9DQUx9IiA9ICJGYWxz ZSIgXTsgdGhlbgorCSAgICAjIGluc3RhbGwgZnJvbSB0aGUgc3RhZ2luZyBrZXJuZWwgZGlyZWN0 b3J5CisJICAgIG9lX3J1bm1ha2UgLUMgJHtTVEFHSU5HX0tFUk5FTF9ESVJ9IGhlYWRlcnNfaW5z dGFsbCBJTlNUQUxMX0hEUl9QQVRIPSR7V09SS0RJUn0vJHtLRVJORUxfQUxUX0hFQURFUl9ESVJ9 CisJZmkKK30KKworZG9faW5zdGFsbF9hcHBlbmQoKSB7CisgICAgCWlmIFsgIiR7S0VSTkVMX1NP VVJDRV9JU19MT0NBTH0iID0gIlRydWUiIF07IHRoZW4KKwkgICAJIyBpbnN0YWxsIHRvIG91ciBk ZXBsb3kgZGlyZWN0b3J5LCB0aGlzIHdpbGwgYmUgcGFja2FnZWQgYW5kIHN0YWdlZAorCQlvZV9y dW5tYWtlIGhlYWRlcnNfaW5zdGFsbCBJTlNUQUxMX0hEUl9QQVRIPSR7RH0ke0tFUk5FTF9BTFRf SEVBREVSX0RJUn0KKworCQkjIHJlbW92ZSBleHBvcnQgYXJ0aWZhY3RzCisJCWZpbmQgJHtEfSR7 S0VSTkVMX0FMVF9IRUFERVJfRElSfSAtbmFtZSAuaW5zdGFsbCAtZXhlYyBybSB7fSBcOworCQlm aW5kICR7RH0ke0tFUk5FTF9BTFRfSEVBREVSX0RJUn0gLW5hbWUgLi5pbnN0YWxsLmNtZCAtZXhl YyBybSB7fSBcOworCWZpCit9CisKK3N5c3Jvb3Rfc3RhZ2VfYWxsX2FwcGVuZCgpIHsKKyAgICBp ZiBbICIke0tFUk5FTF9TT1VSQ0VfSVNfTE9DQUx9IiA9ICJUcnVlIiBdOyB0aGVuCisgICAgCQlt a2RpciAtcCAke1NZU1JPT1RfREVTVERJUn0ke0tFUk5FTF9BTFRfSEVBREVSX0RJUn0KKwkJY3Ag LXIgJHtEfSR7S0VSTkVMX0FMVF9IRUFERVJfRElSfS8qICR7U1lTUk9PVF9ERVNURElSfS8ke0tF Uk5FTF9BTFRfSEVBREVSX0RJUn0KKwlmaQorfQotLSAKMi4xOS4xCgo= 4825 2021-08-25 16:46:54 +0000 2021-08-25 16:46:54 +0000 updated bbclass for new overrides 0001-kernel-provide-alternate-headers-for-package-specifi.patch application/octet-stream 5175 bruce.ashfield RnJvbSAwZGQ5ZjQ0N2MwYzE3YmVmYThjNjBjNTYxYjc3ZDcxOGJmYWNlOGVjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCcnVjZSBBc2hmaWVsZCA8YnJ1Y2UuYXNoZmllbGRAZ21haWwu Y29tPgpEYXRlOiBUaHUsIDUgTWFyIDIwMjAgMTQ6NTU6NTYgLTA1MDAKU3ViamVjdDogW1BBVENI XSBrZXJuZWw6IHByb3ZpZGUgYWx0ZXJuYXRlIGhlYWRlcnMgZm9yIHBhY2thZ2Ugc3BlY2lmaWMK IGludGVyZmFjZXMKClByb3ZpZGUgYWx0ZXJuYXRlIHVhcGkgaGVhZGVycyBmcm9tIGEga2VybmVs LCBmb3IgdXNlIGJ5CmEgcmVjaXBlLiBUaGlzIGlzICpub3QqIGEgcmVwbGFjZW1lbnQgZm9yIHRo ZSBsaW51eC1saWJjLWhlYWRlcnMKcGFja2FnZSwgYnV0IGlzIGV4cGVjdGVkIHRvIGJlIHVzZWQg d2hlbiBhIHBhY2thZ2UgaXMgdGlnaHRseQpjb3VwbGVkIHRvIGEgc3BlY2lmaWMga2VybmVsIGFu ZCBuZWVkcyBkZWZpbml0aW9ucyAvIGludGVyZmFjZXMKc3BlY2lmaWMgdG8gdGhhdCBrZXJuZWwu CgpUaGUgY2xhc3Mgd29ya3MgaW4gb25lIG9mIHR3byB3YXlzLCBpdCBjYW4gYmUgaW5jbHVkZWQg YnkgdGhlCnJlY2lwZSB0aGF0IHJlcXVpcmVzIHRoZSBoZWFkZXJzIChtb2RlIDEgYmVsb3cpIG9y IGJ5IGEga2VybmVsCnJlY2lwZSB0aGF0IHByb3ZpZGVzIHRoZSBhbHRlcm5hdGUgaGVhZGVycy4g Qm90aCBhcmUgdmFsaWQsCmFuZCBvbmUgbWF5IGJlIGNob3NlbiBvdmVyIHRoZSBvdGhlciBkZXBl bmRpbmcgb24gaG93IG1hbnkKcGFja2FnZXMgbmVlZCBjdXN0b20gaGVhZGVycywgZXRjLgoKSXQg aXMgdXAgdG8gdGhlIHBhY2thZ2UgdGhhdCBidWlsZHMgYWdhaW5zdCB0aGVzZSBoZWFkZXJzIHRv CmVuc3VyZSB0aGF0IHRoZSBhbHRlcm5hdGUga2VybmVsIGhlYWRlcnMgYXJlIGluIHRoZSBpbmNs dWRlCnBhdGggYW5kIHVzZWQgZm9yIHRoZSBidWlsZC4KCm1vZGUgMTogaW5jbHVkZWQgZGlyZWN0 bHkgZnJvbSBhIHJlY2lwZSB0aGF0IG5lZWRzIGFsdGVybmF0ZQogICAgICAgIGtlcm5lbCBoZWFk ZXJzLiBJbiB0aGlzIG1vZGUgdGhlIGhlYWRlcnMgaW5zdGFsbCBmcm9tCiAgICAgICAgdGhlIHNo YXJlZCBrZXJuZWwgZGlyIHRvIFdPUktESVIuCiAgICAgICAgTm90ZTogaW4gdGhpcyBtb2RlLCB0 aGUga2VybmVsIGRvZXNuJ3QgKG9yIHNob3VsZG4ndCkKICAgICAgICAgICAgICBpbmhlcml0IGtl cm5lbC1hbHQtaGVhZGVycyBpdHNlbGYuCgogICAgICAgIFRoZSBoZWFkZXJzIHdpbGwgYmUgaW46 ICRXT1JLRElSL3Vzci9hbHQtaGVhZGVycwoKbW9kZSAyOiBpbmNsdWRlZCBieSBhIGtlcm5lbCBy ZWNpcGUgdG8gcHJvdmlkZSBhbHQtaGVhZGVycy4KICAgICAgICBJbiB0aGlzIG1vZGUsIHRoZSBr ZXJuZWwgYnVpbGQvaW5zdGFsbCBpcyBtb2RpZmllZCB0bwogICAgICAgIHN0YWdlIHRoZSBoZWFk ZXJzIHRvIHRoZSBzeXNyb290IChhbmQgY3JlYXRlIGEKICAgICAgICBrZXJuZWwtaGVhZGVycy1h bHQgcGFja2FnZSkuCgogICAgICAgIFRoZSBoZWFkZXJzIGFyZSBmb3VuZCBpbjogcmVjaXBlLXN5 c3Jvb3QvdXNyL2FsdC1oZWFkZXJzCgpTaWduZWQtb2ZmLWJ5OiBCcnVjZSBBc2hmaWVsZCA8YnJ1 Y2UuYXNoZmllbGRAZ21haWwuY29tPgotLS0KIG1ldGEvY2xhc3Nlcy9rZXJuZWwtYWx0LWhlYWRl cnMuYmJjbGFzcyB8IDc4ICsrKysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2Vk LCA3OCBpbnNlcnRpb25zKCspCiBjcmVhdGUgbW9kZSAxMDA2NDQgbWV0YS9jbGFzc2VzL2tlcm5l bC1hbHQtaGVhZGVycy5iYmNsYXNzCgpkaWZmIC0tZ2l0IGEvbWV0YS9jbGFzc2VzL2tlcm5lbC1h bHQtaGVhZGVycy5iYmNsYXNzIGIvbWV0YS9jbGFzc2VzL2tlcm5lbC1hbHQtaGVhZGVycy5iYmNs YXNzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAuLjgwYjY1OGM1YjkKLS0t IC9kZXYvbnVsbAorKysgYi9tZXRhL2NsYXNzZXMva2VybmVsLWFsdC1oZWFkZXJzLmJiY2xhc3MK QEAgLTAsMCArMSw3OCBAQAorUEFDS0FHRV9BUkNIID0gIiR7TUFDSElORV9BUkNIfSIKKworIwor IyBQcm92aWRlIGFsdGVybmF0ZSB1YXBpIGhlYWRlcnMgZnJvbSBhIGtlcm5lbCwgZm9yIHVzZSBi eQorIyBhIHJlY2lwZS4gVGhpcyBpcyAqbm90KiBhIHJlcGxhY2VtZW50IGZvciB0aGUgbGludXgt bGliYy1oZWFkZXJzCisjIHBhY2thZ2UsIGJ1dCBpcyBleHBlY3RlZCB0byBiZSB1c2VkIHdoZW4g YSBwYWNrYWdlIGlzIHRpZ2h0bHkKKyMgY291cGxlZCB0byBhIHNwZWNpZmljIGtlcm5lbCBhbmQg bmVlZHMgZGVmaW5pdGlvbnMgLyBpbnRlcmZhY2VzCisjIHNwZWNpZmljIHRvIHRoYXQga2VybmVs LgorIworIyBUaGUgY2xhc3Mgd29ya3MgaW4gb25lIG9mIHR3byB3YXlzLCBpdCBjYW4gYmUgaW5j bHVkZWQgYnkgdGhlCisjIHJlY2lwZSB0aGF0IHJlcXVpcmVzIHRoZSBoZWFkZXJzIChtb2RlIDEg YmVsb3cpIG9yIGJ5IGEga2VybmVsCisjIHJlY2lwZSB0aGF0IHByb3ZpZGVzIHRoZSBhbHRlcm5h dGUgaGVhZGVycy4gQm90aCBhcmUgdmFsaWQsCisjIGFuZCBvbmUgbWF5IGJlIGNob3NlbiBvdmVy IHRoZSBvdGhlciBkZXBlbmRpbmcgb24gaG93IG1hbnkKKyMgcGFja2FnZXMgbmVlZCBjdXN0b20g aGVhZGVycywgZXRjLgorIworIyBJdCBpcyB1cCB0byB0aGUgcGFja2FnZSB0aGF0IGJ1aWxkcyBh Z2FpbnN0IHRoZXNlIGhlYWRlcnMgdG8KKyMgZW5zdXJlIHRoYXQgdGhlIGFsdGVybmF0ZSBrZXJu ZWwgaGVhZGVycyBhcmUgaW4gdGhlIGluY2x1ZGUKKyMgcGF0aCBhbmQgdXNlZCBmb3IgdGhlIGJ1 aWxkLgorIworIyBtb2RlIDE6IGluY2x1ZGVkIGRpcmVjdGx5IGZyb20gYSByZWNpcGUgdGhhdCBu ZWVkcyBhbHRlcm5hdGUKKyMgICAgICAgICBrZXJuZWwgaGVhZGVycy4gSW4gdGhpcyBtb2RlIHRo ZSBoZWFkZXJzIGluc3RhbGwgZnJvbQorIyAgICAgICAgIHRoZSBzaGFyZWQga2VybmVsIGRpciB0 byBXT1JLRElSLgorIyAgICAgICAgIE5vdGU6IGluIHRoaXMgbW9kZSwgdGhlIGtlcm5lbCBkb2Vz bid0IChvciBzaG91bGRuJ3QpCisjICAgICAgICAgICAgICAgaW5oZXJpdCBrZXJuZWwtYWx0LWhl YWRlcnMgaXRzZWxmLgorIworIyAgICAgICAgIFRoZSBoZWFkZXJzIHdpbGwgYmUgaW46ICRXT1JL RElSL3Vzci9hbHQtaGVhZGVycworIworIyBtb2RlIDI6IGluY2x1ZGVkIGJ5IGEga2VybmVsIHJl Y2lwZSB0byBwcm92aWRlIGFsdC1oZWFkZXJzLgorIyAgICAgICAgIEluIHRoaXMgbW9kZSwgdGhl IGtlcm5lbCBidWlsZC9pbnN0YWxsIGlzIG1vZGlmaWVkIHRvCisjICAgICAgICAgc3RhZ2UgdGhl IGhlYWRlcnMgdG8gdGhlIHN5c3Jvb3QgKGFuZCBjcmVhdGUgYQorIyAgICAgICAgIGtlcm5lbC1o ZWFkZXJzLWFsdCBwYWNrYWdlKS4KKyMKKyMgICAgICAgICBUaGUgaGVhZGVycyBhcmUgZm91bmQg aW46IHJlY2lwZS1zeXNyb290L3Vzci9hbHQtaGVhZGVycworIworaW5oZXJpdCBrZXJuZWwtYXJj aAorCitLRVJORUxfQUxUX0hFQURFUl9ESVIgPz0gIi91c3IvYWx0LWhlYWRlcnMvIgorREVQRU5E UyArPSAidW5pZmRlZi1uYXRpdmUgYmlzb24tbmF0aXZlIHJzeW5jLW5hdGl2ZSIKKworS0VSTkVM X1NPVVJDRV9JU19MT0NBTCA/PSAiJHtAKGJiLmRhdGEuaW5oZXJpdHNfY2xhc3MoJ2tlcm5lbCcs IGQpKX0iCitweXRob24gX19hbm9ueW1vdXMgKCkgeworICAgIGlmIG5vdCBiYi5kYXRhLmluaGVy aXRzX2NsYXNzKCdrZXJuZWwnLGQpOgorICAgICAgICBkLmFwcGVuZFZhciggJ0RFUEVORFMnLCAi IHZpcnR1YWwva2VybmVsIiApCisgICAgZWxzZToKKyAgICAgICAgIyBXZSBuZWVkIHRvIHBhY2th Z2UgdGhlc2UgdXAsIGV2ZW4gaWYgdGhleSBhcmVuJ3QgZXhwZWN0ZWQgdG8gYmUKKyAgICAgICAg IyB1c2VkIGZvciBhbnl0aGluZworICAgICAgICBkLmFwcGVuZFZhciggJ1BBQ0tBR0VTJywgIiAk e0tFUk5FTF9QQUNLQUdFX05BTUV9LWhlYWRlcnMtYWx0IiApCisgICAgICAgIGQuc2V0VmFyKCAn RklMRVNfJHtLRVJORUxfUEFDS0FHRV9OQU1FfS1oZWFkZXJzLWFsdCcsICIke0tFUk5FTF9BTFRf SEVBREVSX0RJUn0iICkKK30KKworZG9fY29tcGlsZTpwcmVwZW5kKCkgeworCWlmIFsgIiR7S0VS TkVMX1NPVVJDRV9JU19MT0NBTH0iID0gIkZhbHNlIiBdOyB0aGVuCisJCSMgaW5zdGFsbCBmcm9t IHRoZSBzdGFnaW5nIGtlcm5lbCBkaXJlY3RvcnkKKwkgICAgCW9lX3J1bm1ha2UgLUMgJHtTVEFH SU5HX0tFUk5FTF9ESVJ9IGhlYWRlcnNfaW5zdGFsbCBJTlNUQUxMX0hEUl9QQVRIPSR7V09SS0RJ Un0vJHtLRVJORUxfQUxUX0hFQURFUl9ESVJ9CisJICAgIAkjIHRoZXJlIGhhdmUgYmVlbiByZXBv cnRzIHRoYXQgbWVudWNvbmZpZyB3b24ndCBydW4gZHVlIHRvIGEgZGlydHkKKwkJIyBrZXJuZWwg ZGlyZWN0b3J5IGFmdGVyIHRoZSBpbnN0YWxsLCBzbyB3ZSBydW4gbXJwcm9wZXIgdG8gbWFrZSBz dXJlCisJCSMgaXQgaXMgY2xlYW4KKwkJb2VfcnVubWFrZSAtQyAke1NUQUdJTkdfS0VSTkVMX0RJ Un0gbXJwcm9wZXIKKwlmaQorfQorCitkb19pbnN0YWxsOmFwcGVuZCgpIHsKKyAgICAJaWYgWyAi JHtLRVJORUxfU09VUkNFX0lTX0xPQ0FMfSIgPSAiVHJ1ZSIgXTsgdGhlbgorCSAgIAkjIGluc3Rh bGwgdG8gb3VyIGRlcGxveSBkaXJlY3RvcnksIHRoaXMgd2lsbCBiZSBwYWNrYWdlZCBhbmQgc3Rh Z2VkCisJCW9lX3J1bm1ha2UgaGVhZGVyc19pbnN0YWxsIElOU1RBTExfSERSX1BBVEg9JHtEfSR7 S0VSTkVMX0FMVF9IRUFERVJfRElSfQorCisJCSMgcmVtb3ZlIGV4cG9ydCBhcnRpZmFjdHMKKwkJ ZmluZCAke0R9JHtLRVJORUxfQUxUX0hFQURFUl9ESVJ9IC1uYW1lIC5pbnN0YWxsIC1leGVjIHJt IHt9IFw7CisJCWZpbmQgJHtEfSR7S0VSTkVMX0FMVF9IRUFERVJfRElSfSAtbmFtZSAuLmluc3Rh bGwuY21kIC1leGVjIHJtIHt9IFw7CisJZmkKK30KKworc3lzcm9vdF9zdGFnZV9hbGw6YXBwZW5k KCkgeworCWlmIFsgIiR7S0VSTkVMX1NPVVJDRV9JU19MT0NBTH0iID0gIlRydWUiIF07IHRoZW4K KwkJbWtkaXIgLXAgJHtTWVNST09UX0RFU1RESVJ9JHtLRVJORUxfQUxUX0hFQURFUl9ESVJ9CisJ CWNwIC1yICR7RH0ke0tFUk5FTF9BTFRfSEVBREVSX0RJUn0vKiAke1NZU1JPT1RfREVTVERJUn0v JHtLRVJORUxfQUxUX0hFQURFUl9ESVJ9CisJZmkKK30KLS0gCjIuMTkuMQoK