diff options
author | Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2016-04-26 22:27:56 +0000 |
---|---|---|
committer | Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2016-04-26 22:27:56 +0000 |
commit | 67beeebbdfde802793662553f804c74b965e4813 (patch) | |
tree | 3b2341a489dedf332addaf75f82b0585002a49e0 | |
parent | Whitespace. (diff) | |
download | releng-67beeebbdfde802793662553f804c74b965e4813.tar.gz releng-67beeebbdfde802793662553f804c74b965e4813.tar.bz2 releng-67beeebbdfde802793662553f804c74b965e4813.zip |
Stop using hardcoded paths for the releng repo.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
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 a3abe6cd..041d5fa2 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 45667173..f5b74675 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 65384592..32f5f5ae 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 e52ed35a..3c6601de 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 2a7f3484..15361fdb 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 3da83f96..ea0466a7 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 43ddd750..90ad40f6 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 d19ece91..a02e843b 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 4855de7f..2977a67d 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 67b25aee..c753eaa7 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 3dcfb4e5..ee93a452 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 319d6e68..f81cfa56 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 dbd1a595..82f38ff4 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 c064480e..28a52a42 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 ce34c626..1615cf6b 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 36a6bfa6..99e77223 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 62152fd4..1769ca33 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 594df10e..ad310321 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 826b0b7b..a57f813d 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 ca441e77..bb1e6aaf 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 1d30cde2..94eb7bd7 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 deae00be..ab56ab7f 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 364f1e3d..5a22e60f 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 7b0fcc46..666ef200 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 32dbed10..b6f28ba0 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 ba536da4..8bad2571 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 e9177dab..55ebcc91 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 33918873..0a006e2c 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 f22357dd..c07365cd 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 7e978b79..3a083ced 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 5bb3d7fc..aab5cdc9 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 87779c21..937539f1 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 f714797f..3eaaf0c2 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 42a70adb..6bf8b1d6 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 dcd57281..d2f6734f 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 012e16dc..3b1c6e00 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 013ec2ef..11ad8206 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 a5506597..1e87741f 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 2121557b..53bf8d16 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 1cd5e282..0e990313 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 a3097425..c680cb7b 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 7b899f4e..132cec0f 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 6eb5228e..f2dfd206 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 1d1d98c2..8d8f312f 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 b8c3a4e0..34cf3f6a 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 78ff0e10..2142ad0d 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 368cf00c..6a7300e6 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 196eeeea..baa769ea 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 ccfa18f7..f906ce31 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 ba069d0e..dd4aa336 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 81b05b5d..0feca2dc 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 94baedd4..e15ae511 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 58afaf90..b1110e82 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 9b42398c..e2b81b74 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 caad715e..d060250e 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 0bfab17f..99c94e74 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 54c8c78c..dbb44c61 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 00d82505..823b9f2c 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 |