| 1 |
commit: 5aa091bedd6023b469702d63a487275ec7604589 |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 31 01:58:55 2015 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 31 01:58:55 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=5aa091be |
| 7 |
|
| 8 |
Revert "Update cdtar location now that catalyst was moved to /usr/share." |
| 9 |
I was too quick on this update. We haven't updated catalyst in the build hosts yet. |
| 10 |
|
| 11 |
This reverts commit 5f1d59612863eecdb0347bdfb49eb4a3125af996. |
| 12 |
|
| 13 |
releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec | 2 +- |
| 14 |
releases/weekly/specs/amd64/hardened/admincd-stage2.spec | 2 +- |
| 15 |
releases/weekly/specs/amd64/installcd-stage2-minimal.spec | 2 +- |
| 16 |
releases/weekly/specs/amd64/livecd-stage2.spec | 2 +- |
| 17 |
releases/weekly/specs/amd64/livedvd-stage2.spec | 2 +- |
| 18 |
releases/weekly/specs/hppa/installcd-stage2-universal.spec | 2 +- |
| 19 |
releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec | 2 +- |
| 20 |
releases/weekly/specs/x86/hardened/admincd-stage2.spec | 2 +- |
| 21 |
releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec | 2 +- |
| 22 |
releases/weekly/specs/x86/i686/livecd-stage2.spec | 2 +- |
| 23 |
releases/weekly/specs/x86/i686/livedvd-stage2.spec | 2 +- |
| 24 |
releases/weekly/specs/x86/installcd-stage2-minimal.spec | 2 +- |
| 25 |
12 files changed, 12 insertions(+), 12 deletions(-) |
| 26 |
|
| 27 |
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec |
| 28 |
index 5aca693..6017177 100644 |
| 29 |
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec |
| 30 |
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec |
| 31 |
@@ -8,7 +8,7 @@ source_subpath: hardened/livecd-stage1-amd64-2008.0-selinux |
| 32 |
portage_confdir: /release/releng/releases/weekly/portage/admincd |
| 33 |
|
| 34 |
livecd/bootargs: dokeymap |
| 35 |
-livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 36 |
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 37 |
livecd/fstype: squashfs |
| 38 |
livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
| 39 |
livecd/iso: admincd-amd64-2008.0.iso |
| 40 |
|
| 41 |
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec |
| 42 |
index 7ae0127..6b4374b 100644 |
| 43 |
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec |
| 44 |
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec |
| 45 |
@@ -8,7 +8,7 @@ source_subpath: hardened/livecd-stage1-amd64-2008.0 |
| 46 |
portage_confdir: /release/releng/releases/weekly/portage/admincd |
| 47 |
|
| 48 |
livecd/bootargs: dokeymap |
| 49 |
-livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 50 |
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 51 |
livecd/fstype: squashfs |
| 52 |
livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
| 53 |
livecd/iso: admincd-amd64-2008.0.iso |
| 54 |
|
| 55 |
diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec |
| 56 |
index 72e7da4..fe12ebc 100644 |
| 57 |
--- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec |
| 58 |
+++ b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec |
| 59 |
@@ -8,7 +8,7 @@ source_subpath: default/livecd-stage1-amd64-2008.0 |
| 60 |
portage_confdir: /release/releng/releases/weekly/portage/installcd |
| 61 |
|
| 62 |
livecd/bootargs: dokeymap |
| 63 |
-livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 64 |
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 65 |
livecd/fstype: squashfs |
| 66 |
livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
| 67 |
livecd/iso: install-amd64-minimal-2008.0.iso |
| 68 |
|
| 69 |
diff --git a/releases/weekly/specs/amd64/livecd-stage2.spec b/releases/weekly/specs/amd64/livecd-stage2.spec |
| 70 |
index 8e9d540..f97184c 100644 |
| 71 |
--- a/releases/weekly/specs/amd64/livecd-stage2.spec |
| 72 |
+++ b/releases/weekly/specs/amd64/livecd-stage2.spec |
| 73 |
@@ -7,7 +7,7 @@ snapshot: 2008.0 |
| 74 |
source_subpath: default/livecd-stage1-amd64-installer-2008.0 |
| 75 |
|
| 76 |
livecd/bootargs: dokeymap |
| 77 |
-livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 78 |
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 79 |
livecd/fsscript: /release/releng/releases/2008.0/scripts/livecd.sh |
| 80 |
livecd/fstype: squashfs |
| 81 |
livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
| 82 |
|
| 83 |
diff --git a/releases/weekly/specs/amd64/livedvd-stage2.spec b/releases/weekly/specs/amd64/livedvd-stage2.spec |
| 84 |
index 4ca4f05..4cc7a4e 100644 |
| 85 |
--- a/releases/weekly/specs/amd64/livedvd-stage2.spec |
| 86 |
+++ b/releases/weekly/specs/amd64/livedvd-stage2.spec |
| 87 |
@@ -7,7 +7,7 @@ snapshot: 2008.0 |
| 88 |
source_subpath: default/livecd-stage1-amd64-installer-2008.0 |
| 89 |
|
| 90 |
livecd/bootargs: dokeymap |
| 91 |
-livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 92 |
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 93 |
livecd/fsscript: /release/releng/releases/2008.0/scripts/livecd.sh |
| 94 |
livecd/fstype: squashfs |
| 95 |
livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
| 96 |
|
| 97 |
diff --git a/releases/weekly/specs/hppa/installcd-stage2-universal.spec b/releases/weekly/specs/hppa/installcd-stage2-universal.spec |
| 98 |
index 6ccf098..fd88f95 100644 |
| 99 |
--- a/releases/weekly/specs/hppa/installcd-stage2-universal.spec |
| 100 |
+++ b/releases/weekly/specs/hppa/installcd-stage2-universal.spec |
| 101 |
@@ -7,7 +7,7 @@ snapshot: 2008.0 |
| 102 |
source_subpath: default/livecd-stage1-hppa1.1-2008.0 |
| 103 |
|
| 104 |
livecd/bootargs: dokeymap |
| 105 |
-livecd/cdtar: /usr/share/catalyst/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2 |
| 106 |
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2 |
| 107 |
livecd/fstype: squashfs |
| 108 |
livecd/gk_mainargs: --lvm --dmraid --mdadm |
| 109 |
livecd/iso: /var/tmp/catalyst/builds/default/install-hppa-universal-2008.0.iso |
| 110 |
|
| 111 |
diff --git a/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec b/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec |
| 112 |
index 247506e..cabb3bd 100644 |
| 113 |
--- a/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec |
| 114 |
+++ b/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec |
| 115 |
@@ -6,7 +6,7 @@ version_stamp: 2008.0 |
| 116 |
profile: default/linux/powerpc/ppc64/13.0/32bit-userland |
| 117 |
source_subpath: default/livecd-stage1-ppc64-32ul-2008.0 |
| 118 |
|
| 119 |
-livecd/cdtar: /usr/share/catalyst/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 |
| 120 |
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 |
| 121 |
livecd/fstype: squashfs |
| 122 |
livecd/gk_mainargs: --utils-arch=ppc --arch-override=ppc --makeopts=-j8 --lvm --dmraid --mdadm |
| 123 |
livecd/iso: /var/tmp/catalyst/builds/default/install-powerpc-minimal-2008.0.iso |
| 124 |
|
| 125 |
diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec |
| 126 |
index 82ec7d4..b0bb537 100644 |
| 127 |
--- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec |
| 128 |
+++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec |
| 129 |
@@ -8,7 +8,7 @@ source_subpath: hardened/livecd-stage1-x86-2008.0 |
| 130 |
portage_confdir: /release/releng/releases/weekly/portage/admincd |
| 131 |
|
| 132 |
livecd/bootargs: dokeymap |
| 133 |
-livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 134 |
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 135 |
livecd/fstype: squashfs |
| 136 |
livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
| 137 |
livecd/iso: admincd-x86-2008.0.iso |
| 138 |
|
| 139 |
diff --git a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec |
| 140 |
index 2872641..55f7219 100644 |
| 141 |
--- a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec |
| 142 |
+++ b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec |
| 143 |
@@ -7,7 +7,7 @@ snapshot: 2008.0 |
| 144 |
source_subpath: hardened/livecd-stage1-x86-hardened-2008.0 |
| 145 |
|
| 146 |
livecd/bootargs: dokeymap |
| 147 |
-livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 148 |
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 149 |
livecd/fstype: squashfs |
| 150 |
livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
| 151 |
livecd/iso: install-x86-minimal-2008.0.iso |
| 152 |
|
| 153 |
diff --git a/releases/weekly/specs/x86/i686/livecd-stage2.spec b/releases/weekly/specs/x86/i686/livecd-stage2.spec |
| 154 |
index 90b5281..b0d37a7 100644 |
| 155 |
--- a/releases/weekly/specs/x86/i686/livecd-stage2.spec |
| 156 |
+++ b/releases/weekly/specs/x86/i686/livecd-stage2.spec |
| 157 |
@@ -7,7 +7,7 @@ snapshot: 2008.0 |
| 158 |
source_subpath: default/livecd-stage1-i686-installer-2008.0 |
| 159 |
|
| 160 |
livecd/bootargs: dokeymap |
| 161 |
-livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 162 |
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 163 |
livecd/fsscript: /release/releng/releases/2008.0/scripts/livecd.sh |
| 164 |
livecd/fstype: squashfs |
| 165 |
livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
| 166 |
|
| 167 |
diff --git a/releases/weekly/specs/x86/i686/livedvd-stage2.spec b/releases/weekly/specs/x86/i686/livedvd-stage2.spec |
| 168 |
index d597e36..28f536d 100644 |
| 169 |
--- a/releases/weekly/specs/x86/i686/livedvd-stage2.spec |
| 170 |
+++ b/releases/weekly/specs/x86/i686/livedvd-stage2.spec |
| 171 |
@@ -7,7 +7,7 @@ snapshot: 2008.0 |
| 172 |
source_subpath: default/livecd-stage1-i686-installer-2008.0 |
| 173 |
|
| 174 |
livecd/bootargs: dokeymap |
| 175 |
-livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 176 |
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 177 |
livecd/fsscript: /release/releng/releases/2008.0/scripts/livecd.sh |
| 178 |
livecd/fstype: squashfs |
| 179 |
livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
| 180 |
|
| 181 |
diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/installcd-stage2-minimal.spec |
| 182 |
index 21299d2..c123207 100644 |
| 183 |
--- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec |
| 184 |
+++ b/releases/weekly/specs/x86/installcd-stage2-minimal.spec |
| 185 |
@@ -8,7 +8,7 @@ source_subpath: default/livecd-stage1-x86-2008.0 |
| 186 |
portage_confdir: /release/releng/releases/weekly/portage/installcd |
| 187 |
|
| 188 |
livecd/bootargs: dokeymap |
| 189 |
-livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 190 |
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 191 |
livecd/fstype: squashfs |
| 192 |
livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
| 193 |
livecd/iso: install-x86-minimal-2008.0.iso |
Archives