git-svn-id: http://svn.calculate.ru/calculate/trunk@1699 c91db197-33c1-4113-bf15-f8a5c547ca64

install/builder/profile/0builder/etc/~etc-update.conf

@@ -0,0 +1,2 @@
+mv_opts=""
+

install/builder/profile/0builder/usr/local/portage/layman/make.conf

@@ -0,0 +1,4 @@
+PORTDIR_OVERLAY="
+/usr/local/portage/layman/calculate
+$PORTDIR_OVERLAY
+"

install/calculate

@@ -3547,6 +3547,28 @@ sub configure{
 	#printmes(gettext('Perform checkouts')); printmes("\n");
 	#printmes("  ".gettext('New release number')); printmes("...");
 
+	#-------------------------------------
+	# выполним настройки в текущей системе
+	#-------------------------------------
+	printmes("  ".gettext('Load')); printmes(" Calculate Overlay...");
+	if(!system "layman -l | grep calculate &>/dev/null" &&
+	   system "layman -a calculate --overlays=http://svn.calculate.ru/overlay/layman-calculate.txt"){
+	   	printmes(" ".gettext('error')."!\n");
+		umountbuild(); return '';
+	}
+	printmes(" ".gettext('done').".\n");
+
+	#Скопируем Calculate Overlay
+	printmes("  ".gettext('Copy')); printmes(" Calculate Overlay...");
+	if(system "
+		$data{path} mkdir -p $data{chroot}/usr/local/portage/layman &&
+		$data{path} cp -a /usr/local/portage/layman/calculate $data{chroot}/usr/local/portage/layman
+	"){
+		printmes(" ".gettext('error')."!\n");
+		umountbuild(); return '';
+	}
+	printmes(" ".gettext('done').".\n");
+
 	#Подмонтируем /proc
 	printmes("  ".gettext('Mount')); printmes(" /proc...");
 	if(system "$data{path} mount -t proc none $data{chroot}/proc &>/dev/null"){
@@ -3608,17 +3630,6 @@ sub configure{
 		printmes(" ".gettext('done').".\n");
 	}
 
-	#Выполним в chroot-окружении
-	printmes(gettext('Execute in chroot environment')); printmes("\n");
-	#chroot emerge --metadata
-	printmes("  ".gettext('Execute')); printmes(" emerge --metadata...");
-	if(system "$data{emergerun1} --metadata $data{emergerun2} &>/dev/null"){
-		printmes(" ".gettext('error')."!\n");
-		umountbuild(); return '';
-	}else{
-		printmes(" ".gettext('done').".\n");
-	}
-
 	#chroot emerge --sync
 	printmes("  ".gettext('Perform portages update')); printmes("...");
 	if(system "$data{emergerun1} --sync $data{emergerun2} &>/dev/null"){
@@ -3628,20 +3639,6 @@ sub configure{
 		printmes(" ".gettext('done').".\n");
 	}
 
-# 	#chroot update overlay
-# 	printmes("  ".gettext('Perform calculate overlay update')); printmes("...");
-# 	if(
-# 		system("$data{exec_wget} --quiet -r --level=6 --no-parent --reject index.html --directory-prefix=/tmp http://svn.calculate.ru/overlay/") ||
-# 		system("rm -rf $data{chroot}/usr/local/overlays/calculate") ||
-# 		system("mkdir $data{chroot}/usr/local/overlays") ||
-# 		system("mv /tmp/svn.calculate.ru/overlay $data{chroot}/usr/local/overlays/calculate") ||
-# 		system("rmdir /tmp/svn.calculate.ru")
-# 	){
-# 		printmes(" ".gettext('error').".\n");
-# 	}else{
-# 		printmes(" ".gettext('done').".\n");
-# 	}
-
 	#chroot emerge sys-apps/portage
 	printmes("  ".gettext('Execute')); printmes(" emerge sys-apps/portage...");
 	if(system "$data{emergerun1} sys-apps/portage $data{emergerun2} &>/dev/null"){

install/profile/1default/etc/~etc-update.conf

@@ -0,0 +1,2 @@
+mv_opts="-i"
+