From 35058499ceffd2b70f10c4a1397d5a9d44591404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B0=D0=B2=D0=B5=D0=BB=20=D0=98=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Tue, 19 Jul 2022 17:09:30 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=BF=D1=83=D1=82?= =?UTF-8?q?=D0=B8=20=D0=BA=20=D0=BF=D0=BE=D1=80=D1=82=D0=B5=D0=B6=D0=B0?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/builder/builder.py | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pym/builder/builder.py b/pym/builder/builder.py index f9e7886..5fedda9 100644 --- a/pym/builder/builder.py +++ b/pym/builder/builder.py @@ -848,12 +848,15 @@ class Builder(Update): class NvidiaDriver(Driver): Id = 'nvidia-drivers' Package = 'x11-drivers/nvidia-drivers' - Eclass = 'usr/portage/eclass/nvidia-driver.eclass' SkipVers = ('72.0.0', '97.0.0', '177.0.0', '305.0.0', '341.0.0') SkipVersNew = ('71', '96', '173', '304', '340', '367') def generate_legacy(self): - nvidia_eclass = path.join(self.builder_path, self.Eclass) + if os.path.isdir(path.join(self.builder_path, 'var/db/repos/gentoo')): + Eclass = 'var/db/repos/gentoo/eclass/nvidia-driver.eclass' + else: + Eclass = 'usr/portage/eclass/nvidia-driver.eclass' + nvidia_eclass = path.join(self.builder_path, Eclass) eclassdata = readFile(nvidia_eclass) reBlock = re.compile( r"if has \$\{nvidia_gpu\}\s+\\([^;]+);\s*then(.*?)fi", re.S) @@ -948,8 +951,12 @@ class Builder(Update): system_ini = SystemIni(self.clVars.Get('cl_builder_linux_datavars')) driver_list = list(self.NvidiaDriver(builder_path, system_ini)) - distrdir = path.join(builder_path, 'usr/portage/distfiles') - pkgdir = path.join(builder_path, 'usr/portage/packages') + if os.path.isdir(path.join(self.clVars.Get('cl_chroot_path'), 'var/db/repos/gentoo')): + distrdir = path.join(builder_path, 'var/calculate/distfiles') + pkgdir = path.join(builder_path, 'var/calculate/packages') + else: + distrdir = path.join(builder_path, 'usr/portage/distfiles') + pkgdir = path.join(builder_path, 'usr/portage/packages') for target_dn in (distrdir, pkgdir): makeDirectory(target_dn) chmod(target_dn, distrdir_perm) @@ -1069,8 +1076,12 @@ class Builder(Update): cache_file = self.clVars.Get('builder.cl_builder_video_driver_path') if path.exists(cache_file): removeFileWithEmptyDirectory(cache_file) - distrdir = path.join(builder_path, 'usr/portage/distfiles') - pkgdir = path.join(builder_path, 'usr/portage/packages') + if os.path.isdir(path.join(self.clVars.Get('cl_chroot_path'), 'var/db/repos/gentoo')): + distrdir = path.join(builder_path, 'var/calculate/distfiles') + pkgdir = path.join(builder_path, 'var/calculate/packages') + else: + distrdir = path.join(builder_path, 'usr/portage/distfiles') + pkgdir = path.join(builder_path, 'usr/portage/packages') for target_dn, target in [ (distrdir, find(distrdir, fullpath=False)),