| 1 |
commit: e0daee4c354a1f7814f928051682b7dcaa92ac34 |
| 2 |
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 28 13:03:14 2018 +0000 |
| 4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 28 13:03:14 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e0daee4c |
| 7 |
|
| 8 |
specs/x86/*cd*: adjust subarch to match seed stage |
| 9 |
|
| 10 |
On a few x86 livecd specs we are feeding i486 or i686 seed stage but |
| 11 |
using "subarch: x86". This subarch results in i386 CHOST in make.conf |
| 12 |
which causes some various problems. Adjusting subarch to match the seed |
| 13 |
will ensure there is no "CHOST change" situation. |
| 14 |
|
| 15 |
releases/weekly/specs/x86/hardened/admincd-stage1.spec | 2 +- |
| 16 |
releases/weekly/specs/x86/hardened/admincd-stage2.spec | 2 +- |
| 17 |
releases/weekly/specs/x86/installcd-stage1.spec | 2 +- |
| 18 |
releases/weekly/specs/x86/installcd-stage2-minimal.spec | 2 +- |
| 19 |
4 files changed, 4 insertions(+), 4 deletions(-) |
| 20 |
|
| 21 |
diff --git a/releases/weekly/specs/x86/hardened/admincd-stage1.spec b/releases/weekly/specs/x86/hardened/admincd-stage1.spec |
| 22 |
index 158ca49e..8778392b 100644 |
| 23 |
--- a/releases/weekly/specs/x86/hardened/admincd-stage1.spec |
| 24 |
+++ b/releases/weekly/specs/x86/hardened/admincd-stage1.spec |
| 25 |
@@ -1,4 +1,4 @@ |
| 26 |
-subarch: x86 |
| 27 |
+subarch: i686 |
| 28 |
version_stamp: latest |
| 29 |
target: livecd-stage1 |
| 30 |
rel_type: hardened |
| 31 |
|
| 32 |
diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec |
| 33 |
index 9f773e9b..efab77cb 100644 |
| 34 |
--- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec |
| 35 |
+++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec |
| 36 |
@@ -1,4 +1,4 @@ |
| 37 |
-subarch: x86 |
| 38 |
+subarch: i686 |
| 39 |
version_stamp: latest |
| 40 |
target: livecd-stage2 |
| 41 |
rel_type: hardened |
| 42 |
|
| 43 |
diff --git a/releases/weekly/specs/x86/installcd-stage1.spec b/releases/weekly/specs/x86/installcd-stage1.spec |
| 44 |
index e2fd1bf8..8deb066a 100644 |
| 45 |
--- a/releases/weekly/specs/x86/installcd-stage1.spec |
| 46 |
+++ b/releases/weekly/specs/x86/installcd-stage1.spec |
| 47 |
@@ -1,4 +1,4 @@ |
| 48 |
-subarch: x86 |
| 49 |
+subarch: i486 |
| 50 |
version_stamp: latest |
| 51 |
target: livecd-stage1 |
| 52 |
rel_type: default |
| 53 |
|
| 54 |
diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/installcd-stage2-minimal.spec |
| 55 |
index dce76d08..e478b098 100644 |
| 56 |
--- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec |
| 57 |
+++ b/releases/weekly/specs/x86/installcd-stage2-minimal.spec |
| 58 |
@@ -1,4 +1,4 @@ |
| 59 |
-subarch: x86 |
| 60 |
+subarch: i486 |
| 61 |
version_stamp: latest |
| 62 |
target: livecd-stage2 |
| 63 |
rel_type: default |
Archives