From 06106e2be338085182af637b26d72556f80cd7c4 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Mon, 13 Feb 2023 11:51:40 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D1=91=D0=BD=20?= =?UTF-8?q?=D0=BF=D1=83=D1=82=D1=8C=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BE=D0=B2=D0=B5=D1=80=D0=BB=D0=B5?= =?UTF-8?q?=D1=8F=20=D0=BD=D0=B0=20/var/calculate/repos/custom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys-apps/portage/custom-overlay/.calculate_directory | 1 - .../1-merge/sys-apps/portage/custom/.calculate_directory | 1 + .../portage/{custom-overlay => custom}/metadata/layout.conf | 0 .../portage/{custom-overlay => custom}/profiles/repo_name | 0 .../1-merge/sys-apps/portage/repos.conf.custom.conf | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom-overlay/.calculate_directory create mode 100644 profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom/.calculate_directory rename profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/{custom-overlay => custom}/metadata/layout.conf (100%) rename profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/{custom-overlay => custom}/profiles/repo_name (100%) diff --git a/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom-overlay/.calculate_directory b/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom-overlay/.calculate_directory deleted file mode 100644 index bf3a3bb8a..000000000 --- a/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom-overlay/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate chown=portage:portage path=/var/calculate pkg(sys-apps/calculate-utils:3)>=3.6.6&&exists(/var/calculate/custom-overlay/metadata/layout.conf)== diff --git a/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom/.calculate_directory b/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom/.calculate_directory new file mode 100644 index 000000000..217564987 --- /dev/null +++ b/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom/.calculate_directory @@ -0,0 +1 @@ +# Calculate chown=portage:portage path=/var/calculate/repos pkg(sys-apps/calculate-utils:3)>=3.6.6&&exists(/var/calculate/repos/custom/metadata/layout.conf)== diff --git a/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom-overlay/metadata/layout.conf b/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom/metadata/layout.conf similarity index 100% rename from profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom-overlay/metadata/layout.conf rename to profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom/metadata/layout.conf diff --git a/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom-overlay/profiles/repo_name b/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom/profiles/repo_name similarity index 100% rename from profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom-overlay/profiles/repo_name rename to profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/custom/profiles/repo_name diff --git a/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/repos.conf.custom.conf b/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/repos.conf.custom.conf index fa701c93f..2e52f7fb0 100644 --- a/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/repos.conf.custom.conf +++ b/profiles/templates/3_ac_install_live/1-merge/sys-apps/portage/repos.conf.custom.conf @@ -1,3 +1,3 @@ # Calculate append=after path=/etc/portage/repos.conf name=zz-calculate.conf pkg(sys-apps/calculate-utils:3)>=3.6.6&&grep(/etc/portage/repos.conf/zz-calculate.conf,\[custom\])== protected [custom] -location = /var/calculate/custom-overlay +location = /var/calculate/repos/custom