From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 66C15138359 for ; Fri, 4 Sep 2020 20:23:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 945B4E087B; Fri, 4 Sep 2020 20:23:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 737D0E087B for ; Fri, 4 Sep 2020 20:23:39 +0000 (UTC) Received: (nullmailer pid 1284 invoked by uid 1000); Fri, 04 Sep 2020 20:23:33 -0000 From: dilfridge@gentoo.org To: gentoo-catalyst@lists.gentoo.org Cc: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Subject: [gentoo-catalyst] [PATCH] Allow "interpreter" parameter as space-separated list of files Date: Fri, 4 Sep 2020 23:23:24 +0300 Message-Id: <20200904202324.31508-1-dilfridge@gentoo.org> X-Mailer: git-send-email 2.26.2 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: dac10f49-43e6-40c5-ad06-45a4093be08c X-Archives-Hash: d14dd4b6bdcc46b2f47af33918ea518b From: Andreas K. Hüttel Signed-off-by: Andreas K. Hüttel --- catalyst/base/stagebase.py | 44 +++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index afeda722..0cf3495a 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1061,21 +1061,28 @@ class StageBase(TargetBase, ClearBase, GenBase): shutil.copy('/etc/resolv.conf', self.settings['chroot_path'] + '/etc/') - # Copy over the binary interpreter (qemu), if applicable; note that it's given - # as full path and goes to the same place in the chroot + # Copy over the binary interpreter(s) (qemu), if applicable; note that they are given + # as space-separated list of full paths and go to the same place in the chroot if "interpreter" in self.settings: - if not os.path.exists(self.settings["interpreter"]): - raise CatalystError( - "Can't find interpreter " + self.settings["interpreter"], - print_traceback=True) - log.notice('Copying binary interpreter %s into chroot', self.settings['interpreter']) + if isinstance(self.settings["interpreter"], str): + myints = [self.settings["interpreter"]] + else: + myints = self.settings["interpreter"] + + for myi in myints: + if not os.path.exists(myi): + raise CatalystError( + "Can't find interpreter " + myi, + print_traceback=True) - if os.path.exists(self.settings['chroot_path'] + '/' + self.settings['interpreter']): - os.rename(self.settings['chroot_path'] + '/' + self.settings['interpreter'], self.settings['chroot_path'] + '/' + self.settings['interpreter'] + '.catalyst') + log.notice('Copying binary interpreter %s into chroot', myi) - shutil.copy(self.settings['interpreter'], - self.settings['chroot_path'] + '/' + self.settings['interpreter']) + if os.path.exists(self.settings['chroot_path'] + '/' + myi): + os.rename(self.settings['chroot_path'] + '/' + myi, self.settings['chroot_path'] + '/' + myi + '.catalyst') + + shutil.copy(myi, + self.settings['chroot_path'] + '/' + myi) # Copy over the envscript, if applicable if "envscript" in self.settings: @@ -1242,12 +1249,19 @@ class StageBase(TargetBase, ClearBase, GenBase): if os.path.exists(hosts_file + '.catalyst'): os.rename(hosts_file + '.catalyst', hosts_file) - # optionally clean up binary interpreter + # optionally clean up binary interpreter(s) if "interpreter" in self.settings: - if os.path.exists(self.settings['chroot_path'] + '/' + self.settings['interpreter'] + '.catalyst'): - os.rename(self.settings['chroot_path'] + '/' + self.settings['interpreter'] + '.catalyst', self.settings['chroot_path'] + '/' + self.settings['interpreter']) + + if isinstance(self.settings["interpreter"], str): + myints = [self.settings["interpreter"]] else: - os.remove(self.settings['chroot_path'] + '/' + self.settings['interpreter']) + myints = self.settings["interpreter"] + + for myi in myints: + if os.path.exists(self.settings['chroot_path'] + '/' + myi + '.catalyst'): + os.rename(self.settings['chroot_path'] + '/' + myi + '.catalyst', self.settings['chroot_path'] + '/' + myi) + else: + os.remove(self.settings['chroot_path'] + '/' + myi) # optionally clean up portage configs if ("portage_prefix" in self.settings and -- 2.26.2