* [gentoo-commits] proj/releng:master commit in: releases/weekly/specs/x86/i686/, tools/, releases/weekly/specs/amd64/, ...
@ 2016-04-26 22:35 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; only message in thread
From: Jorge Manuel B. S. Vicetto @ 2016-04-26 22:35 UTC (permalink / raw
To: gentoo-commits
commit: 67beeebbdfde802793662553f804c74b965e4813
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 22:27:56 2016 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 22:27:56 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=67beeebb
Stop using hardcoded paths for the releng repo.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
.../weekly/specs/amd64/hardened/admincd-stage1-selinux.spec | 2 +-
releases/weekly/specs/amd64/hardened/admincd-stage1.spec | 2 +-
.../weekly/specs/amd64/hardened/admincd-stage2-selinux.spec | 4 ++--
releases/weekly/specs/amd64/hardened/admincd-stage2.spec | 4 ++--
releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec | 2 +-
.../weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec | 2 +-
releases/weekly/specs/amd64/hardened/stage1-selinux.spec | 2 +-
releases/weekly/specs/amd64/hardened/stage1.spec | 2 +-
releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec | 2 +-
.../weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec | 2 +-
releases/weekly/specs/amd64/hardened/stage2-selinux.spec | 2 +-
releases/weekly/specs/amd64/hardened/stage2.spec | 2 +-
releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec | 2 +-
.../weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec | 2 +-
releases/weekly/specs/amd64/hardened/stage3-selinux.spec | 2 +-
releases/weekly/specs/amd64/hardened/stage3.spec | 2 +-
releases/weekly/specs/amd64/hardened/stage4-cloud.spec | 10 +++++-----
releases/weekly/specs/amd64/hardened/stage4-minimal.spec | 10 +++++-----
.../weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec | 10 +++++-----
.../weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec | 10 +++++-----
releases/weekly/specs/amd64/installcd-stage1.spec | 2 +-
releases/weekly/specs/amd64/installcd-stage2-minimal.spec | 4 ++--
releases/weekly/specs/amd64/livecd-stage2.spec | 8 ++++----
releases/weekly/specs/amd64/livedvd-stage2.spec | 8 ++++----
releases/weekly/specs/amd64/stage1-nomultilib.spec | 2 +-
releases/weekly/specs/amd64/stage1-systemd.spec | 2 +-
releases/weekly/specs/amd64/stage1-x32.spec | 2 +-
releases/weekly/specs/amd64/stage1.spec | 2 +-
releases/weekly/specs/amd64/stage2-nomultilib.spec | 2 +-
releases/weekly/specs/amd64/stage2-systemd.spec | 2 +-
releases/weekly/specs/amd64/stage2-x32.spec | 2 +-
releases/weekly/specs/amd64/stage2.spec | 2 +-
releases/weekly/specs/amd64/stage3-nomultilib.spec | 2 +-
releases/weekly/specs/amd64/stage3-systemd.spec | 2 +-
releases/weekly/specs/amd64/stage3-x32.spec | 2 +-
releases/weekly/specs/amd64/stage3.spec | 2 +-
releases/weekly/specs/amd64/stage4-cloud.spec | 8 ++++----
releases/weekly/specs/amd64/stage4-minimal.spec | 8 ++++----
releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec | 8 ++++----
releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec | 8 ++++----
releases/weekly/specs/amd64/stage4-systemd.spec | 8 ++++----
releases/weekly/specs/x86/hardened/admincd-stage1.spec | 2 +-
releases/weekly/specs/x86/hardened/admincd-stage2.spec | 4 ++--
.../weekly/specs/x86/hardened/installcd-stage2-minimal.spec | 2 +-
releases/weekly/specs/x86/hardened/stage1.spec | 2 +-
releases/weekly/specs/x86/hardened/stage2.spec | 2 +-
releases/weekly/specs/x86/hardened/stage3.spec | 2 +-
releases/weekly/specs/x86/i686/livecd-stage2.spec | 8 ++++----
releases/weekly/specs/x86/i686/livedvd-stage2.spec | 8 ++++----
releases/weekly/specs/x86/i686/stage1.spec | 2 +-
releases/weekly/specs/x86/i686/stage2.spec | 2 +-
releases/weekly/specs/x86/i686/stage3.spec | 2 +-
releases/weekly/specs/x86/installcd-stage1.spec | 2 +-
releases/weekly/specs/x86/installcd-stage2-minimal.spec | 4 ++--
releases/weekly/specs/x86/stage1.spec | 2 +-
releases/weekly/specs/x86/stage2.spec | 2 +-
releases/weekly/specs/x86/stage3.spec | 2 +-
tools/catalyst-auto | 1 +
58 files changed, 106 insertions(+), 105 deletions(-)
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
index a3abe6c..041d5fa 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
@@ -5,7 +5,7 @@ rel_type: hardened
profile: hardened/linux/amd64/selinux
snapshot: latest
source_subpath: hardened/stage3-amd64-hardened-selinux-latest
-portage_confdir: /release/releng/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
livecd/use:
deprecated
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
index 4566717..f5b7467 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
@@ -5,7 +5,7 @@ rel_type: hardened
profile: hardened/linux/amd64
snapshot: latest
source_subpath: hardened/stage3-amd64-hardened-latest
-portage_confdir: /release/releng/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
livecd/use:
deprecated
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
index 6538459..32f5f5a 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
@@ -5,7 +5,7 @@ rel_type: hardened
profile: hardened/linux/amd64/selinux
snapshot: latest
source_subpath: hardened/livecd-stage1-amd64-latest-selinux
-portage_confdir: /release/releng/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
livecd/bootargs: dokeymap
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
@@ -19,7 +19,7 @@ livecd/rcdel: keymaps|boot
boot/kernel: gentoo
boot/kernel/gentoo/sources: hardened-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/admincd-3.8.3-selinux.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/admincd-3.8.3-selinux.config
boot/kernel/gentoo/use:
-*
alsa
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
index e52ed35..3c6601d 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
@@ -5,7 +5,7 @@ rel_type: hardened
profile: hardened/linux/amd64
snapshot: latest
source_subpath: hardened/livecd-stage1-amd64-latest
-portage_confdir: /release/releng/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
livecd/bootargs: dokeymap
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
@@ -19,7 +19,7 @@ livecd/rcdel: keymaps|boot
boot/kernel: gentoo
boot/kernel/gentoo/sources: hardened-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/admincd-3.18.9.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/admincd-3.18.9.config
boot/kernel/gentoo/use:
-*
alsa
diff --git a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
index 2a7f348..15361fd 100644
--- a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
@@ -7,4 +7,4 @@ snapshot: latest
source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest
update_seed: yes
update_seed_command: --update --deep @world
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
index 3da83f9..ea0466a 100644
--- a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
@@ -7,4 +7,4 @@ snapshot: latest
source_subpath: hardened/stage3-amd64-hardened-selinux+nomultilib-latest
update_seed: yes
update_seed_command: --update --deep @world
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/stage1-selinux.spec
index 43ddd75..90ad40f 100644
--- a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/stage1-selinux.spec
@@ -7,4 +7,4 @@ snapshot: latest
source_subpath: hardened/stage3-amd64-hardened-selinux-latest
update_seed: yes
update_seed_command: --update --deep @world
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage1.spec b/releases/weekly/specs/amd64/hardened/stage1.spec
index d19ece9..a02e843 100644
--- a/releases/weekly/specs/amd64/hardened/stage1.spec
+++ b/releases/weekly/specs/amd64/hardened/stage1.spec
@@ -7,4 +7,4 @@ snapshot: latest
source_subpath: hardened/stage3-amd64-hardened-latest
update_seed: yes
update_seed_command: --update --deep @world
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
index 4855de7..2977a67 100644
--- a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
@@ -5,4 +5,4 @@ rel_type: hardened
profile: hardened/linux/amd64/no-multilib
snapshot: latest
source_subpath: hardened/stage1-amd64-hardened+nomultilib-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
index 67b25ae..c753eaa 100644
--- a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
@@ -5,4 +5,4 @@ rel_type: hardened
profile: hardened/linux/amd64/no-multilib/selinux
snapshot: latest
source_subpath: hardened/stage1-amd64-hardened-selinux+nomultilib-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
index 3dcfb4e..ee93a45 100644
--- a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
@@ -5,4 +5,4 @@ rel_type: hardened
profile: hardened/linux/amd64/selinux
snapshot: latest
source_subpath: hardened/stage1-amd64-hardened-selinux-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage2.spec b/releases/weekly/specs/amd64/hardened/stage2.spec
index 319d6e6..f81cfa5 100644
--- a/releases/weekly/specs/amd64/hardened/stage2.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2.spec
@@ -5,4 +5,4 @@ rel_type: hardened
profile: hardened/linux/amd64
snapshot: latest
source_subpath: hardened/stage1-amd64-hardened-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
index dbd1a59..82f38ff 100644
--- a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
@@ -5,4 +5,4 @@ rel_type: hardened
profile: hardened/linux/amd64/no-multilib
snapshot: latest
source_subpath: hardened/stage2-amd64-hardened+nomultilib-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
index c064480..28a52a4 100644
--- a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
@@ -5,4 +5,4 @@ rel_type: hardened
profile: hardened/linux/amd64/no-multilib/selinux
snapshot: latest
source_subpath: hardened/stage2-amd64-hardened-selinux+nomultilib-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec b/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
index ce34c62..1615cf6 100644
--- a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
@@ -5,4 +5,4 @@ rel_type: hardened
profile: hardened/linux/amd64/selinux
snapshot: latest
source_subpath: hardened/stage2-amd64-hardened-selinux-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage3.spec b/releases/weekly/specs/amd64/hardened/stage3.spec
index 36a6bfa..99e7722 100644
--- a/releases/weekly/specs/amd64/hardened/stage3.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3.spec
@@ -5,4 +5,4 @@ rel_type: hardened
profile: hardened/linux/amd64
snapshot: latest
source_subpath: hardened/stage2-amd64-hardened-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage4-cloud.spec b/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
index 62152fd..1769ca3 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
@@ -5,7 +5,7 @@ rel_type: hardened
profile: hardened/linux/amd64
snapshot: latest
source_subpath: hardened/stage3-amd64-hardened-latest
-portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
stage4/use:
bash-completion
@@ -36,8 +36,8 @@ stage4/packages:
sys-devel/bc
sys-power/acpid
sys-process/cronie
-stage4/fsscript: /release/releng/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
+stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
stage4/rcadd:
acpid|default
cloud-config|default
@@ -53,7 +53,7 @@ stage4/rcadd:
boot/kernel: gentoo
boot/kernel/gentoo/sources: hardened-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
boot/kernel/gentoo/extraversion: openstack
boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
@@ -69,7 +69,7 @@ stage4/empty:
/usr/src
/var/cache/edb/dep
/var/cache/genkernel
- /var/cache/portage/distfiles
+ /var/cache/portage/distfiles
/var/empty
/var/run
/var/state
diff --git a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
index 594df10..ad31032 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
@@ -5,7 +5,7 @@ rel_type: hardened
profile: hardened/linux/amd64
snapshot: latest
source_subpath: hardened/stage3-amd64-hardened-latest
-portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
stage4/use:
bindist
@@ -27,8 +27,8 @@ stage4/packages:
sys-apps/lsb-release
sys-devel/bc
sys-power/acpid
-stage4/fsscript: /release/releng/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
+stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
stage4/rcadd:
acpid|default
net.lo|default
@@ -37,7 +37,7 @@ stage4/rcadd:
boot/kernel: gentoo
boot/kernel/gentoo/sources: hardened-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
boot/kernel/gentoo/extraversion: openstack
boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
@@ -53,7 +53,7 @@ stage4/empty:
/usr/src
/var/cache/edb/dep
/var/cache/genkernel
- /var/cache/portage/distfiles
+ /var/cache/portage/distfiles
/var/empty
/var/run
/var/state
diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
index 826b0b7..a57f813 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
@@ -5,7 +5,7 @@ rel_type: hardened
profile: hardened/linux/amd64/no-multilib
snapshot: latest
source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest
-portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
stage4/use:
bash-completion
@@ -36,8 +36,8 @@ stage4/packages:
sys-devel/bc
sys-power/acpid
sys-process/cronie
-stage4/fsscript: /release/releng/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
+stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
stage4/rcadd:
acpid|default
cloud-config|default
@@ -53,7 +53,7 @@ stage4/rcadd:
boot/kernel: gentoo
boot/kernel/gentoo/sources: hardened-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
boot/kernel/gentoo/extraversion: openstack
boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
@@ -69,7 +69,7 @@ stage4/empty:
/usr/src
/var/cache/edb/dep
/var/cache/genkernel
- /var/cache/portage/distfiles
+ /var/cache/portage/distfiles
/var/empty
/var/run
/var/state
diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
index ca441e7..bb1e6aa 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
@@ -5,7 +5,7 @@ rel_type: hardened
profile: hardened/linux/amd64/no-multilib
snapshot: latest
source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest
-portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
stage4/use:
bindist
@@ -27,8 +27,8 @@ stage4/packages:
sys-apps/lsb-release
sys-devel/bc
sys-power/acpid
-stage4/fsscript: /release/releng/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
+stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
stage4/rcadd:
acpid|default
net.lo|default
@@ -37,7 +37,7 @@ stage4/rcadd:
boot/kernel: gentoo
boot/kernel/gentoo/sources: hardened-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
boot/kernel/gentoo/extraversion: openstack
boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
@@ -53,7 +53,7 @@ stage4/empty:
/usr/src
/var/cache/edb/dep
/var/cache/genkernel
- /var/cache/portage/distfiles
+ /var/cache/portage/distfiles
/var/empty
/var/run
/var/state
diff --git a/releases/weekly/specs/amd64/installcd-stage1.spec b/releases/weekly/specs/amd64/installcd-stage1.spec
index 1d30cde..94eb7bd 100644
--- a/releases/weekly/specs/amd64/installcd-stage1.spec
+++ b/releases/weekly/specs/amd64/installcd-stage1.spec
@@ -5,7 +5,7 @@ rel_type: default
profile: default/linux/amd64/13.0/no-multilib
snapshot: latest
source_subpath: default/stage3-amd64-latest
-portage_confdir: /release/releng/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
livecd/use:
deprecated
diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
index deae00b..ab56ab7 100644
--- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
@@ -5,7 +5,7 @@ rel_type: default
profile: default/linux/amd64/13.0/no-multilib
snapshot: latest
source_subpath: default/livecd-stage1-amd64-latest
-portage_confdir: /release/releng/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
livecd/bootargs: dokeymap
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
@@ -19,7 +19,7 @@ livecd/rcdel: keymaps|boot
boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.18.12.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/installcd-3.18.12.config
boot/kernel/gentoo/use:
-*
alsa
diff --git a/releases/weekly/specs/amd64/livecd-stage2.spec b/releases/weekly/specs/amd64/livecd-stage2.spec
index 364f1e3..5a22e60 100644
--- a/releases/weekly/specs/amd64/livecd-stage2.spec
+++ b/releases/weekly/specs/amd64/livecd-stage2.spec
@@ -8,7 +8,7 @@ source_subpath: default/livecd-stage1-amd64-installer-latest
livecd/bootargs: dokeymap
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
-livecd/fsscript: /release/releng/releases/latest/scripts/livecd.sh
+livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh
livecd/fstype: squashfs
livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
livecd/iso: livecd-amd64-installer-latest.iso
@@ -17,12 +17,12 @@ livecd/volid: Gentoo Linux latest amd64 LiveCD
livecd/xsession: xfce
livecd/xdm: gdm
-livecd/overlay: /release/releng/releases/latest/overlays/common/overlay/livecd
-livecd/root_overlay: /release/releng/releases/latest/overlays/common/root_overlay
+livecd/overlay: @REPO_DIR@/releases/latest/overlays/common/overlay/livecd
+livecd/root_overlay: @REPO_DIR@/releases/latest/overlays/common/root_overlay
boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /release/releng/releases/latest/kconfig/amd64/livecd-2.6.24.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/latest/kconfig/amd64/livecd-2.6.24.config
boot/kernel/gentoo/use: atm fbcondecor mng png truetype usb
boot/kernel/gentoo/packages:
media-libs/alsa-oss
diff --git a/releases/weekly/specs/amd64/livedvd-stage2.spec b/releases/weekly/specs/amd64/livedvd-stage2.spec
index 7b0fcc4..666ef20 100644
--- a/releases/weekly/specs/amd64/livedvd-stage2.spec
+++ b/releases/weekly/specs/amd64/livedvd-stage2.spec
@@ -8,7 +8,7 @@ source_subpath: default/livecd-stage1-amd64-installer-latest
livecd/bootargs: dokeymap
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
-livecd/fsscript: /release/releng/releases/latest/scripts/livecd.sh
+livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh
livecd/fstype: squashfs
livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
livecd/iso: livedvd-amd64-installer-latest.iso
@@ -17,13 +17,13 @@ livecd/volid: Gentoo Linux AMD64 LiveDVD
livecd/xdm: gdm
livecd/xsession: xfce
-livecd/overlay: /release/releng/releases/latest/overlays/common/overlay/livedvd
-livecd/root_overlay: /release/releng/releases/latest/overlays/common/root_overlay
+livecd/overlay: @REPO_DIR@/releases/latest/overlays/common/overlay/livedvd
+livecd/root_overlay: @REPO_DIR@/releases/latest/overlays/common/root_overlay
boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /release/releng/releases/latest/kconfig/amd64/livecd-2.6.24.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/latest/kconfig/amd64/livecd-2.6.24.config
boot/kernel/gentoo/use: atm fbcondecor mng png truetype usb
boot/kernel/gentoo/packages:
media-libs/alsa-oss
diff --git a/releases/weekly/specs/amd64/stage1-nomultilib.spec b/releases/weekly/specs/amd64/stage1-nomultilib.spec
index 32dbed1..b6f28ba 100644
--- a/releases/weekly/specs/amd64/stage1-nomultilib.spec
+++ b/releases/weekly/specs/amd64/stage1-nomultilib.spec
@@ -7,4 +7,4 @@ snapshot: latest
source_subpath: default/stage3-amd64-nomultilib-latest
update_seed: yes
update_seed_command: --update --deep @world
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage1-systemd.spec b/releases/weekly/specs/amd64/stage1-systemd.spec
index ba536da..8bad257 100644
--- a/releases/weekly/specs/amd64/stage1-systemd.spec
+++ b/releases/weekly/specs/amd64/stage1-systemd.spec
@@ -7,4 +7,4 @@ snapshot: latest
source_subpath: default/stage3-amd64-latest
update_seed: yes
update_seed_command: --update --deep @world
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage1-x32.spec b/releases/weekly/specs/amd64/stage1-x32.spec
index e9177da..55ebcc9 100644
--- a/releases/weekly/specs/amd64/stage1-x32.spec
+++ b/releases/weekly/specs/amd64/stage1-x32.spec
@@ -7,4 +7,4 @@ snapshot: latest
source_subpath: default/stage3-x32-latest
update_seed: yes
update_seed_command: --update --deep @world
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage1.spec b/releases/weekly/specs/amd64/stage1.spec
index 3391887..0a006e2 100644
--- a/releases/weekly/specs/amd64/stage1.spec
+++ b/releases/weekly/specs/amd64/stage1.spec
@@ -7,4 +7,4 @@ snapshot: latest
source_subpath: default/stage3-amd64-latest
update_seed: yes
update_seed_command: --update --deep @world
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage2-nomultilib.spec b/releases/weekly/specs/amd64/stage2-nomultilib.spec
index f22357d..c07365c 100644
--- a/releases/weekly/specs/amd64/stage2-nomultilib.spec
+++ b/releases/weekly/specs/amd64/stage2-nomultilib.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/amd64/13.0/no-multilib
snapshot: latest
source_subpath: default/stage1-amd64-nomultilib-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage2-systemd.spec b/releases/weekly/specs/amd64/stage2-systemd.spec
index 7e978b7..3a083ce 100644
--- a/releases/weekly/specs/amd64/stage2-systemd.spec
+++ b/releases/weekly/specs/amd64/stage2-systemd.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/amd64/13.0/systemd
snapshot: latest
source_subpath: default/stage1-amd64-systemd-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage2-x32.spec b/releases/weekly/specs/amd64/stage2-x32.spec
index 5bb3d7f..aab5cdc 100644
--- a/releases/weekly/specs/amd64/stage2-x32.spec
+++ b/releases/weekly/specs/amd64/stage2-x32.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/amd64/13.0/x32
snapshot: latest
source_subpath: default/stage1-x32-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage2.spec b/releases/weekly/specs/amd64/stage2.spec
index 87779c2..937539f 100644
--- a/releases/weekly/specs/amd64/stage2.spec
+++ b/releases/weekly/specs/amd64/stage2.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/amd64/13.0
snapshot: latest
source_subpath: default/stage1-amd64-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage3-nomultilib.spec b/releases/weekly/specs/amd64/stage3-nomultilib.spec
index f714797..3eaaf0c 100644
--- a/releases/weekly/specs/amd64/stage3-nomultilib.spec
+++ b/releases/weekly/specs/amd64/stage3-nomultilib.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/amd64/13.0/no-multilib
snapshot: latest
source_subpath: default/stage2-amd64-nomultilib-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage3-systemd.spec b/releases/weekly/specs/amd64/stage3-systemd.spec
index 42a70ad..6bf8b1d 100644
--- a/releases/weekly/specs/amd64/stage3-systemd.spec
+++ b/releases/weekly/specs/amd64/stage3-systemd.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/amd64/13.0/systemd
snapshot: latest
source_subpath: default/stage2-amd64-systemd-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage3-x32.spec b/releases/weekly/specs/amd64/stage3-x32.spec
index dcd5728..d2f6734 100644
--- a/releases/weekly/specs/amd64/stage3-x32.spec
+++ b/releases/weekly/specs/amd64/stage3-x32.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/amd64/13.0/x32
snapshot: latest
source_subpath: default/stage2-x32-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage3.spec b/releases/weekly/specs/amd64/stage3.spec
index 012e16d..3b1c6e0 100644
--- a/releases/weekly/specs/amd64/stage3.spec
+++ b/releases/weekly/specs/amd64/stage3.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/amd64/13.0
snapshot: latest
source_subpath: default/stage2-amd64-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage4-cloud.spec b/releases/weekly/specs/amd64/stage4-cloud.spec
index 013ec2e..11ad820 100644
--- a/releases/weekly/specs/amd64/stage4-cloud.spec
+++ b/releases/weekly/specs/amd64/stage4-cloud.spec
@@ -5,7 +5,7 @@ rel_type: default
profile: default/linux/amd64/13.0
snapshot: latest
source_subpath: default/stage3-amd64-latest
-portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
stage4/use:
bash-completion
@@ -38,8 +38,8 @@ stage4/packages:
sys-devel/bc
sys-power/acpid
sys-process/cronie
-stage4/fsscript: /release/releng/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
+stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
stage4/rcadd:
acpid|default
cloud-config|default
@@ -55,7 +55,7 @@ stage4/rcadd:
boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
boot/kernel/gentoo/extraversion: openstack
boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
diff --git a/releases/weekly/specs/amd64/stage4-minimal.spec b/releases/weekly/specs/amd64/stage4-minimal.spec
index a550659..1e87741 100644
--- a/releases/weekly/specs/amd64/stage4-minimal.spec
+++ b/releases/weekly/specs/amd64/stage4-minimal.spec
@@ -5,7 +5,7 @@ rel_type: default
profile: default/linux/amd64/13.0
snapshot: latest
source_subpath: default/stage3-amd64-latest
-portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
stage4/use:
bindist
@@ -27,8 +27,8 @@ stage4/packages:
sys-apps/lsb-release
sys-devel/bc
sys-power/acpid
-stage4/fsscript: /release/releng/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
+stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
stage4/rcadd:
acpid|default
net.lo|default
@@ -37,7 +37,7 @@ stage4/rcadd:
boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
boot/kernel/gentoo/extraversion: openstack
boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec b/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
index 2121557..53bf8d1 100644
--- a/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
+++ b/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
@@ -5,7 +5,7 @@ rel_type: default
profile: default/linux/amd64/13.0/no-multilib
snapshot: latest
source_subpath: default/stage3-amd64-nomultilib-latest
-portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
stage4/use:
bash-completion
@@ -36,8 +36,8 @@ stage4/packages:
sys-devel/bc
sys-power/acpid
sys-process/cronie
-stage4/fsscript: /release/releng/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
+stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
stage4/rcadd:
acpid|default
cloud-config|default
@@ -53,7 +53,7 @@ stage4/rcadd:
boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
boot/kernel/gentoo/extraversion: openstack
boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
index 1cd5e28..0e99031 100644
--- a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
+++ b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
@@ -5,7 +5,7 @@ rel_type: default
profile: default/linux/amd64/13.0/no-multilib
snapshot: latest
source_subpath: default/stage3-amd64-nomultilib-latest
-portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
stage4/use:
bindist
@@ -27,8 +27,8 @@ stage4/packages:
sys-apps/lsb-release
sys-devel/bc
sys-power/acpid
-stage4/fsscript: /release/releng/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
+stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
stage4/rcadd:
acpid|default
net.lo|default
@@ -37,7 +37,7 @@ stage4/rcadd:
boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
boot/kernel/gentoo/extraversion: openstack
boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
diff --git a/releases/weekly/specs/amd64/stage4-systemd.spec b/releases/weekly/specs/amd64/stage4-systemd.spec
index a309742..c680cb7 100644
--- a/releases/weekly/specs/amd64/stage4-systemd.spec
+++ b/releases/weekly/specs/amd64/stage4-systemd.spec
@@ -5,7 +5,7 @@ rel_type: default
profile: default/linux/amd64/13.0/systemd
snapshot: latest
source_subpath: default/stage3-amd64-latest
-portage_confdir: /release/releng/releases/weekly/portage/systemd-stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/systemd-stages
stage4/use:
bash-completion
@@ -38,8 +38,8 @@ stage4/packages:
sys-devel/bc
sys-power/acpid
sys-process/cronie
-stage4/fsscript: /release/releng/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
+stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
+stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
stage4/rcadd:
acpid|default
cloud-config|default
@@ -55,7 +55,7 @@ stage4/rcadd:
boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
boot/kernel/gentoo/extraversion: openstack
boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
diff --git a/releases/weekly/specs/x86/hardened/admincd-stage1.spec b/releases/weekly/specs/x86/hardened/admincd-stage1.spec
index 7b899f4..132cec0 100644
--- a/releases/weekly/specs/x86/hardened/admincd-stage1.spec
+++ b/releases/weekly/specs/x86/hardened/admincd-stage1.spec
@@ -5,7 +5,7 @@ rel_type: hardened
profile: hardened/linux/x86
snapshot: latest
source_subpath: hardened/stage3-i686-hardened-latest
-portage_confdir: /release/releng/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
livecd/use:
deprecated
diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
index 6eb5228..f2dfd20 100644
--- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec
+++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
@@ -5,7 +5,7 @@ rel_type: hardened
profile: hardened/linux/x86
snapshot: latest
source_subpath: hardened/livecd-stage1-x86-latest
-portage_confdir: /release/releng/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
livecd/bootargs: dokeymap
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
@@ -19,7 +19,7 @@ livecd/rcdel: keymaps|boot
boot/kernel: gentoo
boot/kernel/gentoo/sources: hardened-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/x86/admincd-3.18.9.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/x86/admincd-3.18.9.config
boot/kernel/gentoo/use:
-*
alsa
diff --git a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
index 1d1d98c..8d8f312 100644
--- a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
@@ -17,7 +17,7 @@ livecd/volid: Gentoo Linux x86 latest
boot/kernel: gentoo
boot/kernel/gentoo/sources: hardened-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/x86/hardened/installcd-2.6.38.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/x86/hardened/installcd-2.6.38.config
boot/kernel/gentoo/use:
-*
alsa
diff --git a/releases/weekly/specs/x86/hardened/stage1.spec b/releases/weekly/specs/x86/hardened/stage1.spec
index b8c3a4e..34cf3f6 100644
--- a/releases/weekly/specs/x86/hardened/stage1.spec
+++ b/releases/weekly/specs/x86/hardened/stage1.spec
@@ -7,4 +7,4 @@ snapshot: latest
source_subpath: hardened/stage3-i686-hardened-latest
update_seed: yes
update_seed_command: --update --deep @world
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/x86/hardened/stage2.spec b/releases/weekly/specs/x86/hardened/stage2.spec
index 78ff0e1..2142ad0 100644
--- a/releases/weekly/specs/x86/hardened/stage2.spec
+++ b/releases/weekly/specs/x86/hardened/stage2.spec
@@ -5,4 +5,4 @@ rel_type: hardened
profile: hardened/linux/x86
snapshot: latest
source_subpath: hardened/stage1-i686-hardened-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/x86/hardened/stage3.spec b/releases/weekly/specs/x86/hardened/stage3.spec
index 368cf00..6a7300e 100644
--- a/releases/weekly/specs/x86/hardened/stage3.spec
+++ b/releases/weekly/specs/x86/hardened/stage3.spec
@@ -5,4 +5,4 @@ rel_type: hardened
profile: hardened/linux/x86
snapshot: latest
source_subpath: hardened/stage2-i686-hardened-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/x86/i686/livecd-stage2.spec b/releases/weekly/specs/x86/i686/livecd-stage2.spec
index 196eeee..baa769e 100644
--- a/releases/weekly/specs/x86/i686/livecd-stage2.spec
+++ b/releases/weekly/specs/x86/i686/livecd-stage2.spec
@@ -8,7 +8,7 @@ source_subpath: default/livecd-stage1-i686-installer-latest
livecd/bootargs: dokeymap
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
-livecd/fsscript: /release/releng/releases/latest/scripts/livecd.sh
+livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh
livecd/fstype: squashfs
livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
livecd/iso: livecd-i686-installer-latest.iso
@@ -17,13 +17,13 @@ livecd/volid: Gentoo Linux latest x86 LiveCD
livecd/xdm: gdm
livecd/xsession: xfce
-livecd/overlay: /release/releng/releases/latest/overlays/common/overlay/livecd
-livecd/root_overlay: /release/releng/releases/latest/overlays/common/root_overlay
+livecd/overlay: @REPO_DIR@/releases/latest/overlays/common/overlay/livecd
+livecd/root_overlay: @REPO_DIR@/releases/latest/overlays/common/root_overlay
boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /release/releng/releases/latest/kconfig/livecd-2.6.24.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/latest/kconfig/livecd-2.6.24.config
boot/kernel/gentoo/use: atm fbcondecor mng png truetype usb
boot/kernel/gentoo/packages:
media-libs/alsa-oss
diff --git a/releases/weekly/specs/x86/i686/livedvd-stage2.spec b/releases/weekly/specs/x86/i686/livedvd-stage2.spec
index ccfa18f..f906ce3 100644
--- a/releases/weekly/specs/x86/i686/livedvd-stage2.spec
+++ b/releases/weekly/specs/x86/i686/livedvd-stage2.spec
@@ -8,7 +8,7 @@ source_subpath: default/livecd-stage1-i686-installer-latest
livecd/bootargs: dokeymap
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
-livecd/fsscript: /release/releng/releases/latest/scripts/livecd.sh
+livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh
livecd/fstype: squashfs
livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
livecd/iso: livedvd-i686-installer-latest.iso
@@ -17,13 +17,13 @@ livecd/volid: Gentoo Linux latest x86 LiveDVD
livecd/xdm: gdm
livecd/xsession: xfce
-livecd/overlay: /release/releng/releases/latest/overlays/common/overlay/livedvd
-livecd/root_overlay: /release/releng/releases/latest/overlays/common/root_overlay
+livecd/overlay: @REPO_DIR@/releases/latest/overlays/common/overlay/livedvd
+livecd/root_overlay: @REPO_DIR@/releases/latest/overlays/common/root_overlay
boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /release/releng/releases/latest/kconfig/livecd-2.6.24.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/latest/kconfig/livecd-2.6.24.config
boot/kernel/gentoo/use: atm fbcondecor mng png truetype usb
boot/kernel/gentoo/packages:
app-laptop/laptop-mode-tools
diff --git a/releases/weekly/specs/x86/i686/stage1.spec b/releases/weekly/specs/x86/i686/stage1.spec
index ba069d0..dd4aa33 100644
--- a/releases/weekly/specs/x86/i686/stage1.spec
+++ b/releases/weekly/specs/x86/i686/stage1.spec
@@ -7,4 +7,4 @@ snapshot: latest
source_subpath: default/stage3-i686-latest
update_seed: yes
update_seed_command: --update --deep @world
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/x86/i686/stage2.spec b/releases/weekly/specs/x86/i686/stage2.spec
index 81b05b5..0feca2d 100644
--- a/releases/weekly/specs/x86/i686/stage2.spec
+++ b/releases/weekly/specs/x86/i686/stage2.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/x86/13.0
snapshot: latest
source_subpath: default/stage1-i686-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/x86/i686/stage3.spec b/releases/weekly/specs/x86/i686/stage3.spec
index 94baedd..e15ae51 100644
--- a/releases/weekly/specs/x86/i686/stage3.spec
+++ b/releases/weekly/specs/x86/i686/stage3.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/x86/13.0
snapshot: latest
source_subpath: default/stage2-i686-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/x86/installcd-stage1.spec b/releases/weekly/specs/x86/installcd-stage1.spec
index 58afaf9..b1110e8 100644
--- a/releases/weekly/specs/x86/installcd-stage1.spec
+++ b/releases/weekly/specs/x86/installcd-stage1.spec
@@ -5,7 +5,7 @@ rel_type: default
profile: default/linux/x86/13.0
snapshot: latest
source_subpath: default/stage3-i486-latest
-portage_confdir: /release/releng/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
livecd/use:
deprecated
diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/installcd-stage2-minimal.spec
index 9b42398..e2b81b7 100644
--- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/x86/installcd-stage2-minimal.spec
@@ -5,7 +5,7 @@ rel_type: default
profile: default/linux/x86/13.0
snapshot: latest
source_subpath: default/livecd-stage1-x86-latest
-portage_confdir: /release/releng/releases/weekly/portage/isos
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
livecd/bootargs: dokeymap
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
@@ -19,7 +19,7 @@ livecd/rcdel: keymaps|boot
boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/x86/installcd-3.18.12.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/x86/installcd-3.18.12.config
boot/kernel/gentoo/use:
-*
alsa
diff --git a/releases/weekly/specs/x86/stage1.spec b/releases/weekly/specs/x86/stage1.spec
index caad715..d060250 100644
--- a/releases/weekly/specs/x86/stage1.spec
+++ b/releases/weekly/specs/x86/stage1.spec
@@ -7,4 +7,4 @@ snapshot: latest
source_subpath: default/stage3-i486-latest
update_seed: yes
update_seed_command: --update --deep @world
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/x86/stage2.spec b/releases/weekly/specs/x86/stage2.spec
index 0bfab17..99c94e7 100644
--- a/releases/weekly/specs/x86/stage2.spec
+++ b/releases/weekly/specs/x86/stage2.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/x86/13.0
snapshot: latest
source_subpath: default/stage1-i486-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/x86/stage3.spec b/releases/weekly/specs/x86/stage3.spec
index 54c8c78..dbb44c6 100644
--- a/releases/weekly/specs/x86/stage3.spec
+++ b/releases/weekly/specs/x86/stage3.spec
@@ -5,4 +5,4 @@ rel_type: default
profile: default/linux/x86/13.0
snapshot: latest
source_subpath: default/stage2-i486-latest
-portage_confdir: /release/releng/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 00d8250..823b9f2 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -266,6 +266,7 @@ for i in $(find -name '*.spec'); do
sed -i \
-e "s:@DATESTAMP@:${DATESTAMP}:g" \
-e "s:@GITDIR@:${GITDIR}:g" \
+ -e "s:@REPO_DIR@:${REPO_DIR}:g" \
"${i}"
done
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-04-26 22:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-26 22:35 [gentoo-commits] proj/releng:master commit in: releases/weekly/specs/x86/i686/, tools/, releases/weekly/specs/amd64/, Jorge Manuel B. S. Vicetto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox