Изменения в структуре

10 years ago · 67f8f7e7d1
parent 8a8a6a996a
commit 67f8f7e7d1
9 changed files with 9 additions and 14 deletions
--- a/profiles/CLDX/amd64/binary/parent
+++ b/profiles/CLDX/amd64/binary/parent
@ -1,3 +1,2 @@
 ..
-../../binary/make.conf
 ../../binary
--- a/profiles/CLDX/amd64/make.defaults
+++ b/profiles/CLDX/amd64/make.defaults
@ -1,5 +1,5 @@
 PKGDIR="/var/calculate/remote/packages/CLDX/x86_64"
 #PORTAGE_BINHOST="http://93.158.155.195/calculate/CLDX/grp/x86_64"
-PORTAGE_BINHOST="ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/CLDX/grp/x86_64"
-#PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CLDX/grp/x86_64"
+#PORTAGE_BINHOST="ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/CLDX/grp/x86_64"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CLDX/grp/x86_64"

--- a/profiles/CLDX/amd64/parent
+++ b/profiles/CLDX/amd64/parent
@ -1,4 +1,3 @@
 ../../../../../../../usr/portage/profiles/default/linux/amd64/13.0
 ../../../../calculate/profiles/calculate/desktop/CLDX/amd64
-../make.conf
 ..
--- a/profiles/CLDX/binary/make.conf/make.defaults
+++ b/profiles/CLDX/binary/make.conf/make.defaults
--- a/profiles/CLDX/calculate.env
+++ b/profiles/CLDX/calculate.env
@ -1,12 +1,4 @@
 [main]
-cl_template_location = overlay,distro,local,remote
-cl_template_path = /var/lib/layman/calculate/profiles/templates,/var/lib/layman/distros/profiles/templates,/var/calculate/templates,/var/calculate/remote/templates
 os_linux_name = 'Calculate Linux Desktop'
 os_linux_subname = 'XFCE beta'
 os_linux_shortname = CLDX
-
-[update]
-cl_update_rep = rev
-cl_update_rep_name = portage,calculate,distros
-cl_update_rep_url = git://git.calculate.ru/calculate/portage.git,git://git.calculate.ru/calculate/overlay.git,git://git.calculate.ru/calculate/distros.git
-
--- a/profiles/CLDX/make.conf/make.defaults
+++ b/profiles/CLDX/make.conf/make.defaults
--- a/profiles/CLDX/x86/binary/parent
+++ b/profiles/CLDX/x86/binary/parent
@ -1,3 +1,2 @@
 ..
-../../binary/make.conf
 ../../binary
--- a/profiles/CLDX/x86/parent
+++ b/profiles/CLDX/x86/parent
@ -1,4 +1,3 @@
 ../../../../../../../../../../usr/portage/profiles/default/linux/x86/13.0
 ../../../../calculate/profiles/calculate/desktop/CLDX/x86
-../make.conf
 ..
--- a/profiles/calculate.env
+++ b/profiles/calculate.env
@ -1,3 +1,10 @@
 [main]
 os_linux_ver = 14
+cl_template_location = overlay,distro,local,remote
+cl_template_path = /var/lib/layman/calculate/profiles/templates,/var/lib/layman/distros/profiles/templates,/var/calculate/templates,/var/calculate/remote/templates
+
+[update]
+cl_update_rep = rev
+cl_update_rep_name = portage,calculate,distros
+cl_update_rep_url = git://git.calculate.ru/calculate/portage.git,git://git.calculate.ru/calculate/overlay.git,git://git.calculate.ru/calculate/distros.git