From f0e62fec975680b4de59adb974c123634d6f0436 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Mon, 5 Mar 2018 21:50:54 +0200 Subject: [PATCH] arm64: Use generic portage_confdir and add portage_prefix portage_prefix will make the necessary tweaks not end up in stage tarball. generic portage_confdir has all the workarounds needed for an up to date stable keywords architecture. --- releases/weekly/specs/arm64/stage1.spec | 3 ++- releases/weekly/specs/arm64/stage2.spec | 3 ++- releases/weekly/specs/arm64/stage3.spec | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/releases/weekly/specs/arm64/stage1.spec b/releases/weekly/specs/arm64/stage1.spec index 1c2eba99..8fb2fde3 100644 --- a/releases/weekly/specs/arm64/stage1.spec +++ b/releases/weekly/specs/arm64/stage1.spec @@ -6,6 +6,7 @@ profile: default/linux/arm64/17.0 snapshot: current source_subpath: default/stage3-arm64-latest pkgcache_path: /var/tmp/catalyst/packages/stage1 -portage_confdir: @REPO_DIR@/releases/weekly/specs/arm64/portage-confdir update_seed: yes update_seed_command: --update --deep --jobs=5 --newuse --complete-graph @world +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages +portage_prefix: releng diff --git a/releases/weekly/specs/arm64/stage2.spec b/releases/weekly/specs/arm64/stage2.spec index c974b731..b5890513 100644 --- a/releases/weekly/specs/arm64/stage2.spec +++ b/releases/weekly/specs/arm64/stage2.spec @@ -6,4 +6,5 @@ profile: default/linux/arm64/17.0 snapshot: current source_subpath: default/stage1-arm64-2008.0 pkgcache_path: /var/tmp/catalyst/packages/stage2 -portage_confdir: @REPO_DIR@/releases/weekly/specs/arm64/portage-confdir +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages +portage_prefix: releng diff --git a/releases/weekly/specs/arm64/stage3.spec b/releases/weekly/specs/arm64/stage3.spec index d7013c57..924d89aa 100644 --- a/releases/weekly/specs/arm64/stage3.spec +++ b/releases/weekly/specs/arm64/stage3.spec @@ -6,4 +6,5 @@ profile: default/linux/arm64/17.0 snapshot: current source_subpath: default/stage2-arm64-2008.0 pkgcache_path: /var/tmp/catalyst/packages/stage3 -portage_confdir: @REPO_DIR@/releases/weekly/specs/arm64/portage-confdir +portage_confdir: @REPO_DIR@/releases/weekly/portage/stages +portage_prefix: releng