From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [PATCH 11/12] tools/pygrub: Add `xen' to fsimage python module name Date: Fri, 12 Oct 2018 16:12:14 +0100 Message-ID: <20181012151215.32455-12-ian.jackson@eu.citrix.com> References: <20181012151215.32455-1-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gAz71-00018X-62 for xen-devel@lists.xenproject.org; Fri, 12 Oct 2018 15:12:23 +0000 In-Reply-To: <20181012151215.32455-1-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Wei Liu , Ian Jackson List-Id: xen-devel@lists.xenproject.org VGhpcyBtb2R1bGUgc2hvdWxkIGJlIGNhbGxlZCBgbGlieGVuZnNpbWFnZScgZm9yIHRoZSBzYW1l IHJlYXNvbnMgdGhhdAp0aGUgQyBsaWJyYXJ5IHNob3VsZC4KClNpZ25lZC1vZmYtYnk6IElhbiBK YWNrc29uIDxpYW4uamFja3NvbkBldS5jaXRyaXguY29tPgotLS0KdjI6IE5ldyBpbiB0aGlzIHZl cnNpb24gb2YgdGhlIHNlcmllcwotLS0KIHRvb2xzL3B5Z3J1Yi9zZXR1cC5weSAgICAgICAgICAg ICAgfCA0ICsrLS0KIHRvb2xzL3B5Z3J1Yi9zcmMvZnNpbWFnZS9mc2ltYWdlLmMgfCA4ICsrKyst LS0tCiB0b29scy9weWdydWIvc3JjL3B5Z3J1YiAgICAgICAgICAgIHwgNiArKystLS0KIDMgZmls ZXMgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L3Rvb2xzL3B5Z3J1Yi9zZXR1cC5weSBiL3Rvb2xzL3B5Z3J1Yi9zZXR1cC5weQppbmRleCBiNThj YzFjNGU2Li5iOGYxZGM0NTkwIDEwMDY0NAotLS0gYS90b29scy9weWdydWIvc2V0dXAucHkKKysr IGIvdG9vbHMvcHlncnViL3NldHVwLnB5CkBAIC03LDcgKzcsNyBAQCBleHRyYV9jb21waWxlX2Fy Z3MgID0gWyAiLWZuby1zdHJpY3QtYWxpYXNpbmciLCAiLVdlcnJvciIgXQogCiBYRU5fUk9PVCA9 ICIuLi8uLiIKIAotZnNpbWFnZSA9IEV4dGVuc2lvbigiZnNpbWFnZSIsCit4ZW5mc2ltYWdlID0g RXh0ZW5zaW9uKCJ4ZW5mc2ltYWdlIiwKICAgICBleHRyYV9jb21waWxlX2FyZ3MgPSBleHRyYV9j b21waWxlX2FyZ3MsCiAgICAgaW5jbHVkZV9kaXJzID0gWyBYRU5fUk9PVCArICIvdG9vbHMvbGli ZnNpbWFnZS9jb21tb24vIiBdLAogICAgIGxpYnJhcnlfZGlycyA9IFsgWEVOX1JPT1QgKyAiL3Rv b2xzL2xpYmZzaW1hZ2UvY29tbW9uLyIgXSwKQEAgLTI1LDUgKzI1LDUgQEAgc2V0dXAobmFtZT0n cHlncnViJywKICAgICAgIHBhY2thZ2VfZGlyPXsnZ3J1Yic6ICdzcmMnLCAnZnNpbWFnZSc6ICdz cmMnfSwKICAgICAgIHNjcmlwdHMgPSBbInNyYy9weWdydWIiXSwKICAgICAgIHBhY2thZ2VzPXBr Z3MsCi0gICAgICBleHRfbW9kdWxlcyA9IFsgZnNpbWFnZSBdCisgICAgICBleHRfbW9kdWxlcyA9 IFsgeGVuZnNpbWFnZSBdCiAgICAgICApCmRpZmYgLS1naXQgYS90b29scy9weWdydWIvc3JjL2Zz aW1hZ2UvZnNpbWFnZS5jIGIvdG9vbHMvcHlncnViL3NyYy9mc2ltYWdlL2ZzaW1hZ2UuYwppbmRl eCA0Nzk0MDU3MmE4Li43NDNhM2ZiN2I4IDEwMDY0NAotLS0gYS90b29scy9weWdydWIvc3JjL2Zz aW1hZ2UvZnNpbWFnZS5jCisrKyBiL3Rvb2xzL3B5Z3J1Yi9zcmMvZnNpbWFnZS9mc2ltYWdlLmMK QEAgLTEzMiw3ICsxMzIsNyBAQCBzdGF0aWMgY2hhciBmc2ltYWdlX2ZpbGVfdHlwZV9fZG9jX19b XSA9ICJGaWxlc3lzdGVtIGltYWdlIGZpbGUiOwogUHlUeXBlT2JqZWN0IGZzaW1hZ2VfZmlsZV90 eXBlID0gewogCVB5T2JqZWN0X0hFQURfSU5JVCgmUHlUeXBlX1R5cGUpCiAJMCwJCQkJCS8qIG9i X3NpemUgKi8KLQkiZnNpbWFnZS5maWxlIiwJCQkJLyogdHBfbmFtZSAqLworCSJ4ZW5mc2ltYWdl LmZpbGUiLAkJCS8qIHRwX25hbWUgKi8KIAlzaXplb2YoZnNpbWFnZV9maWxlX3QpLAkJCS8qIHRw X3NpemUgKi8KIAkwLAkJCQkJLyogdHBfaXRlbXNpemUgKi8KIAkoZGVzdHJ1Y3RvcikgZnNpbWFn ZV9maWxlX2RlYWxsb2MsIAkvKiB0cF9kZWFsbG9jICovCkBAIC0yMzQsNyArMjM0LDcgQEAgUHlE b2NfU1RSVkFSKGZzaW1hZ2VfZnNfdHlwZV9fZG9jX18sICJGaWxlc3lzdGVtIGltYWdlIik7CiBQ eVR5cGVPYmplY3QgZnNpbWFnZV9mc190eXBlID0gewogCVB5T2JqZWN0X0hFQURfSU5JVCgmUHlU eXBlX1R5cGUpCiAJMCwJCQkJCS8qIG9iX3NpemUgKi8KLQkiZnNpbWFnZS5mcyIsCQkJCS8qIHRw X25hbWUgKi8KKwkieGVuZnNpbWFnZS5mcyIsCQkJLyogdHBfbmFtZSAqLwogCXNpemVvZihmc2lt YWdlX2ZzX3QpLAkJCS8qIHRwX3NpemUgKi8KIAkwLAkJCQkJLyogdHBfaXRlbXNpemUgKi8KIAko ZGVzdHJ1Y3RvcikgZnNpbWFnZV9mc19kZWFsbG9jLCAJLyogdHBfZGVhbGxvYyAqLwpAQCAtMzE3 LDcgKzMxNyw3IEBAIHN0YXRpYyBzdHJ1Y3QgUHlNZXRob2REZWYgZnNpbWFnZV9tb2R1bGVfbWV0 aG9kc1tdID0gewogfTsKIAogUHlNT0RJTklUX0ZVTkMKLWluaXRmc2ltYWdlKHZvaWQpCitpbml0 eGVuZnNpbWFnZSh2b2lkKQogewotCVB5X0luaXRNb2R1bGUoImZzaW1hZ2UiLCBmc2ltYWdlX21v ZHVsZV9tZXRob2RzKTsKKwlQeV9Jbml0TW9kdWxlKCJ4ZW5mc2ltYWdlIiwgZnNpbWFnZV9tb2R1 bGVfbWV0aG9kcyk7CiB9CmRpZmYgLS1naXQgYS90b29scy9weWdydWIvc3JjL3B5Z3J1YiBiL3Rv b2xzL3B5Z3J1Yi9zcmMvcHlncnViCmluZGV4IGRkMGM4Zjc3ZGYuLjUyYTg5NjVhZDkgMTAwNzU1 Ci0tLSBhL3Rvb2xzL3B5Z3J1Yi9zcmMvcHlncnViCisrKyBiL3Rvb2xzL3B5Z3J1Yi9zcmMvcHln cnViCkBAIC0yMSw3ICsyMSw3IEBAIGltcG9ydCB4ZW4ubG93bGV2ZWwueGMKIGltcG9ydCBjdXJz ZXMsIF9jdXJzZXMsIGN1cnNlcy53cmFwcGVyLCBjdXJzZXMudGV4dHBhZCwgY3Vyc2VzLmFzY2lp CiBpbXBvcnQgZ2V0b3B0CiAKLWltcG9ydCBmc2ltYWdlCitpbXBvcnQgeGVuZnNpbWFnZQogaW1w b3J0IGdydWIuR3J1YkNvbmYKIGltcG9ydCBncnViLkxpbG9Db25mCiBpbXBvcnQgZ3J1Yi5FeHRM aW51eENvbmYKQEAgLTg5Nyw3ICs4OTcsNyBAQCBpZiBfX25hbWVfXyA9PSAiX19tYWluX18iOgog CiAgICAgZm9yIG9mZnNldCBpbiBwYXJ0X29mZnM6CiAgICAgICAgIHRyeToKLSAgICAgICAgICAg IGZzID0gZnNpbWFnZS5vcGVuKGZpbGUsIG9mZnNldCwgYm9vdGZzb3B0aW9ucykKKyAgICAgICAg ICAgIGZzID0geGVuZnNpbWFnZS5vcGVuKGZpbGUsIG9mZnNldCwgYm9vdGZzb3B0aW9ucykKIAog ICAgICAgICAgICAgY2hvc2VuY2ZnID0gc25pZmZfc29sYXJpcyhmcywgaW5jZmcpCiAKQEAgLTk0 NSw3ICs5NDUsNyBAQCBpZiBfX25hbWVfXyA9PSAiX19tYWluX18iOgogCiAgICAgYXJncyA9IE5v bmUKICAgICBpZiBjaG9zZW5jZmdbImFyZ3MiXToKLSAgICAgICAgemZzaW5mbyA9IGZzaW1hZ2Uu Z2V0Ym9vdHN0cmluZyhmcykKKyAgICAgICAgemZzaW5mbyA9IHhlbmZzaW1hZ2UuZ2V0Ym9vdHN0 cmluZyhmcykKICAgICAgICAgaWYgemZzaW5mbyBpcyBub3QgTm9uZToKICAgICAgICAgICAgIGUg PSByZS5jb21waWxlKCJ6ZnMtYm9vdGZzPVtcd1wtXC5cOkAvXSsiICkKICAgICAgICAgICAgIChj aG9zZW5jZmdbImFyZ3MiXSxjb3VudCkgPSBlLnN1Ym4oemZzaW5mbywgY2hvc2VuY2ZnWyJhcmdz Il0pCi0tIAoyLjExLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0 Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRl dmVs