|
|
|
@ -318,7 +318,6 @@ sub getarg{
|
|
|
|
|
"nfs",
|
|
|
|
|
"ntp",
|
|
|
|
|
"patchdir",
|
|
|
|
|
"portdir",
|
|
|
|
|
"proxy",
|
|
|
|
|
"server_url",
|
|
|
|
|
"skipfirst",
|
|
|
|
@ -2548,7 +2547,7 @@ sub checksystem{
|
|
|
|
|
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
# Определим переменные окружения emerge и команду запуска emerge
|
|
|
|
|
# $data{makeopts}, $data{portdir}, $data{distdir}, $data{pkgdir}
|
|
|
|
|
# $data{makeopts}, $data{distdir}, $data{pkgdir}
|
|
|
|
|
# $data{emergerun1}, $data{emergerun2}
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
{
|
|
|
|
@ -2561,19 +2560,6 @@ sub checksystem{
|
|
|
|
|
}
|
|
|
|
|
$data{makeopts} = "-j$makecpu";
|
|
|
|
|
}
|
|
|
|
|
if(!$data{portdir}){
|
|
|
|
|
# my $portdir;
|
|
|
|
|
# open (F, "/etc/make.conf");
|
|
|
|
|
# foreach(`emerge --info`){
|
|
|
|
|
# if(m/PORTDIR_OVERLAY="([^"]+)"/){$portdir = $1; break;}
|
|
|
|
|
# }
|
|
|
|
|
# close (F);
|
|
|
|
|
$data{portdir} = "/usr/local/overlays/calculate";
|
|
|
|
|
# my $calcportdir = $data{portdir};
|
|
|
|
|
# foreach(split / /, $portdir){
|
|
|
|
|
# if($_ && $_ ne $calcportdir){$data{portdir} .= " $_";}
|
|
|
|
|
# }
|
|
|
|
|
}
|
|
|
|
|
if(!$data{distdir}){
|
|
|
|
|
$data{distdir} = "/usr/calculate/share/distfiles";
|
|
|
|
|
}
|
|
|
|
@ -2581,7 +2567,7 @@ sub checksystem{
|
|
|
|
|
$data{pkgdir} = "/usr/calculate/share/packages/$data{calculate}/$data{linuxver}/$data{march}";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$data{emergerun1} = "PORTDIR_OVERLAY='$data{portdir}' MAKEOPTS='$data{makeopts}'";
|
|
|
|
|
$data{emergerun1} = "";
|
|
|
|
|
$data{emergerun2} = "";
|
|
|
|
|
if($data{builder}){
|
|
|
|
|
if(!defined $data{addition}){
|
|
|
|
@ -3158,42 +3144,6 @@ sub setup{
|
|
|
|
|
printmes(" ".gettext('done').".\n");
|
|
|
|
|
} }
|
|
|
|
|
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
# Настроим make.conf
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
printmes(" ".gettext('Update')); printmes(" /etc/make.conf...");
|
|
|
|
|
{
|
|
|
|
|
my $vars;
|
|
|
|
|
if(number_ver($data{linuxver}) >= number_ver(8.9)){
|
|
|
|
|
$vars.=qq#PKGDIR="$data{pkgdir}"\n#;
|
|
|
|
|
}
|
|
|
|
|
$vars.= qq#MAKEOPTS="$data{makeopts}"\n#;
|
|
|
|
|
open (F,">>$data{'chroot'}/etc/make.conf"); flock(F, 2); print F $vars; close (F);
|
|
|
|
|
}
|
|
|
|
|
printmes(" ".gettext('done').".\n");
|
|
|
|
|
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
# Пропишем название в загрузочный скрипт
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
if(number_ver($data{linuxver}) < number_ver(9.5)){
|
|
|
|
|
printmes(" ".gettext('Update')); printmes(" /sbin/rc...");
|
|
|
|
|
my $rcscript;
|
|
|
|
|
my $rcpath = "$data{'chroot'}/sbin/rc";
|
|
|
|
|
if(-e $rcpath){
|
|
|
|
|
open(R, $rcpath);
|
|
|
|
|
foreach(<R>){
|
|
|
|
|
$_=~s/(.*)Gentoo Linux\${GENTOO_VERS}; \${BRACKET}http:\/\/www\.gentoo\.org\/(.*)/$1$data{calculatename} $data{linuxver}; http\/\/www.calculate-linux.org$2/;
|
|
|
|
|
$_=~s/(.+)Copyright.+Gentoo Foundation;(.+)/$1Copyright 2008 Calculate Pack;$2/;
|
|
|
|
|
$rcscript .= $_;
|
|
|
|
|
}
|
|
|
|
|
close(R);
|
|
|
|
|
open(C, ">$rcpath"); print C $rcscript; close(C);
|
|
|
|
|
|
|
|
|
|
printmes(" ".gettext('done').".\n");
|
|
|
|
|
}else{
|
|
|
|
|
printmes(" ".gettext('file not found')." $rcpath.\n");
|
|
|
|
|
} }
|
|
|
|
|
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
# Сохраним диск, с которого произвелась установка
|
|
|
|
|
# за исключением установки с CD или с ПК на USB или с USB на ПК
|
|
|
|
@ -4190,7 +4140,7 @@ sub packsystem{
|
|
|
|
|
#Обновим базу портежей программы eix
|
|
|
|
|
printmes(" ".gettext('Update portige base of eix programm')); printmes("...");
|
|
|
|
|
if(-e "$data{'chroot'}/usr/bin/update-eix"){
|
|
|
|
|
if(system(qq|$data{path} chroot $data{'chroot'} /usr/calculate/install/calculate --chroot="PORTDIR_OVERLAY='$data{portdir}' update-eix &>/dev/null"|)){
|
|
|
|
|
if(system(qq|$data{path} chroot $data{'chroot'} /usr/calculate/install/calculate --chroot="update-eix &>/dev/null"|)){
|
|
|
|
|
printmes(" ".gettext('error').".\n");
|
|
|
|
|
}else{
|
|
|
|
|
printmes(" ".gettext('done')); printmes(".\n");
|
|
|
|
|