Merge branch 'develop' of git.calculate-linux.org:calculate/container-overlay into develop

3 years ago · 6d608261b5
parent 4ca98655db e445d30544
commit 6d608261b5
12 changed files with 7 additions and 4 deletions
--- a/profiles/CCG/amd64/20/calculate.env
+++ b/profiles/CCG/amd64/20/calculate.env
--- a/profiles/CCG/amd64/20/parent
+++ b/profiles/CCG/amd64/20/parent
--- a/profiles/CCG/amd64/parent
+++ b/profiles/CCG/amd64/parent
--- a/profiles/CCG/calculate.env
+++ b/profiles/CCG/calculate.env
@ -0,0 +1,3 @@
+[main]
+os_linux_name = 'Calculate Container Games'
+os_linux_shortname = 'CCG'
--- a/profiles/CCG/ini.env
+++ b/profiles/CCG/ini.env
@ -0,0 +1,2 @@
+[container]
+type = desktop
--- a/profiles/CCG/package.use
+++ b/profiles/CCG/package.use
@ -0,0 +1 @@
+sys-apps/calculate-utils -dbus -qt5 desktop
--- a/profiles/CCG/parent
+++ b/profiles/CCG/parent
--- a/profiles/CCG/x86/20/calculate.env
+++ b/profiles/CCG/x86/20/calculate.env
--- a/profiles/CCG/x86/20/parent
+++ b/profiles/CCG/x86/20/parent
--- a/profiles/CCG/x86/parent
+++ b/profiles/CCG/x86/parent
--- a/profiles/CCX/calculate.env
+++ b/profiles/CCX/calculate.env
@ -1,3 +0,0 @@
-[main]
-os_linux_name = 'Calculate Container X'
-os_linux_shortname = 'CCX'
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@ -8,6 +8,6 @@

 # AMD64 Profiles
 amd64		CCS/amd64/20					stable
-amd64		CCX/amd64/20					dev
+amd64		CCG/amd64/20					dev

 # vim: set ts=8