Добавлена настройка использования ftp://localhost

7 years ago · e6cdc9dbd0
parent e226c5c6ff
commit e6cdc9dbd0
18 changed files with 13 additions and 12 deletions
--- a/profiles/CBB/make.defaults
+++ b/profiles/CBB/make.defaults
@ -0,0 +1,2 @@
+USE=""
+FEATURES="-getbinpkg"
--- a/profiles/CBD/amd64/parent
+++ b/profiles/CBD/amd64/parent
@ -1,2 +1,3 @@
 ../../../../calculate/profiles/base/desktop/amd64
+../../amd64
 ..
--- a/profiles/CBD/x86/parent
+++ b/profiles/CBD/x86/parent
@ -1,2 +1,3 @@
 ../../../../calculate/profiles/base/desktop/x86
+../../x86
 ..
--- a/profiles/CBE/amd64/parent
+++ b/profiles/CBE/amd64/parent
@ -1,2 +1,3 @@
 ../../../../calculate/profiles/base/desktop/amd64
+../../amd64
 ..
--- a/profiles/CBE/x86/parent
+++ b/profiles/CBE/x86/parent
@ -1,2 +1,3 @@
 ../../../../calculate/profiles/base/desktop/x86
+../../x86
 ..
--- a/profiles/CBL/amd64/parent
+++ b/profiles/CBL/amd64/parent
@ -1,2 +0,0 @@
-../../../../calculate/profiles/base/desktop/amd64
-..
--- a/profiles/CBL/calculate.env
+++ b/profiles/CBL/calculate.env
@ -1,3 +0,0 @@
-[main]
-os_linux_name = 'Calculate Builder Language'
-os_linux_shortname = 'CBL'
--- a/profiles/CBL/package.use
+++ b/profiles/CBL/package.use
@ -1 +0,0 @@
-sys-apps/calculate-utils -backup -client -console -desktop -install -pxe -qt4
--- a/profiles/CBL/parent
+++ b/profiles/CBL/parent
@ -1 +0,0 @@
-..
--- a/profiles/CBL/x86/parent
+++ b/profiles/CBL/x86/parent
@ -1,2 +0,0 @@
-../../../../calculate/profiles/base/desktop/x86
-..
--- a/profiles/CBS/amd64/parent
+++ b/profiles/CBS/amd64/parent
@ -1,2 +1,3 @@
 ../../../../calculate/profiles/base/server/amd64
+../../amd64
 ..
--- a/profiles/CBS/x86/parent
+++ b/profiles/CBS/x86/parent
@ -1,2 +1,3 @@
 ../../../../calculate/profiles/base/server/x86
+../../x86
 ..
--- a/profiles/CBW/amd64/parent
+++ b/profiles/CBW/amd64/parent
@ -1,2 +1,3 @@
 ../../../../calculate/profiles/base/desktop/amd64
+../../amd64
 ..
--- a/profiles/CBW/x86/parent
+++ b/profiles/CBW/x86/parent
@ -1,2 +1,3 @@
 ../../../../calculate/profiles/base/desktop/x86
+../../x86
 ..
--- a/profiles/amd64/make.defaults
+++ b/profiles/amd64/make.defaults
@ -0,0 +1 @@
+PORTAGE_BINHOST="ftp://localhost/base/grp/x86_64"
--- a/profiles/make.defaults
+++ b/profiles/make.defaults
@ -1,2 +1,2 @@
 USE=""
-FEATURES="-getbinpkg buildpkg"
+FEATURES="getbinpkg buildpkg"
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@ -8,7 +8,6 @@

 # AMD64 Profiles
 amd64		CBB/amd64					dev
-amd64		CBL/amd64					dev
 amd64		CBD/amd64					dev
 amd64		CBS/amd64					dev
 amd64		CBE/amd64					dev
@ -16,7 +15,6 @@ amd64		CBW/amd64					dev

 # x86 Profiles
 x86		CBB/x86						dev
-x86		CBL/x86						dev
 x86		CBD/x86						dev
 x86		CBS/x86						dev
 x86		CBE/x86						dev
--- a/profiles/x86/make.defaults
+++ b/profiles/x86/make.defaults
@ -0,0 +1 @@
+PORTAGE_BINHOST="ftp://localhost/base/grp/i686"
				`@ -1 +0,0 @@`
				`sys-apps/calculate-utils -backup -client -console -desktop -install -pxe -qt4`
				`@ -0,0 +1 @@`
				`PORTAGE_BINHOST="ftp://localhost/base/grp/x86_64"`