From ba17fa7ba4214738ae3c2a7af80f973fcd8b9b74 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Sun, 26 Jun 2022 23:33:17 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20gnome-base/gnome-keyring?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1-merge/gnome-base/.calculate_directory | 1 - .../1-merge/gnome-base/gnome-keyring/.calculate_directory | 1 - .../gnome-base/gnome-keyring/prepare_gnome_keyring_caps | 7 ------- .../revision/2022/20220626-rebuild_gnome-keyring | 4 ++++ 4 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/gnome-base/.calculate_directory delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/gnome-base/gnome-keyring/.calculate_directory delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/gnome-base/gnome-keyring/prepare_gnome_keyring_caps create mode 100644 profiles/templates/3.6/6_ac_update_sync/revision/2022/20220626-rebuild_gnome-keyring diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/gnome-base/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/gnome-base/.calculate_directory deleted file mode 100644 index 720d52e47..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/gnome-base/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/gnome-base/gnome-keyring/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/gnome-base/gnome-keyring/.calculate_directory deleted file mode 100644 index 95f15012e..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/gnome-base/gnome-keyring/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate mergepkg()!= append=skip diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/gnome-base/gnome-keyring/prepare_gnome_keyring_caps b/profiles/templates/3.6/3_ac_install_live/1-merge/gnome-base/gnome-keyring/prepare_gnome_keyring_caps deleted file mode 100644 index 0c3f1b652..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/gnome-base/gnome-keyring/prepare_gnome_keyring_caps +++ /dev/null @@ -1,7 +0,0 @@ -# Calculate exec=/bin/bash os_install_root_type!=livecd&&ac_install_disk==off - -/bin/chmod 0711 /usr/bin/gnome-keyring-daemon &>/dev/null -/bin/chown root:root /usr/bin/gnome-keyring-daemon &>/dev/null -/sbin/setcap cap_ipc_lock+ep /usr/bin/gnome-keyring-daemon &>/dev/null - -true diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2022/20220626-rebuild_gnome-keyring b/profiles/templates/3.6/6_ac_update_sync/revision/2022/20220626-rebuild_gnome-keyring new file mode 100644 index 000000000..57515a7b8 --- /dev/null +++ b/profiles/templates/3.6/6_ac_update_sync/revision/2022/20220626-rebuild_gnome-keyring @@ -0,0 +1,4 @@ +# Calculate name=ini.env format=samba ini(overlay-calculate.revision)=>20191116.3,#-cut(0,-,#-cl_pass_file-#)-# rebuild=gnome-base/gnome-keyring + +[overlay-calculate] +revision = #-cut(0,-,#-cl_pass_file-#)-#