From f26acffc85752b6ce0f65c70adcc1859928dc534 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Thu, 30 Jul 2015 15:18:27 +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=20=D0=BF=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D1=8C=20CLDO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/CLDO/amd64/parent | 2 ++ profiles/CLDO/calculate.env | 4 ++++ profiles/CLDO/make.defaults | 4 ++++ profiles/CLDO/parent | 1 + profiles/CLDO/x86/parent | 2 ++ profiles/profiles.desc | 2 ++ profiles/templates/3.2/6_ac_update_sync/world/0-ini | 2 +- .../3.2/6_ac_update_sync/world/create/openbox | 11 +++++++++++ .../3.2/6_ac_update_sync/world/create/tools | 1 - .../3.2/6_ac_update_sync/world/update/100-199/116 | 12 ++++++++++++ 10 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 profiles/CLDO/amd64/parent create mode 100644 profiles/CLDO/calculate.env create mode 100644 profiles/CLDO/make.defaults create mode 100644 profiles/CLDO/parent create mode 100644 profiles/CLDO/x86/parent create mode 100644 profiles/templates/3.2/6_ac_update_sync/world/update/100-199/116 diff --git a/profiles/CLDO/amd64/parent b/profiles/CLDO/amd64/parent new file mode 100644 index 0000000..d1fbc2c --- /dev/null +++ b/profiles/CLDO/amd64/parent @@ -0,0 +1,2 @@ +../../../../calculate/profiles/base/desktop/x/amd64 +.. diff --git a/profiles/CLDO/calculate.env b/profiles/CLDO/calculate.env new file mode 100644 index 0000000..ccaea7d --- /dev/null +++ b/profiles/CLDO/calculate.env @@ -0,0 +1,4 @@ +[main] +os_linux_name = 'Calculate Linux Desktop' +os_linux_subname = 'Openbox' +os_linux_shortname = CLDO diff --git a/profiles/CLDO/make.defaults b/profiles/CLDO/make.defaults new file mode 100644 index 0000000..a49b514 --- /dev/null +++ b/profiles/CLDO/make.defaults @@ -0,0 +1,4 @@ +USE="" +CL="builder client desktop console consolegui" +THEMES="CLDO" +LIGHTDM_SESSION=openbox diff --git a/profiles/CLDO/parent b/profiles/CLDO/parent new file mode 100644 index 0000000..f3229c5 --- /dev/null +++ b/profiles/CLDO/parent @@ -0,0 +1 @@ +.. diff --git a/profiles/CLDO/x86/parent b/profiles/CLDO/x86/parent new file mode 100644 index 0000000..54c256e --- /dev/null +++ b/profiles/CLDO/x86/parent @@ -0,0 +1,2 @@ +../../../../calculate/profiles/base/desktop/x/x86 +.. diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 821c3d4..bf0d4b1 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -11,6 +11,7 @@ amd64 CLD/amd64 stable amd64 CLDM/amd64 stable amd64 CLDX/amd64 stable +amd64 CLDO/amd64 stable amd64 CDS/amd64 stable amd64 CLS/amd64 stable amd64 CSS/amd64 stable @@ -23,6 +24,7 @@ amd64 CDS+/amd64 stable x86 CLD/x86 stable x86 CLDM/x86 stable x86 CLDX/x86 stable +x86 CLDO/x86 stable x86 CDS/x86 stable x86 CLS/x86 stable x86 CSS/x86 stable diff --git a/profiles/templates/3.2/6_ac_update_sync/world/0-ini b/profiles/templates/3.2/6_ac_update_sync/world/0-ini index b818af1..fc1f148 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/0-ini +++ b/profiles/templates/3.2/6_ac_update_sync/world/0-ini @@ -1,4 +1,4 @@ # Calculate path=/etc/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)== [overlay-distros] -world = 115 +world = 116 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/openbox b/profiles/templates/3.2/6_ac_update_sync/world/create/openbox index b0863d8..f151f64 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/openbox +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/openbox @@ -1,5 +1,16 @@ # Calculate name=world format=world in(os_linux_pkglist,CLS,CLDX+)!= +#in(os_linux_pkglist,CLS,CLDO,CLDX+)!=# x11-terms/rxvt-unicode x11-wm/openbox +#in# +#in(os_linux_pkglist,CLDO,CLDX+)!=# +x11-misc/gmrun +x11-misc/obconf +x11-misc/screengrab +x11-misc/spacefm +x11-misc/tint2 +x11-misc/tintwizard +x11-misc/xxkb +#in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/tools b/profiles/templates/3.2/6_ac_update_sync/world/create/tools index f438ddf..24dc09a 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/tools +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/tools @@ -163,7 +163,6 @@ net-news/quiterss sys-auth/thinkfinger sys-power/apcupsd x11-misc/slim -x11-misc/spacefm x11-misc/sunflower x11-misc/xsnow x11-terms/guake diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/116 b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/116 new file mode 100644 index 0000000..0113f7e --- /dev/null +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/100-199/116 @@ -0,0 +1,12 @@ +# Calculate format=world name=world ini(overlay-distros.world)<116 + +#-ini(overlay-distros.world,116)-# + +#in(os_linux_pkglist,CLDX+)!=# +x11-misc/gmrun +x11-misc/obconf +x11-misc/screengrab +x11-misc/tint2 +x11-misc/tintwizard +x11-misc/xxkb +#in#