|
|
|
@ -4492,7 +4492,7 @@ sub make{
|
|
|
|
|
printmes(" ".gettext('done')); printmes(".\n");
|
|
|
|
|
} }
|
|
|
|
|
if(getini("run.make.step.newuse", "chroot")){
|
|
|
|
|
printmes(" ".gettext('Execute')); printmes(" emerge --newuse world...");
|
|
|
|
|
printmes(" ".gettext('Execute')); printmes(" emerge --newuse -D world...");
|
|
|
|
|
printmes(" ".gettext('done')); printmes(".\n");
|
|
|
|
|
}
|
|
|
|
|
if(getini("run.make.step.update", "chroot")){
|
|
|
|
@ -4521,8 +4521,8 @@ sub make{
|
|
|
|
|
printmes(" ".gettext('done').".\n");
|
|
|
|
|
}
|
|
|
|
|
}elsif($data{stage} =~m/iso$/ && !getini("run.make.step.newuse", "chroot")){
|
|
|
|
|
printmes(" ".gettext('Execute')); printmes(" emerge --newuse world...\n");
|
|
|
|
|
if(system "$data{emergerun1} --newuse world $data{emergerun2} --nodie"){
|
|
|
|
|
printmes(" ".gettext('Execute')); printmes(" emerge --newuse -D world...\n");
|
|
|
|
|
if(system "$data{emergerun1} --newuse -D world $data{emergerun2} --nodie"){
|
|
|
|
|
beep(); printmes(" ".gettext('error')."!\n"); return '';
|
|
|
|
|
}else{
|
|
|
|
|
#отметим успешное выполнение
|
|
|
|
@ -4544,14 +4544,23 @@ sub make{
|
|
|
|
|
beep();
|
|
|
|
|
printmes(" ".gettext('error')."!\n"); return '';
|
|
|
|
|
}else{
|
|
|
|
|
printmes(" ".gettext('done').".\n");
|
|
|
|
|
|
|
|
|
|
#The end check USE flags
|
|
|
|
|
printmes(" ".gettext('Execute')); printmes(" emerge --newuse -D world...\n");
|
|
|
|
|
if(system "$data{emergerun1} --newuse -D world $data{emergerun2} --nodie"){
|
|
|
|
|
beep(); printmes(" ".gettext('error')."!\n"); return '';
|
|
|
|
|
}else{
|
|
|
|
|
printmes(" ".gettext('done').".\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#сбросим успешно выполненную операцию
|
|
|
|
|
putini("run.make" => "", "chroot");
|
|
|
|
|
#увеличим счетчик проходов
|
|
|
|
|
my $step = getini("run.make.step.world", "chroot"); $step ++;
|
|
|
|
|
putini("run.make.step.world" => $step, "chroot");
|
|
|
|
|
|
|
|
|
|
printmes(" ".gettext('done').".\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$finish ++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -4699,7 +4708,7 @@ sub packsystem{
|
|
|
|
|
#Удалим временные файлы
|
|
|
|
|
clearlog($data{chroot});
|
|
|
|
|
|
|
|
|
|
#Сформируем world
|
|
|
|
|
#Сформируем world (предварительно файл очищен)
|
|
|
|
|
foreach(packages()){
|
|
|
|
|
system "echo '$_' >> $chroot/var/lib/portage/world";
|
|
|
|
|
}
|
|
|
|
|