|
|
@ -3993,7 +3993,7 @@ sub configure{
|
|
|
|
system "$data{path} cp '$data{kernel_config_loadpath}/$data{kernel_config_name}' '$data{kernel_config_build}'";
|
|
|
|
system "$data{path} cp '$data{kernel_config_loadpath}/$data{kernel_config_name}' '$data{kernel_config_build}'";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#выполним make oldconfig если система собирается не из CLS
|
|
|
|
#выполним make oldconfig и make modules_prepare если система собирается не из CLS
|
|
|
|
if($data{stage} !~m/iso$/){
|
|
|
|
if($data{stage} !~m/iso$/){
|
|
|
|
printmes(" ".gettext('Execute')); printmes(" make oldconfig...\n");
|
|
|
|
printmes(" ".gettext('Execute')); printmes(" make oldconfig...\n");
|
|
|
|
if(system qq|$data{path} chroot $data{chroot} /usr/calculate/install/calculate --chroot="cd /usr/src/linux && make oldconfig"|){
|
|
|
|
if(system qq|$data{path} chroot $data{chroot} /usr/calculate/install/calculate --chroot="cd /usr/src/linux && make oldconfig"|){
|
|
|
@ -4001,7 +4001,16 @@ sub configure{
|
|
|
|
umountbuild(); return '';
|
|
|
|
umountbuild(); return '';
|
|
|
|
}else{
|
|
|
|
}else{
|
|
|
|
printmes(" ".gettext('done').".\n");
|
|
|
|
printmes(" ".gettext('done').".\n");
|
|
|
|
} }
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
printmes(" ".gettext('Execute')); printmes(" make modules_prepare...\n");
|
|
|
|
|
|
|
|
if(system qq|$data{path} chroot $data{chroot} /usr/calculate/install/calculate --chroot="cd /usr/src/linux && make modules_prepare"|){
|
|
|
|
|
|
|
|
printmes(" ".gettext('error')."!\n");
|
|
|
|
|
|
|
|
umountbuild(); return '';
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
|
|
|
printmes(" ".gettext('done').".\n");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#выполним make menuconfig
|
|
|
|
#выполним make menuconfig
|
|
|
|
if($data{menuconfig} eq 'on'){
|
|
|
|
if($data{menuconfig} eq 'on'){
|
|
|
@ -4048,7 +4057,17 @@ sub configure{
|
|
|
|
}else{
|
|
|
|
}else{
|
|
|
|
printmes(" ".gettext('done').".\n");
|
|
|
|
printmes(" ".gettext('done').".\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#chroot emerge sys-fs/aufs2
|
|
|
|
|
|
|
|
printmes(" ".gettext('Execute')); printmes(" emerge sys-fs/aufs2...");
|
|
|
|
|
|
|
|
if(system "$data{emergerun1} sys-fs/aufs2 $data{emergerun2} &>/dev/null"){
|
|
|
|
|
|
|
|
printmes(" ".gettext('error')."!\n");
|
|
|
|
|
|
|
|
umountbuild(); return '';
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
|
|
|
printmes(" ".gettext('done').".\n");
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#удалим ссылку net.eth0, т.к. во всех десктопах, кроме CLS будет использоваться networkmanager
|
|
|
|
#удалим ссылку net.eth0, т.к. во всех десктопах, кроме CLS будет использоваться networkmanager
|
|
|
|
if($data{calculate} ne "CDS" && $data{calculate} ne "CLS"){system "$data{path} rm -f $data{chroot}/etc/init.d/net.eth0";}
|
|
|
|
if($data{calculate} ne "CDS" && $data{calculate} ne "CLS"){system "$data{path} rm -f $data{chroot}/etc/init.d/net.eth0";}
|
|
|
|
|
|
|
|
|
|
|
|