From 5aa091bedd6023b469702d63a487275ec7604589 Mon Sep 17 00:00:00 2001 From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" Date: Mon, 31 Aug 2015 01:58:55 +0000 Subject: [PATCH] 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. --- .../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 +- .../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 5aca6937..6017177a 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 7ae01272..6b4374bf 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 72e7da47..fe12ebc6 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 8e9d5401..f97184c9 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 4ca4f050..4cc7a4e1 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 6ccf098b..fd88f959 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 247506ed..cabb3bd7 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 82ec7d49..b0bb5375 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 28726414..55f72198 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 90b5281c..b0d37a78 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 d597e367..28f536d4 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 21299d21..c123207c 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