commit: df8df8403a34ccffce7055ba1eb4d4b12f0aeda9
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 05:39:09 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 05:47:11 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=df8df840
specs/ppc: Build the powerpc iso using the ppc profile
.../specs/ppc/{ppc64 => ppc32}/installcd-stage1.spec | 10 +++++-----
.../ppc/{ppc64 => ppc32}/installcd-stage2-minimal.spec | 15 ++++++---------
2 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/releases/weekly/specs/ppc/ppc64/installcd-stage1.spec
b/releases/weekly/specs/ppc/ppc32/installcd-stage1.spec
similarity index 89%
rename from releases/weekly/specs/ppc/ppc64/installcd-stage1.spec
rename to releases/weekly/specs/ppc/ppc32/installcd-stage1.spec
index b1549892..fc1f7df5 100644
--- a/releases/weekly/specs/ppc/ppc64/installcd-stage1.spec
+++ b/releases/weekly/specs/ppc/ppc32/installcd-stage1.spec
@@ -1,10 +1,10 @@
-subarch: ppc64
+subarch: ppc
target: livecd-stage1
-version_stamp: 32ul-2008.0
+version_stamp: 2008.0
rel_type: default
-profile: default/linux/powerpc/ppc64/17.0/32bit-userland
+profile: default/linux/powerpc/ppc32/17.0
snapshot: 2008.0
-source_subpath: default/stage3-ppc64-32ul-2008.0
+source_subpath: default/stage3-ppc-2008.0
compression_mode: pixz_x
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
@@ -26,7 +26,7 @@ livecd/use:
static-libs
unicode
xml
-
+
livecd/packages:
app-accessibility/brltty
app-admin/pwgen
diff --git a/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec
b/releases/weekly/specs/ppc/ppc32/installcd-stage2-minimal.spec
similarity index 94%
rename from releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec
rename to releases/weekly/specs/ppc/ppc32/installcd-stage2-minimal.spec
index a4c8b8ec..1044fca8 100644
--- a/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/ppc/ppc32/installcd-stage2-minimal.spec
@@ -1,18 +1,15 @@
-subarch: ppc64
+subarch: ppc
target: livecd-stage2
+version_stamp: 2008.0
rel_type: default
+profile: default/linux/powerpc/ppc32/17.0
snapshot: 2008.0
-version_stamp: 2008.0
-profile: default/linux/powerpc/ppc64/17.0/32bit-userland
-source_subpath: default/livecd-stage1-ppc64-32ul-2008.0
-compression_mode: pixz_x
-decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
+source_subpath: default/livecd-stage1-ppc-2008.0
portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
livecd/fstype: squashfs
-livecd/gk_mainargs: --utils-arch=ppc --arch-override=ppc
+livecd/gk_mainargs: --utils-arch=ppc --arch-override=ppc --makeopts=-j12
livecd/iso: /var/tmp/catalyst/builds/default/install-powerpc-minimal-2008.0.iso
-livecd/overlay: /home/ranger/2008.0/ppccdoverlay/
livecd/type: gentoo-release-minimal
livecd/rcadd: pbbuttonsd|default
@@ -71,8 +68,8 @@ boot/kernel/G5/use:
usb
## ppc32 hardware
+boot/kernel/ppc32/sources: sys-kernel/gentoo-sources
boot/kernel/ppc32/config:
../../../kconfig/powerpc/installcd-ppc32apple-4.14.config
-boot/kernel/ppc32/sources: gentoo-sources
boot/kernel/ppc32/extraversion: ppc32
boot/kernel/ppc32/use:
-*
