From e0daee4c354a1f7814f928051682b7dcaa92ac34 Mon Sep 17 00:00:00 2001 From: Ben Kohler Date: Tue, 28 Aug 2018 08:03:14 -0500 Subject: [PATCH] specs/x86/*cd*: adjust subarch to match seed stage On a few x86 livecd specs we are feeding i486 or i686 seed stage but using "subarch: x86". This subarch results in i386 CHOST in make.conf which causes some various problems. Adjusting subarch to match the seed will ensure there is no "CHOST change" situation. --- releases/weekly/specs/x86/hardened/admincd-stage1.spec | 2 +- releases/weekly/specs/x86/hardened/admincd-stage2.spec | 2 +- releases/weekly/specs/x86/installcd-stage1.spec | 2 +- releases/weekly/specs/x86/installcd-stage2-minimal.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/releases/weekly/specs/x86/hardened/admincd-stage1.spec b/releases/weekly/specs/x86/hardened/admincd-stage1.spec index 158ca49e..8778392b 100644 --- a/releases/weekly/specs/x86/hardened/admincd-stage1.spec +++ b/releases/weekly/specs/x86/hardened/admincd-stage1.spec @@ -1,4 +1,4 @@ -subarch: x86 +subarch: i686 version_stamp: latest target: livecd-stage1 rel_type: hardened diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec index 9f773e9b..efab77cb 100644 --- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec +++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec @@ -1,4 +1,4 @@ -subarch: x86 +subarch: i686 version_stamp: latest target: livecd-stage2 rel_type: hardened diff --git a/releases/weekly/specs/x86/installcd-stage1.spec b/releases/weekly/specs/x86/installcd-stage1.spec index e2fd1bf8..8deb066a 100644 --- a/releases/weekly/specs/x86/installcd-stage1.spec +++ b/releases/weekly/specs/x86/installcd-stage1.spec @@ -1,4 +1,4 @@ -subarch: x86 +subarch: i486 version_stamp: latest target: livecd-stage1 rel_type: default diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/installcd-stage2-minimal.spec index dce76d08..e478b098 100644 --- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/x86/installcd-stage2-minimal.spec @@ -1,4 +1,4 @@ -subarch: x86 +subarch: i486 version_stamp: latest target: livecd-stage2 rel_type: default