From 7d52a14bd74dd75bbe2aa0ece5e01f8f05abb574 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Thu, 7 Oct 2021 12:31:55 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A8=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=BC=D0=B8=D0=B3=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BD=D0=B0?= =?UTF-8?q?=20pipewire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/templates/3.6/6_ac_update_sync/remerge/0-ini | 2 +- .../templates/3.6/6_ac_update_sync/remerge/2021/20211007 | 4 ++++ .../revision/2021/20210927-remove_xl2tpd | 2 ++ .../revision/2021/20211007-migrate_to_pipewire | 9 +++++++++ 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211007 create mode 100644 profiles/templates/3.6/6_ac_update_sync/revision/2021/20211007-migrate_to_pipewire diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini index 84f41c756..8e5d78b25 100644 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini +++ b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini @@ -2,4 +2,4 @@ [overlay-calculate] # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system -remerge = 20210923 +remerge = 20211007 diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211007 b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211007 new file mode 100644 index 000000000..5964efab3 --- /dev/null +++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211007 @@ -0,0 +1,4 @@ +# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=kde-apps/kmix,kde-plasma/plasma-pa,media-libs/libsdl,media-plugins/alsa-plugins,media-sound/alsa-utils,media-sound/pavucontrol,media-sound/pulseaudio,media-sound/qastools,media-sound/volumeicon,media-video/pipewire,net-wireless/bluez + +[overlay-calculate] +remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2021/20210927-remove_xl2tpd b/profiles/templates/3.6/6_ac_update_sync/revision/2021/20210927-remove_xl2tpd index b3bd36477..272cdc25f 100644 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2021/20210927-remove_xl2tpd +++ b/profiles/templates/3.6/6_ac_update_sync/revision/2021/20210927-remove_xl2tpd @@ -1,4 +1,6 @@ # Calculate exec=/bin/bash ini(overlay-calculate.revision)=>20191116.3,#-cut(0,-,#-cl_pass_file-#)-# +#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# + rm -rf /xl2tpd exit 0 diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2021/20211007-migrate_to_pipewire b/profiles/templates/3.6/6_ac_update_sync/revision/2021/20211007-migrate_to_pipewire new file mode 100644 index 000000000..356518590 --- /dev/null +++ b/profiles/templates/3.6/6_ac_update_sync/revision/2021/20211007-migrate_to_pipewire @@ -0,0 +1,9 @@ +# Calculate exec=/bin/bash ini(overlay-calculate.revision)=>20211007,#-cut(0,-,#-cl_pass_file-#)-# + +#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# + +#?os_audio!=alsa# +sed -i "s/os_audio = pulseaudio/os_audio = pipewire/" /var/lib/calculate/calculate.env +#os_audio# + +exit 0