193826 2007-09-26 01:20 0000 Clean up Pegasos hacks 2007-11-08 01:04:19 0000 1 1 1 Unclassified Gentoo Hosted Projects genkernel unspecified All Linux RESOLVED FIXED InSVN P2 enhancement --- 179294 1 kumba@gentoo.org genkernel@gentoo.org kumba@gentoo.org 2007-09-26 01:20:27 0000 For the longest time, pegasos support apparently needed a special set of hooks in genkernel to build the kernel for it in a certain way. This is done by forcing the kernel image name to zInitrd.image, and setting the variable GENERATE_Z_IMAGE to a positive value. After looking over the code, these double conditional checks seem uneccessary, and so are replaced by a single variable, ENABLE_PEGASOS_HACKS. The hacks are activated by passing to genkernel the --genzimage command line parameter. This cleans up the conditional code in preparation for the --ktarget patch, filed under Bug #179294. kumba@gentoo.org 2007-09-26 01:23:40 0000 Created an attachment (id=131915) Clean up Pegasos hacks in genkernel wolf31o2@gentoo.org 2007-11-07 20:43:57 0000 OK. I added this to SVN now... wolf31o2@gentoo.org 2007-11-07 21:01:55 0000 This is in 3.4.9_pre7 which is now in the tree. kumba@gentoo.org 2007-11-08 01:04:19 0000 Sweet. You rock. Now for Bug #179294.... :) 131915 2007-09-26 01:23 0000 Clean up Pegasos hacks in genkernel genkernel-clean-up-pegasos-hacks.patch text/plain ZGlmZiAtTmF1cnAgZ2Vua2VybmVsLm9yaWcvdHJ1bmsvZ2VuX2NtZGxpbmUuc2ggZ2Vua2VybmVs L3RydW5rL2dlbl9jbWRsaW5lLnNoCi0tLSBnZW5rZXJuZWwub3JpZy90cnVuay9nZW5fY21kbGlu ZS5zaAkyMDA3LTA5LTE4IDIyOjQyOjQyLjAwMDAwMDAwMCAtMDQwMAorKysgZ2Vua2VybmVsL3Ry dW5rL2dlbl9jbWRsaW5lLnNoCTIwMDctMDktMjIgMTI6NTA6NTQuMDAwMDAwMDAwIC0wNDAwCkBA IC00NTksOCArNDU5LDggQEAgcGFyc2VfY21kbGluZSgpIHsKIAkJLS1nZW56aW1hZ2UpCiAJCQlL RVJORUxfTUFLRV9ESVJFQ1RJVkVfMj0nekltYWdlLmluaXRyZCcKIAkJCUtFUk5FTF9CSU5BUllf Mj0nYXJjaC9wb3dlcnBjL2Jvb3QvekltYWdlLmluaXRyZCcKLQkJCUdFTkVSQVRFX1pfSU1BR0U9 MQotCQkJcHJpbnRfaW5mbyAyICJHRU5FUkFURV9aX0lNQUdFOiAke0dFTkVSQVRFX1pfSU1BR0V9 IgorCQkJRU5BQkxFX1BFR0FTT1NfSEFDS1M9InllcyIKKwkJCXByaW50X2luZm8gMiAiRU5BQkxF X1BFR0FTT1NfSEFDS1M6ICR7RU5BQkxFX1BFR0FTT1NfSEFDS1N9IgogCQkJOzsKIAkJLS1kaXNr bGFiZWwpCiAJCQlDTURfRElTS0xBQkVMPTEKZGlmZiAtTmF1cnAgZ2Vua2VybmVsLm9yaWcvdHJ1 bmsvZ2VuX2NvbXBpbGUuc2ggZ2Vua2VybmVsL3RydW5rL2dlbl9jb21waWxlLnNoCi0tLSBnZW5r ZXJuZWwub3JpZy90cnVuay9nZW5fY29tcGlsZS5zaAkyMDA3LTA5LTE4IDIyOjQyOjQyLjAwMDAw MDAwMCAtMDQwMAorKysgZ2Vua2VybmVsL3RydW5rL2dlbl9jb21waWxlLnNoCTIwMDctMDktMjIg MTI6NTM6MTIuMDAwMDAwMDAwIC0wNDAwCkBAIC0zMDcsNyArMzA3LDcgQEAgY29tcGlsZV9rZXJu ZWwoKSB7CiAJCQkiU3lzdGVtLm1hcCIgXAogCQkJIlN5c3RlbS5tYXAtJHtLTkFNRX0tJHtBUkNI fS0ke0tWfSIKIAotCQlpZiBbICIke0tFUk5FTF9CSU5BUllfMn0iICE9ICcnIC1hICIke0dFTkVS QVRFX1pfSU1BR0V9IiA9ICcxJyBdCisJCWlmIFsgIiR7RU5BQkxFX1BFR0FTT1NfSEFDS1N9IiA9 ICd5ZXMnIF0KIAkJdGhlbgogCQkJY29weV9pbWFnZV93aXRoX3ByZXNlcnZlICJrZXJuZWx6IiBc CiAJCQkJIiR7S0VSTkVMX0JJTkFSWV8yfSIgXApAQCAtMzE4LDcgKzMxOCw3IEBAIGNvbXBpbGVf a2VybmVsKCkgewogCQkJZ2VuX2RpZSAiQ291bGQgbm90IGNvcHkgdGhlIGtlcm5lbCBiaW5hcnkg dG8gJHtUTVBESVJ9ISIKIAkJY3AgIlN5c3RlbS5tYXAiICIke1RNUERJUn0vU3lzdGVtLm1hcC0k e0tOQU1FfS0ke0FSQ0h9LSR7S1Z9IiB8fAogCQkJZ2VuX2RpZSAiQ291bGQgbm90IGNvcHkgU3lz dGVtLm1hcCB0byAke1RNUERJUn0hIgotCQlpZiBbICIke0tFUk5FTF9CSU5BUllfMn0iICE9ICcn IC1hICIke0dFTkVSQVRFX1pfSU1BR0V9IiA9ICcxJyBdCisJCWlmIFsgIiR7RU5BQkxFX1BFR0FT T1NfSEFDS1N9IiA9ICd5ZXMnIF0KIAkJdGhlbgogCQkJY3AgIiR7S0VSTkVMX0JJTkFSWV8yfSIg IiR7VE1QRElSfS9rZXJuZWx6LSR7S1Z9IiB8fAogCQkJCWdlbl9kaWUgIkNvdWxkIG5vdCBjb3B5 IHRoZSBrZXJuZWx6IGJpbmFyeSB0byAke1RNUERJUn0hIgpkaWZmIC1OYXVycCBnZW5rZXJuZWwu b3JpZy90cnVuay9nZW5faW5pdHJhbWZzLnNoIGdlbmtlcm5lbC90cnVuay9nZW5faW5pdHJhbWZz LnNoCi0tLSBnZW5rZXJuZWwub3JpZy90cnVuay9nZW5faW5pdHJhbWZzLnNoCTIwMDctMDktMTgg MjI6NDI6NDIuMDAwMDAwMDAwIC0wNDAwCisrKyBnZW5rZXJuZWwvdHJ1bmsvZ2VuX2luaXRyYW1m cy5zaAkyMDA3LTA5LTIyIDEyOjU5OjEzLjAwMDAwMDAwMCAtMDQwMApAQCAtNDU2LDIxICs0NTYs MjEgQEAgY3JlYXRlX2luaXRyYW1mcygpIHsKIAlnemlwIC05ICIke0NQSU99IgogCW12IC1mICIk e0NQSU99Lmd6IiAiJHtDUElPfSIKIAotCSMgUGVnYXNvcyBoYWNrIGZvciBtZXJnaW5nIHRoZSBp bml0cmFtZnMgaW50byB0aGUga2VybmVsIGF0IGNvbXBpbGUgdGltZQotCVsgIiR7S0VSTkVMX01B S0VfRElSRUNUSVZFfSIgPT0gJ3pJbWFnZS5pbml0cmQnIC1hICIke0dFTkVSQVRFX1pfSU1BR0V9 IiA9ICcxJyBdIHx8Ci0JCVsgIiR7S0VSTkVMX01BS0VfRElSRUNUSVZFXzJ9IiA9PSAnekltYWdl LmluaXRyZCcgLWEgIiR7R0VORVJBVEVfWl9JTUFHRX0iID0gJzEnIF0gJiYKKwlpZiBbICIke0VO QUJMRV9QRUdBU09TX0hBQ0tTfSIgPSAneWVzJyBdCisJdGhlbgorCQkJIyBQZWdhc29zIGhhY2sg Zm9yIG1lcmdpbmcgdGhlIGluaXRyYW1mcyBpbnRvIHRoZSBrZXJuZWwgYXQgY29tcGlsZSB0aW1l CiAJCQljcCAke1RNUERJUn0vaW5pdHJhbWZzLSR7S1Z9ICR7S0VSTkVMX0RJUn0vYXJjaC9wb3dl cnBjL2Jvb3QvcmFtZGlzay5pbWFnZS5neiAmJgogCQkJcm0gJHtUTVBESVJ9L2luaXRyYW1mcy0k e0tWfQotCi0JIyBNaXBzIGFsc28gbWltaWNzIFBlZ2Fzb3MgdG8gbWVyZ2UgdGhlIGluaXRyYW1m cyBpbnRvIHRoZSBrZXJuZWwKLQlpZiBbICR7QlVJTERfSU5JVFJBTUZTfSAtZXEgMSBdOyB0aGVu CisJZWxpZiBbICR7QlVJTERfSU5JVFJBTUZTfSAtZXEgMSBdCisJdGhlbgorCQkjIE1pcHMgYWxz byBtaW1pY3MgUGVnYXNvcyB0byBtZXJnZSB0aGUgaW5pdHJhbWZzIGludG8gdGhlIGtlcm5lbAog CQljcCAke1RNUERJUn0vaW5pdHJhbWZzLSR7S1Z9ICR7S0VSTkVMX0RJUn0vaW5pdHJhbWZzLmNw aW8uZ3oKIAkJZ3VuemlwIC1mICR7S0VSTkVMX0RJUn0vaW5pdHJhbWZzLmNwaW8uZ3oKIAlmaQog CiAJaWYgISBpc1RydWUgIiR7Q01EX05PSU5TVEFMTH0iCiAJdGhlbgotCQlpZiBbICIke0dFTkVS QVRFX1pfSU1BR0V9IiAhPSAnMScgXQorCQlpZiBbICIke0VOQUJMRV9QRUdBU09TX0hBQ0tTfSIg IT0gJ3llcycgXQogCQl0aGVuCiAJCQljb3B5X2ltYWdlX3dpdGhfcHJlc2VydmUgImluaXRyYW1m cyIgXAogCQkJCSIke1RNUERJUn0vaW5pdHJhbWZzLSR7S1Z9IiBcCmRpZmYgLU5hdXJwIGdlbmtl cm5lbC5vcmlnL3RydW5rL2dlbl9pbml0cmQuc2ggZ2Vua2VybmVsL3RydW5rL2dlbl9pbml0cmQu c2gKLS0tIGdlbmtlcm5lbC5vcmlnL3RydW5rL2dlbl9pbml0cmQuc2gJMjAwNy0wOS0xOCAyMjo0 Mjo0Mi4wMDAwMDAwMDAgLTA0MDAKKysrIGdlbmtlcm5lbC90cnVuay9nZW5faW5pdHJkLnNoCTIw MDctMDktMjIgMTQ6MTI6MTAuMDAwMDAwMDAwIC0wNDAwCkBAIC0zODQsMTMgKzM4NCwxMCBAQCBj cmVhdGVfaW5pdHJkKCkgewogCQkJImluaXRyZC0ke0tOQU1FfS0ke0FSQ0h9LSR7S1Z9IgogCWZp CiAKLQkjIFBlZ2Fzb3MgaGFjayBmb3IgbWVyZ2luZyB0aGUgaW5pdHJkIGludG8gdGhlIGtlcm5l bCBhdCBjb21waWxlIHRpbWUKLQlbICIke0tFUk5FTF9NQUtFX0RJUkVDVElWRX0iID09ICd6SW1h Z2UuaW5pdHJkJyAtYSAiJHtHRU5FUkFURV9aX0lNQUdFfSIgPSAnMScgXSB8fAotCQlbICIke0tF Uk5FTF9NQUtFX0RJUkVDVElWRV8yfSIgPT0gJ3pJbWFnZS5pbml0cmQnIC1hICIke0dFTkVSQVRF X1pfSU1BR0V9IiA9ICcxJyBdICYmCisgICAgICAgIGlmIFsgIiR7RU5BQkxFX1BFR0FTT1NfSEFD S1N9IiA9ICd5ZXMnIF0KKyAgICAgICAgdGhlbgorCQkjIFBlZ2Fzb3MgaGFjayBmb3IgbWVyZ2lu ZyB0aGUgaW5pdHJhbWZzIGludG8gdGhlIGtlcm5lbCBhdCBjb21waWxlIHRpbWUKIAkJY3AgJHtU TVBESVJ9L2luaXRyZC0ke0tWfSAke0tFUk5FTF9ESVJ9L2FyY2gvJHtBUkNIfS9ib290L2ltYWdl cy9yYW1kaXNrLmltYWdlLmd6ICYmCiAJCXJtICR7VE1QRElSfS9pbml0cmQtJHtLVn0KLQotCSMg TWlwcyBhbHNvIG1pbWljcyBQZWdhc29zIHRvIG1lcmdlIHRoZSBpbml0cmQgaW50byB0aGUga2Vy bmVsCi0JWyAke0JVSUxEX0lOSVRSQU1GU30gLWVxIDEgXSBcCi0JCSYmIGNwICR7VE1QRElSfS9p bml0cmQtJHtLVn0gJHtLRVJORUxfRElSfS9taXBzL3JhbWRpc2svaW5pdHJkLmltZy5negorCWZp CiB9CmRpZmYgLU5hdXJwIGdlbmtlcm5lbC5vcmlnL3RydW5rL2dlbl9wYWNrYWdlLnNoIGdlbmtl cm5lbC90cnVuay9nZW5fcGFja2FnZS5zaAotLS0gZ2Vua2VybmVsLm9yaWcvdHJ1bmsvZ2VuX3Bh Y2thZ2Uuc2gJMjAwNy0wOS0xOCAyMjo0Mjo0Mi4wMDAwMDAwMDAgLTA0MDAKKysrIGdlbmtlcm5l bC90cnVuay9nZW5fcGFja2FnZS5zaAkyMDA3LTA5LTIyIDE0OjEyOjI3LjAwMDAwMDAwMCAtMDQw MApAQCAtNywzNiArNywzNSBAQCBnZW5fbWlua2VybnBhY2thZ2UoKQogCW1rZGlyICIke1RFTVB9 L21pbmtlcm5wYWNrYWdlIiB8fCBnZW5fZGllICdDb3VsZCBub3QgbWFrZSBhIGRpcmVjdG9yeSBm b3IgdGhlIGtlcm5lbCBwYWNrYWdlIScKIAlpZiBbICIke0NNRF9LRVJOQ0FDSEV9IiAhPSAiIiBd CiAJdGhlbgotCSAgICAvYmluL3RhciAteGogLUMgJHtURU1QfS9taW5rZXJucGFja2FnZSAtZiAk e0NNRF9LRVJOQ0FDSEV9IGtlcm5lbC0ke0FSQ0h9LSR7S1Z9Ci0JICAgIC9iaW4vdGFyIC14aiAt QyAke1RFTVB9L21pbmtlcm5wYWNrYWdlIC1mICR7Q01EX0tFUk5DQUNIRX0gY29uZmlnLSR7QVJD SH0tJHtLVn0KLQkgICAgaWYgWyAiJHtLRVJORUxfQklOQVJZXzJ9IiAhPSAnJyAtYSAiJHtHRU5F UkFURV9aX0lNQUdFfSIgPSAnMScgXQotICAgICAgICAgICAgdGhlbgotCSAgICAJL2Jpbi90YXIg LXhqIC1DICR7VEVNUH0vbWlua2VybnBhY2thZ2UgLWYgJHtDTURfS0VSTkNBQ0hFfSBrZXJuZWx6 LSR7QVJDSH0tJHtLVn0KLSAgICAgICAgICAgIGZpCisJCS9iaW4vdGFyIC14aiAtQyAke1RFTVB9 L21pbmtlcm5wYWNrYWdlIC1mICR7Q01EX0tFUk5DQUNIRX0ga2VybmVsLSR7QVJDSH0tJHtLVn0K KwkJL2Jpbi90YXIgLXhqIC1DICR7VEVNUH0vbWlua2VybnBhY2thZ2UgLWYgJHtDTURfS0VSTkNB Q0hFfSBjb25maWctJHtBUkNIfS0ke0tWfQorCQlpZiBbICIke0VOQUJMRV9QRUdBU09TX0hBQ0tT fSIgPSAneWVzJyBdCisJCXRoZW4KKwkJCS9iaW4vdGFyIC14aiAtQyAke1RFTVB9L21pbmtlcm5w YWNrYWdlIC1mICR7Q01EX0tFUk5DQUNIRX0ga2VybmVsei0ke0FSQ0h9LSR7S1Z9CisJCWZpCiAJ ZWxzZQotCSAgICBjZCAiJHtLRVJORUxfRElSfSIKLQkgICAgY3AgIiR7S0VSTkVMX0JJTkFSWX0i ICIke1RFTVB9L21pbmtlcm5wYWNrYWdlL2tlcm5lbC0ke0tWfSIgfHwgZ2VuX2RpZSAnQ291bGQg bm90IHRoZSBjb3B5IGtlcm5lbCBmb3IgdGhlIG1pbiBrZXJuZWwgcGFja2FnZSEnCi0JICAgIGNw ICIuY29uZmlnIiAiJHtURU1QfS9taW5rZXJucGFja2FnZS9jb25maWctJHtBUkNIfS0ke0tWfSIg fHwgZ2VuX2RpZSAnQ291bGQgbm90IHRoZSBjb3B5IGtlcm5lbCBjb25maWcgZm9yIHRoZSBtaW4g a2VybmVsIHBhY2thZ2UhJwotCSAgICBpZiBbICIke0tFUk5FTF9CSU5BUllfMn0iICE9ICcnIC1h ICIke0dFTkVSQVRFX1pfSU1BR0V9IiA9ICcxJyBdCi0gICAgICAgICAgICB0aGVuCi0gICAgICAg ICAgICAJY3AgIiR7S0VSTkVMX0JJTkFSWV8yfSIgIiR7VEVNUH0vbWlua2VybnBhY2thZ2Uva2Vy bmVsei0ke0tWfSIgfHwgZ2VuX2RpZSAiQ291bGQgbm90IGNvcHkgdGhlIGtlcm5lbHogZm9yIHRo ZSBtaW4ga2VybmVsIHBhY2thZ2UiCi0gICAgICAgICAgICBmaQotCisJCWNkICIke0tFUk5FTF9E SVJ9IgorCQljcCAiJHtLRVJORUxfQklOQVJZfSIgIiR7VEVNUH0vbWlua2VybnBhY2thZ2Uva2Vy bmVsLSR7S1Z9IiB8fCBnZW5fZGllICdDb3VsZCBub3QgdGhlIGNvcHkga2VybmVsIGZvciB0aGUg bWluIGtlcm5lbCBwYWNrYWdlIScKKwkJY3AgIi5jb25maWciICIke1RFTVB9L21pbmtlcm5wYWNr YWdlL2NvbmZpZy0ke0FSQ0h9LSR7S1Z9IiB8fCBnZW5fZGllICdDb3VsZCBub3QgdGhlIGNvcHkg a2VybmVsIGNvbmZpZyBmb3IgdGhlIG1pbiBrZXJuZWwgcGFja2FnZSEnCisJCWlmIFsgIiR7RU5B QkxFX1BFR0FTT1NfSEFDS1N9IiA9ICd5ZXMnIF0KKwkJdGhlbgorCQkJY3AgIiR7S0VSTkVMX0JJ TkFSWV8yfSIgIiR7VEVNUH0vbWlua2VybnBhY2thZ2Uva2VybmVsei0ke0tWfSIgfHwgZ2VuX2Rp ZSAiQ291bGQgbm90IGNvcHkgdGhlIGtlcm5lbHogZm9yIHRoZSBtaW4ga2VybmVsIHBhY2thZ2Ui CisJCWZpCiAJZmkKIAkKLQlpZiBbICIke0dFTkVSQVRFX1pfSU1BR0V9IiAhPSAnMScgXQotCXRo ZW4KLQkgICAgaWYgWyAiJHtLRVJOXzI0fSIgIT0gJzEnIF0KLQkgICAgdGhlbgotCQkgICAgWyAi JHtCVUlMRF9JTklUUkR9IiAtbmUgMCBdICYmIHsgY3AgIiR7VE1QRElSfS9pbml0cmFtZnMtJHtL Vn0iICIke1RFTVB9L21pbmtlcm5wYWNrYWdlL2luaXRyYW1mcy0ke0FSQ0h9LSR7S1Z9IiB8fCBn ZW5fZGllICdDb3VsZCBub3QgY29weSB0aGUgaW5pdHJhbWZzIGZvciB0aGUga2VybmVsIHBhY2th Z2UhJzsgfQotCSAgICBlbHNlCi0JCSAgICBbICIke0JVSUxEX0lOSVRSRH0iIC1uZSAwIF0gJiYg eyBjcCAiJHtUTVBESVJ9L2luaXRyZC0ke0tWfSIgIiR7VEVNUH0vbWlua2VybnBhY2thZ2UvaW5p dHJkLSR7QVJDSH0tJHtLVn0iIHx8IGdlbl9kaWUgJ0NvdWxkIG5vdCBjb3B5IHRoZSBpbml0cmQg Zm9yIHRoZSBrZXJuZWwgcGFja2FnZSEnOyB9Ci0JICAgIGZpCisJaWYgWyAiJHtFTkFCTEVfUEVH QVNPU19IQUNLU30iICE9ICd5ZXMnIF0KKwl0aGVuCisJCWlmIFsgIiR7S0VSTl8yNH0iICE9ICcx JyBdCisJCXRoZW4KKwkJCVsgIiR7QlVJTERfSU5JVFJEfSIgLW5lIDAgXSAmJiB7IGNwICIke1RN UERJUn0vaW5pdHJhbWZzLSR7S1Z9IiAiJHtURU1QfS9taW5rZXJucGFja2FnZS9pbml0cmFtZnMt JHtBUkNIfS0ke0tWfSIgfHwgZ2VuX2RpZSAnQ291bGQgbm90IGNvcHkgdGhlIGluaXRyYW1mcyBm b3IgdGhlIGtlcm5lbCBwYWNrYWdlISc7IH0KKwkJZWxzZQorCQkJWyAiJHtCVUlMRF9JTklUUkR9 IiAtbmUgMCBdICYmIHsgY3AgIiR7VE1QRElSfS9pbml0cmQtJHtLVn0iICIke1RFTVB9L21pbmtl cm5wYWNrYWdlL2luaXRyZC0ke0FSQ0h9LSR7S1Z9IiB8fCBnZW5fZGllICdDb3VsZCBub3QgY29w eSB0aGUgaW5pdHJkIGZvciB0aGUga2VybmVsIHBhY2thZ2UhJzsgfQorCQlmaQogCWZpCiAKIAlp ZiBbICIke0NNRF9LRVJOQ0FDSEV9IiAhPSAiIiBdCiAJdGhlbgotCSAgICAvYmluL3RhciAteGog LUMgJHtURU1QfS9taW5rZXJucGFja2FnZSAtZiAke0NNRF9LRVJOQ0FDSEV9IFN5c3RlbS5tYXAt JHtBUkNIfS0ke0tWfQorCQkvYmluL3RhciAteGogLUMgJHtURU1QfS9taW5rZXJucGFja2FnZSAt ZiAke0NNRF9LRVJOQ0FDSEV9IFN5c3RlbS5tYXAtJHtBUkNIfS0ke0tWfQogCWVsc2UKIAkJY3Ag IiR7S0VSTkVMX0RJUn0vU3lzdGVtLm1hcCIgIiR7VEVNUH0vbWlua2VybnBhY2thZ2UvU3lzdGVt Lm1hcC0ke0FSQ0h9LSR7S1Z9IiB8fCBnZW5fZGllICdDb3VsZCBub3QgY29weSBTeXN0ZW0ubWFw IGZvciB0aGUga2VybmVsIHBhY2thZ2UhJzsKIAlmaQpAQCAtNzEsNyArNzAsNyBAQCBnZW5fa2Vy bmNhY2hlKCkKIAljcCAiJHtLRVJORUxfQklOQVJZfSIgIiR7VEVNUH0va2VybmNhY2hlL2tlcm5l bC0ke0FSQ0h9LSR7S1Z9IiB8fCBnZW5fZGllICdDb3VsZCBub3QgdGhlIGNvcHkga2VybmVsIGZv ciB0aGUga2VybmVsIHBhY2thZ2UhJwogCWNwICIke0tFUk5FTF9ESVJ9Ly5jb25maWciICIke1RF TVB9L2tlcm5jYWNoZS9jb25maWctJHtBUkNIfS0ke0tWfSIKIAljcCAiJHtLRVJORUxfRElSfS9T eXN0ZW0ubWFwIiAiJHtURU1QfS9rZXJuY2FjaGUvU3lzdGVtLm1hcC0ke0FSQ0h9LSR7S1Z9Igot CWlmIFsgIiR7S0VSTkVMX0JJTkFSWV8yfSIgIT0gJycgLWEgIiR7R0VORVJBVEVfWl9JTUFHRX0i ID0gJzEnIF0KKwlpZiBbICIke0VOQUJMRV9QRUdBU09TX0hBQ0tTfSIgPSAneWVzJyBdCiAgICAg ICAgIHRoZW4KICAgICAgICAgCWNwICIke0tFUk5FTF9CSU5BUllfMn0iICIke1RFTVB9L2tlcm5j YWNoZS9rZXJuZWx6LSR7QVJDSH0tJHtLVn0iIHx8IGdlbl9kaWUgIkNvdWxkIG5vdCBjb3B5IHRo ZSBrZXJuZWx6IGZvciB0aGUga2VybmVsIHBhY2thZ2UiCiAgICAgICAgIGZpCkBAIC05NSwxNyAr OTQsMTcgQEAgZ2VuX2tlcm5jYWNoZSgpCiAKIGdlbl9rZXJuY2FjaGVfZXh0cmFjdF9rZXJuZWwo KQogewotICAgIC9iaW4vdGFyIC1mICR7S0VSTkNBQ0hFfSAtQyAke1RFTVB9IC14aiAKKwkvYmlu L3RhciAtZiAke0tFUk5DQUNIRX0gLUMgJHtURU1QfSAteGogCiAJY29weV9pbWFnZV93aXRoX3By ZXNlcnZlICJrZXJuZWwiIFwKIAkJIiR7VEVNUH0va2VybmVsLSR7QVJDSH0tJHtLVn0iIFwKIAkJ Imtlcm5lbC0ke0tOQU1FfS0ke0FSQ0h9LSR7S1Z9IgogCi0JaWYgWyAiJHtLRVJORUxfQklOQVJZ XzJ9IiAhPSAnJyAtYSAiJHtHRU5FUkFURV9aX0lNQUdFfSIgPSAnMScgXQotICAgIHRoZW4KKwlp ZiBbICIke0VOQUJMRV9QRUdBU09TX0hBQ0tTfSIgPSAneWVzJ10KKwl0aGVuCiAJCWNvcHlfaW1h Z2Vfd2l0aF9wcmVzZXJ2ZSAia2VybmVseiIgXAogCQkJIiR7VEVNUH0va2VybmVsei0ke0FSQ0h9 LSR7S1Z9IiBcCiAJCQkia2VybmVsei0ke0tOQU1FfS0ke0FSQ0h9LSR7S1Z9IgotICAgIGZpCisJ ZmkKICAgICAKIAljb3B5X2ltYWdlX3dpdGhfcHJlc2VydmUgIlN5c3RlbS5tYXAiIFwKIAkJIiR7 VEVNUH0vU3lzdGVtLm1hcC0ke0FSQ0h9LSR7S1Z9IiBcCmRpZmYgLU5hdXJwIGdlbmtlcm5lbC5v cmlnL3RydW5rL2dlbmtlcm5lbCBnZW5rZXJuZWwvdHJ1bmsvZ2Vua2VybmVsCi0tLSBnZW5rZXJu ZWwub3JpZy90cnVuay9nZW5rZXJuZWwJMjAwNy0wOS0xOCAyMjo0Mjo0Mi4wMDAwMDAwMDAgLTA0 MDAKKysrIGdlbmtlcm5lbC90cnVuay9nZW5rZXJuZWwJMjAwNy0wOS0yMiAxNDoxMjozOC4wMDAw MDAwMDAgLTA0MDAKQEAgLTIzMiw3ICsyMzIsNyBAQCB0aGVuCiAKIAkjIENvbXBpbGUga2VybmVs OyBJZiB1c2luZyAtLWdlbnppbWFnZSwgb3IgYnVpbGRpbmcgYSBtaXBzIGtlcm5lbCwgc2tpcCBj b21waWxlCiAJIyB0aWxsIGFmdGVyIGluaXRyZC9pbml0cmFtZnMgaXMgZG9uZQotCVsgIiR7R0VO RVJBVEVfWl9JTUFHRX0iID0gJycgLWEgJHtCVUlMRF9JTklUUkFNRlN9IC1lcSAwIF0gJiYgY29t cGlsZV9rZXJuZWwKKwlbICIke0VOQUJMRV9QRUdBU09TX0hBQ0tTfSIgIT0gJ3llcycgLWEgJHtC VUlMRF9JTklUUkFNRlN9IC1lcSAwIF0gJiYgY29tcGlsZV9rZXJuZWwKIAogCSMgQ29tcGlsZSBt b2R1bGVzCiAJaWYgWyAke0JVSUxEX01PRFVMRVN9IC1lcSAxIC1hICR7QlVJTERfU1RBVElDfSAt ZXEgMCBdCkBAIC0yNDgsNyArMjQ4LDcgQEAgdGhlbgogCWZpCiAJaWYgWyAiJHtLRVJOQ0FDSEV9 IiAhPSAiIiBdCiAJdGhlbgotCQlpZiBbICIke0dFTkVSQVRFX1pfSU1BR0V9IiA9ICcnIC1hICR7 QlVJTERfSU5JVFJBTUZTfSAtZXEgMCBdCisJCWlmIFsgIiR7RU5BQkxFX1BFR0FTT1NfSEFDS1N9 IiAhPSAneWVzJyAtYSAke0JVSUxEX0lOSVRSQU1GU30gLWVxIDAgXQogCQl0aGVuCiAJCQlnZW5f a2VybmNhY2hlCiAJCWZpCkBAIC0zMzIsNyArMzMyLDcgQEAgZWxzZQogZmkKIAogIyBQZWdhc29z IGZpeAotaWYgWyAiJHtHRU5FUkFURV9aX0lNQUdFfSIgIT0gJycgLW8gJHtCVUlMRF9JTklUUkFN RlN9IC1lcSAxIF0KK2lmIFsgIiR7RU5BQkxFX1BFR0FTT1NfSEFDS1N9IiA9ICd5ZXMnIC1vICR7 QlVJTERfSU5JVFJBTUZTfSAtZXEgMSBdCiB0aGVuCiAJIyBDb21waWxlIGtlcm5lbCwgaW50ZXJn cmF0aW5nIHRoZSBpbml0cmQgaW50byBpdCBmb3IgUGVnYXNvcyAmIG1pcHMKIAljb21waWxlX2tl cm5lbAo=