commit: 5aa091bedd6023b469702d63a487275ec7604589 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> AuthorDate: Mon Aug 31 01:58:55 2015 +0000 Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> CommitDate: Mon Aug 31 01:58:55 2015 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=5aa091be
Revert "Update cdtar location now that catalyst was moved to /usr/share." I was too quick on this update. We haven't updated catalyst in the build hosts yet. This reverts commit 5f1d59612863eecdb0347bdfb49eb4a3125af996. releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec | 2 +- releases/weekly/specs/amd64/hardened/admincd-stage2.spec | 2 +- releases/weekly/specs/amd64/installcd-stage2-minimal.spec | 2 +- releases/weekly/specs/amd64/livecd-stage2.spec | 2 +- releases/weekly/specs/amd64/livedvd-stage2.spec | 2 +- releases/weekly/specs/hppa/installcd-stage2-universal.spec | 2 +- releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec | 2 +- releases/weekly/specs/x86/hardened/admincd-stage2.spec | 2 +- releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec | 2 +- releases/weekly/specs/x86/i686/livecd-stage2.spec | 2 +- releases/weekly/specs/x86/i686/livedvd-stage2.spec | 2 +- releases/weekly/specs/x86/installcd-stage2-minimal.spec | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec index 5aca693..6017177 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec @@ -8,7 +8,7 @@ source_subpath: hardened/livecd-stage1-amd64-2008.0-selinux portage_confdir: /release/releng/releases/weekly/portage/admincd livecd/bootargs: dokeymap -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 livecd/iso: admincd-amd64-2008.0.iso diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec index 7ae0127..6b4374b 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec @@ -8,7 +8,7 @@ source_subpath: hardened/livecd-stage1-amd64-2008.0 portage_confdir: /release/releng/releases/weekly/portage/admincd livecd/bootargs: dokeymap -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 livecd/iso: admincd-amd64-2008.0.iso diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec index 72e7da4..fe12ebc 100644 --- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec @@ -8,7 +8,7 @@ source_subpath: default/livecd-stage1-amd64-2008.0 portage_confdir: /release/releng/releases/weekly/portage/installcd livecd/bootargs: dokeymap -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 livecd/iso: install-amd64-minimal-2008.0.iso diff --git a/releases/weekly/specs/amd64/livecd-stage2.spec b/releases/weekly/specs/amd64/livecd-stage2.spec index 8e9d540..f97184c 100644 --- a/releases/weekly/specs/amd64/livecd-stage2.spec +++ b/releases/weekly/specs/amd64/livecd-stage2.spec @@ -7,7 +7,7 @@ snapshot: 2008.0 source_subpath: default/livecd-stage1-amd64-installer-2008.0 livecd/bootargs: dokeymap -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fsscript: /release/releng/releases/2008.0/scripts/livecd.sh livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 diff --git a/releases/weekly/specs/amd64/livedvd-stage2.spec b/releases/weekly/specs/amd64/livedvd-stage2.spec index 4ca4f05..4cc7a4e 100644 --- a/releases/weekly/specs/amd64/livedvd-stage2.spec +++ b/releases/weekly/specs/amd64/livedvd-stage2.spec @@ -7,7 +7,7 @@ snapshot: 2008.0 source_subpath: default/livecd-stage1-amd64-installer-2008.0 livecd/bootargs: dokeymap -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fsscript: /release/releng/releases/2008.0/scripts/livecd.sh livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 diff --git a/releases/weekly/specs/hppa/installcd-stage2-universal.spec b/releases/weekly/specs/hppa/installcd-stage2-universal.spec index 6ccf098..fd88f95 100644 --- a/releases/weekly/specs/hppa/installcd-stage2-universal.spec +++ b/releases/weekly/specs/hppa/installcd-stage2-universal.spec @@ -7,7 +7,7 @@ snapshot: 2008.0 source_subpath: default/livecd-stage1-hppa1.1-2008.0 livecd/bootargs: dokeymap -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2 +livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm livecd/iso: /var/tmp/catalyst/builds/default/install-hppa-universal-2008.0.iso diff --git a/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec b/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec index 247506e..cabb3bd 100644 --- a/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec @@ -6,7 +6,7 @@ version_stamp: 2008.0 profile: default/linux/powerpc/ppc64/13.0/32bit-userland source_subpath: default/livecd-stage1-ppc64-32ul-2008.0 -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 +livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --utils-arch=ppc --arch-override=ppc --makeopts=-j8 --lvm --dmraid --mdadm livecd/iso: /var/tmp/catalyst/builds/default/install-powerpc-minimal-2008.0.iso diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec index 82ec7d4..b0bb537 100644 --- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec +++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec @@ -8,7 +8,7 @@ source_subpath: hardened/livecd-stage1-x86-2008.0 portage_confdir: /release/releng/releases/weekly/portage/admincd livecd/bootargs: dokeymap -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 livecd/iso: admincd-x86-2008.0.iso diff --git a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec index 2872641..55f7219 100644 --- a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec @@ -7,7 +7,7 @@ snapshot: 2008.0 source_subpath: hardened/livecd-stage1-x86-hardened-2008.0 livecd/bootargs: dokeymap -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 livecd/iso: install-x86-minimal-2008.0.iso diff --git a/releases/weekly/specs/x86/i686/livecd-stage2.spec b/releases/weekly/specs/x86/i686/livecd-stage2.spec index 90b5281..b0d37a7 100644 --- a/releases/weekly/specs/x86/i686/livecd-stage2.spec +++ b/releases/weekly/specs/x86/i686/livecd-stage2.spec @@ -7,7 +7,7 @@ snapshot: 2008.0 source_subpath: default/livecd-stage1-i686-installer-2008.0 livecd/bootargs: dokeymap -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fsscript: /release/releng/releases/2008.0/scripts/livecd.sh livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 diff --git a/releases/weekly/specs/x86/i686/livedvd-stage2.spec b/releases/weekly/specs/x86/i686/livedvd-stage2.spec index d597e36..28f536d 100644 --- a/releases/weekly/specs/x86/i686/livedvd-stage2.spec +++ b/releases/weekly/specs/x86/i686/livedvd-stage2.spec @@ -7,7 +7,7 @@ snapshot: 2008.0 source_subpath: default/livecd-stage1-i686-installer-2008.0 livecd/bootargs: dokeymap -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fsscript: /release/releng/releases/2008.0/scripts/livecd.sh livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/installcd-stage2-minimal.spec index 21299d2..c123207 100644 --- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/x86/installcd-stage2-minimal.spec @@ -8,7 +8,7 @@ source_subpath: default/livecd-stage1-x86-2008.0 portage_confdir: /release/releng/releases/weekly/portage/installcd livecd/bootargs: dokeymap -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 livecd/iso: install-x86-minimal-2008.0.iso
