Browse Source

Merge branch 'develop' of git.calculate-linux.org:/repo/distros into develop

tags/329
parent
commit
2b03f2e8ef
5 changed files with 17 additions and 2 deletions
  1. +1
    -1
      profiles/templates/3.5/6_ac_update_sync/world/0-ini
  2. +1
    -1
      profiles/templates/3.5/6_ac_update_sync/world/create/network
  3. +1
    -0
      profiles/templates/3.5/6_ac_update_sync/world/create/tools
  4. +7
    -0
      profiles/templates/3.5/6_ac_update_sync/world/update/2020/20200317
  5. +7
    -0
      profiles/templates/3.5/6_ac_update_sync/world/update/2020/20200405

+ 1
- 1
profiles/templates/3.5/6_ac_update_sync/world/0-ini View File

@@ -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)==

[overlay-distros]
world = 20200122
world = 20200405

+ 1
- 1
profiles/templates/3.5/6_ac_update_sync/world/create/network View File

@@ -11,7 +11,7 @@ net-misc/vconfig
#in#

#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS)!=#
#net-vpn/networkmanager-l2tp
net-vpn/networkmanager-l2tp
net-vpn/networkmanager-openvpn
net-vpn/networkmanager-pptp
net-vpn/networkmanager-vpnc


+ 1
- 0
profiles/templates/3.5/6_ac_update_sync/world/create/tools View File

@@ -62,6 +62,7 @@ sys-fs/exfat-utils
sys-fs/fuse-exfat
sys-fs/ntfs3g
sys-power/acpi
sys-power/acpid
sys-power/cpupower
sys-power/powernowd
sys-power/powertop


+ 7
- 0
profiles/templates/3.5/6_ac_update_sync/world/update/2020/20200317 View File

@@ -0,0 +1,7 @@
# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#

#-ini(overlay-distros.world,#-cut()-#)-#

#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS)!=#
sys-power/acpid
#in#

+ 7
- 0
profiles/templates/3.5/6_ac_update_sync/world/update/2020/20200405 View File

@@ -0,0 +1,7 @@
# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#

#-ini(overlay-distros.world,#-cut()-#)-#

#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS)!=#
net-vpn/networkmanager-l2tp
#in#

Loading…
Cancel
Save