Исправлена сборка бинарных пакетов, входящих в дистрибутивы

master
Трацевский Александр 15 years ago
parent c39ee89a08
commit f10e38fd4e

@ -1,4 +1,6 @@
CHANGE LOG
1.2.8
* Исправлена сборка бинарных nvidia драйверов.
1.2.7
* Добавлено отмонтирование раздела для установки если он подключен к /media.

@ -29,7 +29,6 @@ INPUT_DEVICES="keyboard mouse evdev synaptics"
LDFLAGS="-Wl,--as-needed"
LINGUAS="#-linguas-#"
MAKEOPTS="#-makeopts-#"
PKGDIR="#-pkgdir-#"
PORTAGE_NICENESS=19
VIDEO_CARDS="fbdev glint i810 intel mach64 mga neomagic nv radeon savage tdfx trident vesa vga via vmware"
source /usr/local/portage/layman/make.conf

@ -6775,7 +6775,7 @@ sub video{
if($mask ne $maskold){
printmes(" ".gettext('Driver Installation for')); printmes(" \"$data{video}\"... ");
system "echo '$mask' > $filemask";
if(system "PKGDIR=\"/usr/portage/packages\" emerge -bk nvidia-drivers > /dev/null"){
if(system "PKGDIR=\"/usr/portage/packages\" emerge -k nvidia-drivers > /dev/null"){
#в случае неудачи, удалим маску
system "rm $filemask";
printmes(gettext('error').".\n");
@ -6808,7 +6808,7 @@ sub makepkg{
printmes(" ".gettext('nvidia-drivers-71.XX.XX')); printmes("... ");
`echo ">x11-drivers/nvidia-drivers-72.00.00" > $data{'chroot'}/etc/portage/package.mask/nvidia`;
if(system "$data{emergerun1} -bk x11-drivers/nvidia-drivers $data{emergerun2} &>/dev/null"){
if(system "$data{emergerun1} -b x11-drivers/nvidia-drivers $data{emergerun2} &>/dev/null"){
beep();
printmes(gettext('error').".\n"); return '';
}else{
@ -6817,7 +6817,7 @@ sub makepkg{
printmes(" ".gettext('nvidia-drivers-96.XX.XX')); printmes("... ");
`echo ">x11-drivers/nvidia-drivers-97.00.00" > $data{'chroot'}/etc/portage/package.mask/nvidia`;
if(system "$data{emergerun1} -bk x11-drivers/nvidia-drivers $data{emergerun2} &>/dev/null"){
if(system "$data{emergerun1} -b x11-drivers/nvidia-drivers $data{emergerun2} &>/dev/null"){
beep();
printmes(gettext('error').".\n"); return '';
}else{
@ -6826,7 +6826,7 @@ sub makepkg{
printmes(" ".gettext('nvidia-drivers-173.XX.XX')); printmes("... ");
`echo ">x11-drivers/nvidia-drivers-174.00.00" > $data{'chroot'}/etc/portage/package.mask/nvidia`;
if(system "$data{emergerun1} -bk x11-drivers/nvidia-drivers $data{emergerun2} &>/dev/null"){
if(system "$data{emergerun1} -b x11-drivers/nvidia-drivers $data{emergerun2} &>/dev/null"){
beep();
printmes(gettext('error').".\n"); return '';
}else{

Loading…
Cancel
Save