From 2bc49e324853b991aff2a2b6265ecc84fd02a6af Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Wed, 6 May 2015 11:43:52 +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=D0=B8=D0=B5=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=203.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/templates/3.3/.calculate_directory | 2 +- .../sys-apps/baselayout/.calculate_directory | 2 +- .../sys-apps/openrc/.calculate_directory | 2 +- .../sys-apps/portage/.calculate_directory | 2 +- .../3.4/6_ac_builder_prepare/sys-apps/portage/assemble | 8 ++++---- .../app-portage/gentoolkit/.calculate_directory | 2 +- .../sys-apps/calculate-utils/.calculate_directory | 2 +- .../sys-apps/portage/.calculate_directory | 2 +- .../sys-apps/shadow/.calculate_directory | 2 +- profiles/templates/deprecated/3.1/.calculate_directory | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/profiles/templates/3.3/.calculate_directory b/profiles/templates/3.3/.calculate_directory index 2257c8c06..74ceebf8f 100644 --- a/profiles/templates/3.3/.calculate_directory +++ b/profiles/templates/3.3/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip cl_name==calculate-core&&cl_ver>=3.3&&cl_ver<3.4&&pkg(sys-apps/calculate-utils)>=3.3.0_alpha1 +# Calculate append=skip cl_name==calculate-core&&cl_ver>=3.3&&pkg(sys-apps/calculate-utils)>=3.3.0_alpha1 diff --git a/profiles/templates/3.4/6_ac_builder_prepare/sys-apps/baselayout/.calculate_directory b/profiles/templates/3.4/6_ac_builder_prepare/sys-apps/baselayout/.calculate_directory index 1d4ebb430..4bf524353 100644 --- a/profiles/templates/3.4/6_ac_builder_prepare/sys-apps/baselayout/.calculate_directory +++ b/profiles/templates/3.4/6_ac_builder_prepare/sys-apps/baselayout/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip pkg()!= +# Calculate path=/ name=etc pkg()!=&&merge()!= diff --git a/profiles/templates/3.4/6_ac_builder_prepare/sys-apps/openrc/.calculate_directory b/profiles/templates/3.4/6_ac_builder_prepare/sys-apps/openrc/.calculate_directory index 720d52e47..4bf524353 100644 --- a/profiles/templates/3.4/6_ac_builder_prepare/sys-apps/openrc/.calculate_directory +++ b/profiles/templates/3.4/6_ac_builder_prepare/sys-apps/openrc/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip +# Calculate path=/ name=etc pkg()!=&&merge()!= diff --git a/profiles/templates/3.4/6_ac_builder_prepare/sys-apps/portage/.calculate_directory b/profiles/templates/3.4/6_ac_builder_prepare/sys-apps/portage/.calculate_directory index eb304238e..a58f57fbd 100644 --- a/profiles/templates/3.4/6_ac_builder_prepare/sys-apps/portage/.calculate_directory +++ b/profiles/templates/3.4/6_ac_builder_prepare/sys-apps/portage/.calculate_directory @@ -1 +1 @@ -# Calculate path=/etc/portage name=make.conf pkg()!= +# Calculate path=/etc/portage name=make.conf pkg()!=&&merge()!= diff --git a/profiles/templates/3.4/6_ac_builder_prepare/sys-apps/portage/assemble b/profiles/templates/3.4/6_ac_builder_prepare/sys-apps/portage/assemble index 99772c761..858d3b9b7 100644 --- a/profiles/templates/3.4/6_ac_builder_prepare/sys-apps/portage/assemble +++ b/profiles/templates/3.4/6_ac_builder_prepare/sys-apps/portage/assemble @@ -3,11 +3,11 @@ MAKEOPTS="#-os_builder_makeopts-#" EMERGE_DEFAULT_OPTS="--jobs=1" #?cl_builder_buildpkg_set==on# FEATURES="${FEATURES} buildpkg -getbinpkg" -#cl_assemble_buildpkg_set# -#?cl_assemble_buildpkg_set!=on# +#cl_builder_buildpkg_set# +#?cl_builder_buildpkg_set!=on# FEATURES="${FEATURES} -buildpkg -getbinpkg" -#cl_assemble_buildpkg_set# -PKGDIR="#-cl_build_pkgdir-#" +#cl_builder_buildpkg_set# +PKGDIR="#-cl_builder_pkgdir-#" FEATURES="${FEATURES} ccache" CCACHE_SIZE="20G" diff --git a/profiles/templates/3.4/6_ac_builder_setup/app-portage/gentoolkit/.calculate_directory b/profiles/templates/3.4/6_ac_builder_setup/app-portage/gentoolkit/.calculate_directory index d552c53f4..43d38f7e7 100644 --- a/profiles/templates/3.4/6_ac_builder_setup/app-portage/gentoolkit/.calculate_directory +++ b/profiles/templates/3.4/6_ac_builder_setup/app-portage/gentoolkit/.calculate_directory @@ -1 +1 @@ -# Calculate path=/var/cache name=revdep-rebuild append=clear pkg()!= +# Calculate path=/var/cache name=revdep-rebuild append=clear pkg()!=&&merge()!= diff --git a/profiles/templates/3.4/6_ac_builder_setup/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/3.4/6_ac_builder_setup/sys-apps/calculate-utils/.calculate_directory index 1d4ebb430..636040311 100644 --- a/profiles/templates/3.4/6_ac_builder_setup/sys-apps/calculate-utils/.calculate_directory +++ b/profiles/templates/3.4/6_ac_builder_setup/sys-apps/calculate-utils/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip pkg()!= +# Calculate append=skip pkg()!=&&merge()!= diff --git a/profiles/templates/3.4/6_ac_builder_setup/sys-apps/portage/.calculate_directory b/profiles/templates/3.4/6_ac_builder_setup/sys-apps/portage/.calculate_directory index 3f5e3a085..4bf524353 100644 --- a/profiles/templates/3.4/6_ac_builder_setup/sys-apps/portage/.calculate_directory +++ b/profiles/templates/3.4/6_ac_builder_setup/sys-apps/portage/.calculate_directory @@ -1 +1 @@ -# Calculate path=/ name=etc pkg()!= +# Calculate path=/ name=etc pkg()!=&&merge()!= diff --git a/profiles/templates/3.4/6_ac_builder_setup/sys-apps/shadow/.calculate_directory b/profiles/templates/3.4/6_ac_builder_setup/sys-apps/shadow/.calculate_directory index 3f5e3a085..4bf524353 100644 --- a/profiles/templates/3.4/6_ac_builder_setup/sys-apps/shadow/.calculate_directory +++ b/profiles/templates/3.4/6_ac_builder_setup/sys-apps/shadow/.calculate_directory @@ -1 +1 @@ -# Calculate path=/ name=etc pkg()!= +# Calculate path=/ name=etc pkg()!=&&merge()!= diff --git a/profiles/templates/deprecated/3.1/.calculate_directory b/profiles/templates/deprecated/3.1/.calculate_directory index 858d3da56..e9f652936 100644 --- a/profiles/templates/deprecated/3.1/.calculate_directory +++ b/profiles/templates/deprecated/3.1/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip cl_name==calculate-core&&cl_ver>=3.1.1&&cl_ver<3.3||cl_name==calculate-core&&cl_ver>=3.1.1&&pkg(sys-apps/calculate-utils)<3.3.0_alpha1&&cl_ver<3.4 +# Calculate append=skip cl_name==calculate-core&&cl_ver>=3.1.1&&cl_ver<3.3||cl_name==calculate-core&&cl_ver>=3.1.1&&pkg(sys-apps/calculate-utils)<3.3.0_alpha1