From 2a9c864a7becd349c9cb2d81343faf19ea7c4868 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Fri, 10 Oct 2014 18:47:14 +0400 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=D1=80=D0=B5=D0=B2=D0=B8=D0=B7=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BC=D0=B8=D0=B3=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BF=D0=B0?= =?UTF-8?q?=D1=80=D0=B0=D0=BC=D1=82=D0=B5=D1=80=D0=BE=D0=B2=20ini.env?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3.2/6_ac_update_sync/revision/.calculate_directory | 1 + .../3.2/6_ac_update_sync/revision/01-migrate-ini.env | 9 +++++++++ profiles/templates/3.2/6_ac_update_sync/world/0-ini | 4 ++-- .../templates/3.2/6_ac_update_sync/world/create/0-world | 3 --- profiles/templates/3.2/6_ac_update_sync/world/update/02 | 4 ++-- profiles/templates/3.2/6_ac_update_sync/world/update/03 | 4 ++-- profiles/templates/3.2/6_ac_update_sync/world/update/04 | 4 ++-- profiles/templates/3.2/6_ac_update_sync/world/update/05 | 4 ++-- profiles/templates/3.2/6_ac_update_sync/world/update/06 | 4 ++-- profiles/templates/3.2/6_ac_update_sync/world/update/07 | 4 ++-- profiles/templates/3.2/6_ac_update_sync/world/update/08 | 4 ++-- profiles/templates/3.2/6_ac_update_sync/world/update/09 | 4 ++-- profiles/templates/3.2/6_ac_update_sync/world/update/10 | 4 ++-- profiles/templates/3.2/6_ac_update_sync/world/update/11 | 4 ++-- profiles/templates/3.2/6_ac_update_sync/world/update/12 | 4 ++-- 15 files changed, 34 insertions(+), 27 deletions(-) create mode 100644 profiles/templates/3.2/6_ac_update_sync/revision/.calculate_directory create mode 100644 profiles/templates/3.2/6_ac_update_sync/revision/01-migrate-ini.env delete mode 100644 profiles/templates/3.2/6_ac_update_sync/world/create/0-world diff --git a/profiles/templates/3.2/6_ac_update_sync/revision/.calculate_directory b/profiles/templates/3.2/6_ac_update_sync/revision/.calculate_directory new file mode 100644 index 0000000..720d52e --- /dev/null +++ b/profiles/templates/3.2/6_ac_update_sync/revision/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip diff --git a/profiles/templates/3.2/6_ac_update_sync/revision/01-migrate-ini.env b/profiles/templates/3.2/6_ac_update_sync/revision/01-migrate-ini.env new file mode 100644 index 0000000..2eb21b3 --- /dev/null +++ b/profiles/templates/3.2/6_ac_update_sync/revision/01-migrate-ini.env @@ -0,0 +1,9 @@ +# Calculate path=/etc/calculate name=ini.env format=samba ini(distros-calculate.revision)<1 + +[distros-calculate] +revision = 1 +world = #-ini(update.world)-# + +[update-distros] +!world = +!revision = 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 443231d..29d95f9 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!=update||ini(update-distros.world)== +# Calculate path=/etc/calculate name=ini.env format=samba cl_update_world!=update||ini(overlay-distros.world)== -[update-distros] +[overlay-distros] world = 12 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/0-world b/profiles/templates/3.2/6_ac_update_sync/world/create/0-world deleted file mode 100644 index 408b0e7..0000000 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/0-world +++ /dev/null @@ -1,3 +0,0 @@ -# Calculate append=skip cl_update_world==rebuild name=world - -# world is removed and filled in the core packages from the calculate overlay diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/02 b/profiles/templates/3.2/6_ac_update_sync/world/update/02 index 551e781..85464da 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/02 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/02 @@ -1,6 +1,6 @@ -# Calculate format=world name=world ini(update-distros.world)<2 +# Calculate format=world name=world ini(overlay-distros.world)<2 -#-ini(update-distros.world,2)-# +#-ini(overlay-distros.world,2)-# #?in(os_linux_pkglist, base)!=# !sys-kernel/calckernel diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/03 b/profiles/templates/3.2/6_ac_update_sync/world/update/03 index dfb552e..67a88d6 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/03 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/03 @@ -1,6 +1,6 @@ -# Calculate format=world name=world ini(update-distros.world)<3 +# Calculate format=world name=world ini(overlay-distros.world)<3 -#-ini(update-distros.world,3)-# +#-ini(overlay-distros.world,3)-# # пакет теперь входит в зависимости к calculate-sources #?in(os_linux_pkglist, CLD, CLDX, CMC, CLS)!=# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/04 b/profiles/templates/3.2/6_ac_update_sync/world/update/04 index 07a1835..8eeac32 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/04 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/04 @@ -1,6 +1,6 @@ -# Calculate format=world name=world ini(update-distros.world)<4 +# Calculate format=world name=world ini(overlay-distros.world)<4 -#-ini(update-distros.world,4)-# +#-ini(overlay-distros.world,4)-# # смена dhcp для поддержки PXE загрузки #?in(os_linux_pkglist, CLD, CLDX, CMC, CLS)!=# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/05 b/profiles/templates/3.2/6_ac_update_sync/world/update/05 index 847469b..cf49913 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/05 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/05 @@ -1,6 +1,6 @@ -# Calculate format=world name=world ini(update-distros.world)<5 +# Calculate format=world name=world ini(overlay-distros.world)<5 -#-ini(update-distros.world,5)-# +#-ini(overlay-distros.world,5)-# # Не поддерживаются, начиная с claws-mail 3.10 #?in(os_linux_pkglist, CLDX)!=# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/06 b/profiles/templates/3.2/6_ac_update_sync/world/update/06 index 980965b..d066a5f 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/06 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/06 @@ -1,6 +1,6 @@ -# Calculate format=world name=world ini(update-distros.world)<6 +# Calculate format=world name=world ini(overlay-distros.world)<6 -#-ini(update-distros.world,6)-# +#-ini(overlay-distros.world,6)-# # отсутствует в KDE 4.14 #?in(os_linux_pkglist, CLD)!=# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/07 b/profiles/templates/3.2/6_ac_update_sync/world/update/07 index 8c23161..432abc6 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/07 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/07 @@ -1,6 +1,6 @@ -# Calculate format=world name=world ini(update-distros.world)<7 +# Calculate format=world name=world ini(overlay-distros.world)<7 -#-ini(update-distros.world,7)-# +#-ini(overlay-distros.world,7)-# !media-gfx/splash-themes-calculate !media-gfx/splashutils diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/08 b/profiles/templates/3.2/6_ac_update_sync/world/update/08 index a76caf7..c03d0f4 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/08 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/08 @@ -1,6 +1,6 @@ -# Calculate format=world name=world ini(update-distros.world)<8 +# Calculate format=world name=world ini(overlay-distros.world)<8 -#-ini(update-distros.world,8)-# +#-ini(overlay-distros.world,8)-# #?in(os_linux_pkglist, CLD, CLDX, CMC)!=# !sys-power/cpufrequtils diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/09 b/profiles/templates/3.2/6_ac_update_sync/world/update/09 index ac5baaf..724f229 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/09 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/09 @@ -1,6 +1,6 @@ -# Calculate format=world name=world ini(update-distros.world)<9 +# Calculate format=world name=world ini(overlay-distros.world)<9 -#-ini(update-distros.world,9)-# +#-ini(overlay-distros.world,9)-# #?in(os_linux_pkglist, CLD, CLDX)!=# !sys-auth/thinkfinger diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/10 b/profiles/templates/3.2/6_ac_update_sync/world/update/10 index bda2732..e8fe50a 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/10 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/10 @@ -1,6 +1,6 @@ -# Calculate format=world name=world ini(update-distros.world)<10 +# Calculate format=world name=world ini(overlay-distros.world)<10 -#-ini(update-distros.world,10)-# +#-ini(overlay-distros.world,10)-# #?in(os_linux_pkglist, base)!=# !app-i18n/man-pages-de diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/11 b/profiles/templates/3.2/6_ac_update_sync/world/update/11 index c90223c..a607ed8 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/11 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/11 @@ -1,6 +1,6 @@ -# Calculate format=world name=world ini(update-distros.world)<11 +# Calculate format=world name=world ini(overlay-distros.world)<11 -#-ini(update-distros.world,11)-# +#-ini(overlay-distros.world,11)-# #?in(os_linux_pkglist, CLDX)!=# !media-gfx/eog diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/12 b/profiles/templates/3.2/6_ac_update_sync/world/update/12 index 029eb5a..eacecd6 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/12 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/12 @@ -1,6 +1,6 @@ -# Calculate format=world name=world ini(update-distros.world)<12 +# Calculate format=world name=world ini(overlay-distros.world)<12 -#-ini(update-distros.world,12)-# +#-ini(overlay-distros.world,12)-# #?in(os_linux_pkglist, CLDX)!=# !media-gfx/shotwell