|
|
|
@ -1412,11 +1412,11 @@ class cl_assemble(color_print):
|
|
|
|
|
"""Fetch propreitary drivers"""
|
|
|
|
|
if self.clVars.Get('cl_assemble_withvideo_set') == "on":
|
|
|
|
|
drivers = [
|
|
|
|
|
('nvidia-drivers 260.XX.XX',
|
|
|
|
|
('nvidia-drivers',
|
|
|
|
|
'x11-drivers/nvidia-drivers'),
|
|
|
|
|
('nvidia-drivers 173.XX.XX',
|
|
|
|
|
('nvidia-drivers',
|
|
|
|
|
'\\<x11-drivers/nvidia-drivers-174'),
|
|
|
|
|
('nvidia-drivers 96.XX.XX',
|
|
|
|
|
('nvidia-drivers',
|
|
|
|
|
'\\<x11-drivers/nvidia-drivers-97'),
|
|
|
|
|
('ati-drivers',
|
|
|
|
|
'x11-drivers/ati-drivers')
|
|
|
|
@ -1443,8 +1443,30 @@ class cl_assemble(color_print):
|
|
|
|
|
while drivers:
|
|
|
|
|
repeatDrivers = []
|
|
|
|
|
for verName,drvVer in drivers:
|
|
|
|
|
checkprocess = self.runChroot(
|
|
|
|
|
"emerge -p %s"%
|
|
|
|
|
drvVer, raiseError=False,joinErr=True)
|
|
|
|
|
checkprocess = self.runChroot(
|
|
|
|
|
"emerge -vp %s"%
|
|
|
|
|
drvVer,raiseError=False,joinErr=True)
|
|
|
|
|
rePackage = re.compile("^\[ebuild[^\]]+]\s+(\S+)")
|
|
|
|
|
# get version from emerging nvidia-driver
|
|
|
|
|
nvidiaVersions = \
|
|
|
|
|
map(lambda x:x.groups()[1],
|
|
|
|
|
filter(lambda x:x,
|
|
|
|
|
map(self.reVerSplit.search,
|
|
|
|
|
map(lambda x:x.groups()[0],
|
|
|
|
|
filter(lambda x:x,
|
|
|
|
|
map(rePackage.search,
|
|
|
|
|
filter(lambda x:verName in x,
|
|
|
|
|
checkprocess)))))))
|
|
|
|
|
|
|
|
|
|
if nvidiaVersions:
|
|
|
|
|
nvidiaVersions = nvidiaVersions[0]
|
|
|
|
|
else:
|
|
|
|
|
nvidiaVersions = "0"
|
|
|
|
|
self.printMessageForTest(" " +
|
|
|
|
|
_("Fetching %s")%verName)
|
|
|
|
|
_("Fetching %s")%"%s-%s"%(verName,nvidiaVersions))
|
|
|
|
|
# run verbose package emergin for get version
|
|
|
|
|
fetchprocess = self.runChroot(
|
|
|
|
|
"emerge -f %s"%
|
|
|
|
|