Обновлены шаблоны ревизий, добавлена поддержка cl-update-profile 3.2.2

10 years ago · d82b848510
parent f6960a93e2
commit d82b848510
37 changed files with 12 additions and 18 deletions
--- a/profiles/templates/3.2/6_ac_update_sync/revision/.calculate_directory
+++ b/profiles/templates/3.2/6_ac_update_sync/revision/.calculate_directory
@ -1 +0,0 @@
-# Calculate append=skip
--- a/profiles/templates/3.2/6_ac_update_sync/revision/01
+++ b/profiles/templates/3.2/6_ac_update_sync/revision/01
@ -1,5 +0,0 @@
-# Calculate ini(update-distros.revision)<1 format=samba path=/etc/calculate name=ini.env
-
-[update-distros]
-revision = 1
-world = 1
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_create/.calculate_directory
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_create/.calculate_directory
@ -0,0 +1 @@
+# Calculate append=skip cl_update_world==merge||cl_update_world==rebuild
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_create/0-world
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_create/0-world
@ -1,3 +1,3 @@
-# Calculate append=skip
+# Calculate append=skip cl_update_world==rebuild name=world

 # world is removed and filled in the core packages from the calculate overlay
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_create/applications
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_create/applications
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_create/base
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_create/base
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_create/decoration
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_create/decoration
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_create/graphics
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_create/graphics
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_create/ini.env
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_create/ini.env
@ -0,0 +1,9 @@
+# Calculate path=/etc/calculate format=samba
+
+[update-distros]
+#?cl_update_world==merge#
+world = 12
+#cl_update_world#
+#?cl_update_world==rebuild#
+!world =
+#cl_update_world#
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_create/kde
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_create/kde
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_create/multimedia
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_create/multimedia
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_create/netapps
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_create/netapps
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_create/network
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_create/network
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_create/openbox
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_create/openbox
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_create/printer
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_create/printer
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_create/server
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_create/server
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_create/tools
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_create/tools
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_create/wireless
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_create/wireless
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_create/xfce
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_create/xfce
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_create/xorg
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_create/xorg
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_rebuild/.calculate_directory
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_rebuild/.calculate_directory
@ -1 +0,0 @@
-# Calculate append=skip cl_update_world==rebuild
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_rebuild/ini.env
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_rebuild/ini.env
@ -1,4 +0,0 @@
-# Calculate path=/etc/calculate format=samba
-
-[update-distros]
-!world =
--- a/profiles/templates/3.2/6_ac_update_sync/world/1_create/.calculate_directory
+++ b/profiles/templates/3.2/6_ac_update_sync/world/1_create/.calculate_directory
@ -1 +0,0 @@
-# Calculate append=skip ini(update-distros.world)==
--- a/profiles/templates/3.2/6_ac_update_sync/world/1_create/ini.env
+++ b/profiles/templates/3.2/6_ac_update_sync/world/1_create/ini.env
@ -1,4 +0,0 @@
-# Calculate path=/etc/calculate format=samba
-
-[update-distros]
-world = 12
--- a/profiles/templates/3.2/6_ac_update_sync/world/1_update/.calculate_directory
+++ b/profiles/templates/3.2/6_ac_update_sync/world/1_update/.calculate_directory
@ -0,0 +1 @@
+# Calculate append=skip cl_update_world!=merge&&cl_update_world!=rebuild
--- a/profiles/templates/3.2/6_ac_update_sync/world/1_update/02
+++ b/profiles/templates/3.2/6_ac_update_sync/world/1_update/02
--- a/profiles/templates/3.2/6_ac_update_sync/world/1_update/03
+++ b/profiles/templates/3.2/6_ac_update_sync/world/1_update/03
--- a/profiles/templates/3.2/6_ac_update_sync/world/1_update/04
+++ b/profiles/templates/3.2/6_ac_update_sync/world/1_update/04
--- a/profiles/templates/3.2/6_ac_update_sync/world/1_update/05
+++ b/profiles/templates/3.2/6_ac_update_sync/world/1_update/05
--- a/profiles/templates/3.2/6_ac_update_sync/world/1_update/06
+++ b/profiles/templates/3.2/6_ac_update_sync/world/1_update/06
--- a/profiles/templates/3.2/6_ac_update_sync/world/1_update/07
+++ b/profiles/templates/3.2/6_ac_update_sync/world/1_update/07
--- a/profiles/templates/3.2/6_ac_update_sync/world/1_update/08
+++ b/profiles/templates/3.2/6_ac_update_sync/world/1_update/08
--- a/profiles/templates/3.2/6_ac_update_sync/world/1_update/09
+++ b/profiles/templates/3.2/6_ac_update_sync/world/1_update/09
--- a/profiles/templates/3.2/6_ac_update_sync/world/1_update/10
+++ b/profiles/templates/3.2/6_ac_update_sync/world/1_update/10
--- a/profiles/templates/3.2/6_ac_update_sync/world/1_update/11
+++ b/profiles/templates/3.2/6_ac_update_sync/world/1_update/11
--- a/profiles/templates/3.2/6_ac_update_sync/world/1_update/12
+++ b/profiles/templates/3.2/6_ac_update_sync/world/1_update/12
--- a/profiles/templates/3.2/6_ac_update_sync/world/2_update/.calculate_directory
+++ b/profiles/templates/3.2/6_ac_update_sync/world/2_update/.calculate_directory
@ -1 +0,0 @@
-# Calculate append=skip
				`@ -0,0 +1 @@`
				`# Calculate append=skip cl_update_world==merge\|\|cl_update_world==rebuild`
				`@ -1 +0,0 @@`
				`# Calculate append=skip cl_update_world==rebuild`
				`@ -1 +0,0 @@`
				`# Calculate append=skip ini(update-distros.world)==`