Browse Source

Changed new path for cl-builder.

master
Трацевский Александр 12 years ago
parent
commit
a299162727
  1. 2
      COPYING
  2. 18
      install/calculate
  3. 3
      install/cl-builder

2
COPYING

@ -1,5 +1,5 @@
Calculate
Copyright (C) 2006-2009 Calculate Pack; http://www.calculate-linux.org
Copyright (C) 2006-2010 Calculate Ltd; http://www.calculate-linux.org
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

18
install/calculate

@ -756,7 +756,7 @@ sub checkerrors{
# Путь к архиву образа
#----------------------------------------------------------------------
#пути к архивам систем
$data{linuxdir} = "/usr/calculate/share/linux";
$data{linuxdir} = "/var/calculate/remote/linux";
#----------------------------------------------------------------------
# Определим и проверим директорию установки, директорию временных файлов
@ -1879,7 +1879,7 @@ sub checksystem{
# $data{stagepath}, $data{portagepath}
#----------------------------------------------------------------------
if($data{builder} && !defined $data{addition} && !$data{createiso}){
$data{stagepath} = "/usr/calculate/share/stages";
$data{stagepath} = "/var/calculate/remote/stages";
#определим максимальную версию stage нашей архитектуры, либо подставим маску
my $stage;
@ -1919,7 +1919,7 @@ sub checksystem{
beep();
exit;
}
$data{portagepath} = "/usr/calculate/share/snapshots";
$data{portagepath} = "/var/calculate/remote/snapshots";
if(!-e $data{portagepath}){
printmes(" ".gettext('Create directory')); printmes(" snapshots...");
@ -5327,8 +5327,11 @@ sub umount_build_dirs{
#------------------------------------------------------------------------------
sub createiso{
#проверим что не запущен cl-builder
if(`mount | grep "on /mnt/builder/usr/calculate/share"`
|| `mount | grep -c "devpts on /dev/pts "` != 1 ) {
if(
#`mount | grep "on /mnt/builder/var/calculate/remote"
#|| `mount | grep -c "devpts on /dev/pts "` != 1
`ps ax | grep -c "cl-builder"` > 2
) {
printmes(gettext('Error')."! ");
printmes(gettext('Before proceeding, complete the program cl-builder')); printmes(".\n");
return "";
@ -6531,11 +6534,6 @@ sub initrd_clean{
# получим имя файла конфигурации текущего ядра
my $config=`file -L $chroot$data{scratch_ws}/boot/vmlinuz`;
$config =~ s/^.*version ([^ ]+) .*$/$chroot$data{scratch_ws}\/boot\/config-\1/;
if(!-e $config ) {
$config=`file -L $chroot$data{scratch_ws}/boot/vmlinuz`;
$config =~ s/^.*version ([^ ]+) .*$/$chroot$data{scratch_ws}\/boot\/config-\1-$data{march}-$data{calculate}/;
$config =~ s/-calculate//;
}
# получим список внешних модулей в ядре в chroot
my @list_chroot_m=get_kernel_config(scalar `cat $config`,"m");

3
install/cl-builder

@ -1,7 +1,7 @@
#!/bin/bash
#------------------------------------------------------------------------------
# cl-builder
# Copyright ©2009 Mir Calculate Ltd.
# Copyright ©2009 Calculate Ltd.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -51,7 +51,6 @@ watching() {
#------------------------------------------------------------------------------
mountres() {
mount -o bind /var/calculate/remote ${BUILDER}/var/calculate/remote
mount -o bind /usr/calculate/share ${BUILDER}/usr/calculate/share
mount -t proc none ${BUILDER}/proc && mount -o bind /dev ${BUILDER}/dev &&
mount -t sysfs none ${BUILDER}/sys &&
mount -o bind /dev/pts ${BUILDER}/dev/pts && return 0

Loading…
Cancel
Save