From e6cdc9dbd007c839f2dd95691fb1a66fb15f86b4 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Thu, 10 Aug 2017 16:05:55 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20ftp://localhost?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/CBB/make.defaults | 2 ++ profiles/CBD/amd64/parent | 1 + profiles/CBD/x86/parent | 1 + profiles/CBE/amd64/parent | 1 + profiles/CBE/x86/parent | 1 + profiles/CBL/amd64/parent | 2 -- profiles/CBL/calculate.env | 3 --- profiles/CBL/package.use | 1 - profiles/CBL/parent | 1 - profiles/CBL/x86/parent | 2 -- profiles/CBS/amd64/parent | 1 + profiles/CBS/x86/parent | 1 + profiles/CBW/amd64/parent | 1 + profiles/CBW/x86/parent | 1 + profiles/amd64/make.defaults | 1 + profiles/make.defaults | 2 +- profiles/profiles.desc | 2 -- profiles/x86/make.defaults | 1 + 18 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 profiles/CBB/make.defaults delete mode 100644 profiles/CBL/amd64/parent delete mode 100644 profiles/CBL/calculate.env delete mode 100644 profiles/CBL/package.use delete mode 100644 profiles/CBL/parent delete mode 100644 profiles/CBL/x86/parent create mode 100644 profiles/amd64/make.defaults create mode 100644 profiles/x86/make.defaults diff --git a/profiles/CBB/make.defaults b/profiles/CBB/make.defaults new file mode 100644 index 00000000..4eaed427 --- /dev/null +++ b/profiles/CBB/make.defaults @@ -0,0 +1,2 @@ +USE="" +FEATURES="-getbinpkg" diff --git a/profiles/CBD/amd64/parent b/profiles/CBD/amd64/parent index 1627eb4e..222f65c9 100644 --- a/profiles/CBD/amd64/parent +++ b/profiles/CBD/amd64/parent @@ -1,2 +1,3 @@ ../../../../calculate/profiles/base/desktop/amd64 +../../amd64 .. diff --git a/profiles/CBD/x86/parent b/profiles/CBD/x86/parent index 0bb9835d..547d438e 100644 --- a/profiles/CBD/x86/parent +++ b/profiles/CBD/x86/parent @@ -1,2 +1,3 @@ ../../../../calculate/profiles/base/desktop/x86 +../../x86 .. diff --git a/profiles/CBE/amd64/parent b/profiles/CBE/amd64/parent index 1627eb4e..222f65c9 100644 --- a/profiles/CBE/amd64/parent +++ b/profiles/CBE/amd64/parent @@ -1,2 +1,3 @@ ../../../../calculate/profiles/base/desktop/amd64 +../../amd64 .. diff --git a/profiles/CBE/x86/parent b/profiles/CBE/x86/parent index 0bb9835d..547d438e 100644 --- a/profiles/CBE/x86/parent +++ b/profiles/CBE/x86/parent @@ -1,2 +1,3 @@ ../../../../calculate/profiles/base/desktop/x86 +../../x86 .. diff --git a/profiles/CBL/amd64/parent b/profiles/CBL/amd64/parent deleted file mode 100644 index 1627eb4e..00000000 --- a/profiles/CBL/amd64/parent +++ /dev/null @@ -1,2 +0,0 @@ -../../../../calculate/profiles/base/desktop/amd64 -.. diff --git a/profiles/CBL/calculate.env b/profiles/CBL/calculate.env deleted file mode 100644 index a6e4142d..00000000 --- a/profiles/CBL/calculate.env +++ /dev/null @@ -1,3 +0,0 @@ -[main] -os_linux_name = 'Calculate Builder Language' -os_linux_shortname = 'CBL' diff --git a/profiles/CBL/package.use b/profiles/CBL/package.use deleted file mode 100644 index 0fcb253e..00000000 --- a/profiles/CBL/package.use +++ /dev/null @@ -1 +0,0 @@ -sys-apps/calculate-utils -backup -client -console -desktop -install -pxe -qt4 diff --git a/profiles/CBL/parent b/profiles/CBL/parent deleted file mode 100644 index f3229c5b..00000000 --- a/profiles/CBL/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/profiles/CBL/x86/parent b/profiles/CBL/x86/parent deleted file mode 100644 index 0bb9835d..00000000 --- a/profiles/CBL/x86/parent +++ /dev/null @@ -1,2 +0,0 @@ -../../../../calculate/profiles/base/desktop/x86 -.. diff --git a/profiles/CBS/amd64/parent b/profiles/CBS/amd64/parent index 0a823a10..477bda56 100644 --- a/profiles/CBS/amd64/parent +++ b/profiles/CBS/amd64/parent @@ -1,2 +1,3 @@ ../../../../calculate/profiles/base/server/amd64 +../../amd64 .. diff --git a/profiles/CBS/x86/parent b/profiles/CBS/x86/parent index c971f0f3..00d6d767 100644 --- a/profiles/CBS/x86/parent +++ b/profiles/CBS/x86/parent @@ -1,2 +1,3 @@ ../../../../calculate/profiles/base/server/x86 +../../x86 .. diff --git a/profiles/CBW/amd64/parent b/profiles/CBW/amd64/parent index 1627eb4e..222f65c9 100644 --- a/profiles/CBW/amd64/parent +++ b/profiles/CBW/amd64/parent @@ -1,2 +1,3 @@ ../../../../calculate/profiles/base/desktop/amd64 +../../amd64 .. diff --git a/profiles/CBW/x86/parent b/profiles/CBW/x86/parent index 0bb9835d..547d438e 100644 --- a/profiles/CBW/x86/parent +++ b/profiles/CBW/x86/parent @@ -1,2 +1,3 @@ ../../../../calculate/profiles/base/desktop/x86 +../../x86 .. diff --git a/profiles/amd64/make.defaults b/profiles/amd64/make.defaults new file mode 100644 index 00000000..f15f8005 --- /dev/null +++ b/profiles/amd64/make.defaults @@ -0,0 +1 @@ +PORTAGE_BINHOST="ftp://localhost/base/grp/x86_64" diff --git a/profiles/make.defaults b/profiles/make.defaults index 42d60c4c..275a18df 100644 --- a/profiles/make.defaults +++ b/profiles/make.defaults @@ -1,2 +1,2 @@ USE="" -FEATURES="-getbinpkg buildpkg" +FEATURES="getbinpkg buildpkg" diff --git a/profiles/profiles.desc b/profiles/profiles.desc index dd041a74..fdef1ca7 100644 --- 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 diff --git a/profiles/x86/make.defaults b/profiles/x86/make.defaults new file mode 100644 index 00000000..10e4ab97 --- /dev/null +++ b/profiles/x86/make.defaults @@ -0,0 +1 @@ +PORTAGE_BINHOST="ftp://localhost/base/grp/i686"