From 497da3e207c2015a43c5aa18718417d1fd9dec31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Thu, 12 Dec 2019 12:38:39 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=8B=20=D0=BF=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Добавлен профиль 20 с использованием /var/db/repos вместо /var/lib/layman
* Удалены профили CCDX, CLC
---
 profiles/CCDX/amd64/parent          | 2 --
 profiles/CCDX/calculate.env         | 3 ---
 profiles/CCDX/ini.env               | 2 --
 profiles/CCDX/package.use           | 1 -
 profiles/CCDX/parent                | 1 -
 profiles/CCDX/x86/parent            | 2 --
 profiles/CCS/amd64/20/calculate.env | 3 +++
 profiles/CCS/amd64/20/parent        | 2 ++
 profiles/CCS/x86/20/calculate.env   | 3 +++
 profiles/CCS/x86/20/parent          | 2 ++
 profiles/CLC/amd64/parent           | 2 --
 profiles/CLC/calculate.env          | 3 ---
 profiles/CLC/ini.env                | 2 --
 profiles/CLC/parent                 | 1 -
 profiles/CLC/x86/parent             | 2 --
 15 files changed, 10 insertions(+), 21 deletions(-)
 delete mode 100644 profiles/CCDX/amd64/parent
 delete mode 100644 profiles/CCDX/calculate.env
 delete mode 100644 profiles/CCDX/ini.env
 delete mode 100644 profiles/CCDX/package.use
 delete mode 100644 profiles/CCDX/parent
 delete mode 100644 profiles/CCDX/x86/parent
 create mode 100644 profiles/CCS/amd64/20/calculate.env
 create mode 100644 profiles/CCS/amd64/20/parent
 create mode 100644 profiles/CCS/x86/20/calculate.env
 create mode 100644 profiles/CCS/x86/20/parent
 delete mode 100644 profiles/CLC/amd64/parent
 delete mode 100644 profiles/CLC/calculate.env
 delete mode 100644 profiles/CLC/ini.env
 delete mode 100644 profiles/CLC/parent
 delete mode 100644 profiles/CLC/x86/parent

diff --git a/profiles/CCDX/amd64/parent b/profiles/CCDX/amd64/parent
deleted file mode 100644
index 410f9d0..0000000
--- a/profiles/CCDX/amd64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../calculate/profiles/default/amd64/18/desktop
-..
diff --git a/profiles/CCDX/calculate.env b/profiles/CCDX/calculate.env
deleted file mode 100644
index 9a1ef45..0000000
--- a/profiles/CCDX/calculate.env
+++ /dev/null
@@ -1,3 +0,0 @@
-[main]
-os_linux_name = 'Calculate Container Desktop Xfce'
-os_linux_shortname = 'CCDX'
diff --git a/profiles/CCDX/ini.env b/profiles/CCDX/ini.env
deleted file mode 100644
index e477988..0000000
--- a/profiles/CCDX/ini.env
+++ /dev/null
@@ -1,2 +0,0 @@
-[container]
-type = desktop
diff --git a/profiles/CCDX/package.use b/profiles/CCDX/package.use
deleted file mode 100644
index c9c7952..0000000
--- a/profiles/CCDX/package.use
+++ /dev/null
@@ -1 +0,0 @@
-sys-apps/calculate-utils backup client console desktop qt4 -install -pxe -server
diff --git a/profiles/CCDX/parent b/profiles/CCDX/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/CCDX/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/CCDX/x86/parent b/profiles/CCDX/x86/parent
deleted file mode 100644
index c4bd4f6..0000000
--- a/profiles/CCDX/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../calculate/profiles/default/x86/18/desktop
-..
diff --git a/profiles/CCS/amd64/20/calculate.env b/profiles/CCS/amd64/20/calculate.env
new file mode 100644
index 0000000..e37c2a0
--- /dev/null
+++ b/profiles/CCS/amd64/20/calculate.env
@@ -0,0 +1,3 @@
+[main]
+cl_template_location = calculate,container,local,remote
+cl_template_path = /var/db/repos/calculate/profiles/templates,/var/db/repos/container/profiles/templates,/var/calculate/templates,/var/calculate/remote/templates
diff --git a/profiles/CCS/amd64/20/parent b/profiles/CCS/amd64/20/parent
new file mode 100644
index 0000000..044d048
--- /dev/null
+++ b/profiles/CCS/amd64/20/parent
@@ -0,0 +1,2 @@
+calculate:default/amd64/20/server
+../..
diff --git a/profiles/CCS/x86/20/calculate.env b/profiles/CCS/x86/20/calculate.env
new file mode 100644
index 0000000..e37c2a0
--- /dev/null
+++ b/profiles/CCS/x86/20/calculate.env
@@ -0,0 +1,3 @@
+[main]
+cl_template_location = calculate,container,local,remote
+cl_template_path = /var/db/repos/calculate/profiles/templates,/var/db/repos/container/profiles/templates,/var/calculate/templates,/var/calculate/remote/templates
diff --git a/profiles/CCS/x86/20/parent b/profiles/CCS/x86/20/parent
new file mode 100644
index 0000000..ce6971b
--- /dev/null
+++ b/profiles/CCS/x86/20/parent
@@ -0,0 +1,2 @@
+calculate:default/x86/20/server
+../..
diff --git a/profiles/CLC/amd64/parent b/profiles/CLC/amd64/parent
deleted file mode 100644
index 638d06a..0000000
--- a/profiles/CLC/amd64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../calculate/profiles/default/amd64/18/server
-..
diff --git a/profiles/CLC/calculate.env b/profiles/CLC/calculate.env
deleted file mode 100644
index 7778907..0000000
--- a/profiles/CLC/calculate.env
+++ /dev/null
@@ -1,3 +0,0 @@
-[main]
-os_linux_name = 'Calculate Linux Container'
-os_linux_shortname = 'CLC'
diff --git a/profiles/CLC/ini.env b/profiles/CLC/ini.env
deleted file mode 100644
index dfc26bf..0000000
--- a/profiles/CLC/ini.env
+++ /dev/null
@@ -1,2 +0,0 @@
-[container]
-type = host
diff --git a/profiles/CLC/parent b/profiles/CLC/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/CLC/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/CLC/x86/parent b/profiles/CLC/x86/parent
deleted file mode 100644
index e02bf53..0000000
--- a/profiles/CLC/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../calculate/profiles/default/x86/18/server
-..