diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/00-ini b/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini similarity index 91% rename from profiles/templates/3.5/6_ac_update_sync/remerge/00-ini rename to profiles/templates/3.5/6_ac_update_sync/remerge/0-ini index 2418410..4e8a13b 100644 --- a/profiles/templates/3.5/6_ac_update_sync/remerge/00-ini +++ b/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini @@ -2,4 +2,4 @@ [overlay-distros] # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system -remerge = 6 +remerge = 20161213 diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/00-old/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/remerge/00-old/.calculate_directory deleted file mode 100644 index 27ba989..0000000 --- a/profiles/templates/3.5/6_ac_update_sync/remerge/00-old/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip ini(overlay-distros.remerge)<20160101 diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/00-old/3 b/profiles/templates/3.5/6_ac_update_sync/remerge/00-old/3 deleted file mode 100644 index c2c615c..0000000 --- a/profiles/templates/3.5/6_ac_update_sync/remerge/00-old/3 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env merge=app-office/libreoffice ini(overlay-distros.remerge)<#-cut()-# - -[overlay-distros] -remerge = #-cut()-# diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/00-old/4 b/profiles/templates/3.5/6_ac_update_sync/remerge/00-old/4 deleted file mode 100644 index ed07c53..0000000 --- a/profiles/templates/3.5/6_ac_update_sync/remerge/00-old/4 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env merge=www-client/chromium ini(overlay-distros.remerge)<#-cut()-# - -[overlay-distros] -remerge = #-cut()-# diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/00-old/5 b/profiles/templates/3.5/6_ac_update_sync/remerge/00-old/5 deleted file mode 100644 index 70b6300..0000000 --- a/profiles/templates/3.5/6_ac_update_sync/remerge/00-old/5 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env merge=media-video/smtube ini(overlay-distros.remerge)<#-cut()-# - -[overlay-distros] -remerge = #-cut()-# diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/00-old/6 b/profiles/templates/3.5/6_ac_update_sync/remerge/00-old/6 deleted file mode 100644 index 2f5bd51..0000000 --- a/profiles/templates/3.5/6_ac_update_sync/remerge/00-old/6 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env merge=sys-apps/baselayout ini(overlay-distros.remerge)<#-cut()-# - -[overlay-distros] -remerge = #-cut()-# diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/remerge/2016/.calculate_directory index 2aee167..3bc2f48 100644 --- a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/.calculate_directory +++ b/profiles/templates/3.5/6_ac_update_sync/remerge/2016/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(overlay-distros.remerge)=>20160101,20170101 +# Calculate append=skip ini(overlay-distros.remerge)==20160101,20170101 diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161213 b/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161213 new file mode 100644 index 0000000..8a6aa52 --- /dev/null +++ b/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161213 @@ -0,0 +1,4 @@ +# Calculate format=samba name=ini.env ini(overlay-distros.remerge)<#-cut()-# merge=www-client/chromium,media-video/smtube,sys-apps/baselayout,app-office/libreoffice + +[overlay-distros] +remerge = #-cut()-# diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/00-old/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/revision/00-old/.calculate_directory deleted file mode 100644 index f761ab8..0000000 --- a/profiles/templates/3.5/6_ac_update_sync/revision/00-old/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip ini(overlay-distros.revision)<20160101 diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/10-old/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/revision/10-old/.calculate_directory new file mode 100644 index 0000000..68d750b --- /dev/null +++ b/profiles/templates/3.5/6_ac_update_sync/revision/10-old/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip ini(overlay-distros.revision)<10 diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/00-old/1-migrate-ini.env b/profiles/templates/3.5/6_ac_update_sync/revision/10-old/1-migrate-ini.env similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/revision/00-old/1-migrate-ini.env rename to profiles/templates/3.5/6_ac_update_sync/revision/10-old/1-migrate-ini.env diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/00-old/2-migrate-CLSM-CLDM.env b/profiles/templates/3.5/6_ac_update_sync/revision/10-old/2-migrate-CLSM-CLDM.env similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/revision/00-old/2-migrate-CLSM-CLDM.env rename to profiles/templates/3.5/6_ac_update_sync/revision/10-old/2-migrate-CLSM-CLDM.env diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/00-old/3-migrate-CLSL-CLDL.env b/profiles/templates/3.5/6_ac_update_sync/revision/10-old/3-migrate-CLSL-CLDL.env similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/revision/00-old/3-migrate-CLSL-CLDL.env rename to profiles/templates/3.5/6_ac_update_sync/revision/10-old/3-migrate-CLSL-CLDL.env diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/00-old/4-migrate-CMC-CLS.env b/profiles/templates/3.5/6_ac_update_sync/revision/10-old/4-migrate-CMC-CLS.env similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/revision/00-old/4-migrate-CMC-CLS.env rename to profiles/templates/3.5/6_ac_update_sync/revision/10-old/4-migrate-CMC-CLS.env diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/10-old/9 b/profiles/templates/3.5/6_ac_update_sync/revision/10-old/9 new file mode 100644 index 0000000..dfe8266 --- /dev/null +++ b/profiles/templates/3.5/6_ac_update_sync/revision/10-old/9 @@ -0,0 +1,4 @@ +# Calculate path=/var/lib/calculate name=ini.env format=samba ini(overlay-distros.revision)<#-cut()-# + +[overlay-distros] +revision = 20160101 diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2016/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/revision/2016/.calculate_directory index 5a9ede1..f294955 100644 --- a/profiles/templates/3.5/6_ac_update_sync/revision/2016/.calculate_directory +++ b/profiles/templates/3.5/6_ac_update_sync/revision/2016/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(overlay-distros.revision)=>20160101,20170101 +# Calculate append=skip ini(overlay-distros.revision)==20160101,20170101 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/0-ini b/profiles/templates/3.5/6_ac_update_sync/world/0-ini index 55eae95..fd88c46 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/0-ini +++ b/profiles/templates/3.5/6_ac_update_sync/world/0-ini @@ -1,4 +1,4 @@ -# Calculate path=/var/lib/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)== +# Calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)== [overlay-distros] world = 264 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/.calculate_directory new file mode 100644 index 0000000..bde8a5c --- /dev/null +++ b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip ini(overlay-distros.world)<300 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/209 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/209 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/209 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/209 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/214 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/214 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/214 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/214 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/218 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/218 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/218 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/218 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/219 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/219 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/219 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/219 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/233 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/233 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/233 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/233 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/234 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/234 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/234 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/234 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/238 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/238 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/238 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/238 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/240 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/240 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/240 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/240 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/241 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/241 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/241 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/241 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/242 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/242 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/242 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/242 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/243 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/243 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/243 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/243 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/245 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/245 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/245 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/245 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/246 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/246 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/246 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/246 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/248 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/248 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/248 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/248 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/250 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/250 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/250 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/250 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/251 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/251 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/251 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/251 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/252 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/252 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/252 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/252 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/253 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/253 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/253 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/253 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/254 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/254 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/254 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/254 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/255 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/255 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/255 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/255 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/256 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/256 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/256 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/256 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/257 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/257 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/257 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/257 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/258 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/258 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/258 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/258 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/259 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/259 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/259 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/259 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/260 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/260 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/260 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/260 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/261 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/261 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/261 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/261 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/262 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/262 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/262 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/262 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/263 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/263 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/263 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/263 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/264 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/264 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/world/update/201-300/264 rename to profiles/templates/3.5/6_ac_update_sync/world/update/100-old/264 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/299 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/299 new file mode 100644 index 0000000..1627ef8 --- /dev/null +++ b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/299 @@ -0,0 +1,3 @@ +# Calculate format=world name=world ini(overlay-distros.world)<299 + +#-ini(overlay-distros.world,20160101)-# diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/.calculate_directory deleted file mode 100644 index 301d2d9..0000000 --- a/profiles/templates/3.5/6_ac_update_sync/world/update/201-300/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip ini(overlay-distros.world)=>200,20160101 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2016/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/world/update/2016/.calculate_directory index 2224ede..12d2fa4 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/update/2016/.calculate_directory +++ b/profiles/templates/3.5/6_ac_update_sync/world/update/2016/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(overlay-distros.world)=>20160101,20170101 +# Calculate append=skip ini(overlay-distros.world)==20160101,20170101