From 9529449026e0e7743e55ee78db2d0a19be2e4862 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 28 Nov 2007 20:19:54 +0000 Subject: [PATCH] Made a few edits. Removed splash stuff, changed /root/livecd to /var/cvsroot/gentoo/src/releng so it makes more sense to people, made sure --mdadm was being used. svn path=/trunk/; revision=390 --- specs/2007.1/ChangeLog | 16 +++++++++++++- .../alpha/installcd-stage2-minimal.spec | 4 +--- .../alpha/installcd-stage2-universal.spec | 4 ++-- specs/2007.1/alpha/livecd-stage2.spec | 7 +++--- .../amd64/installcd-stage2-minimal.spec | 8 ++----- specs/2007.1/amd64/livecd-stage2.spec | 14 +++++------- specs/2007.1/amd64/livedvd-stage2.spec | 18 +++++---------- .../2007.1/hppa/installcd-stage2-minimal.spec | 5 +++-- .../hppa/installcd-stage2-universal.spec | 5 +++-- .../2007.1/ia64/installcd-stage2-minimal.spec | 2 +- specs/2007.1/ia64/livecd-stage2.spec | 15 +++++-------- .../ppc/ppc64/installcd-stage2-minimal.spec | 6 ++--- .../ppc/ppc64/installcd-stage2-universal.spec | 7 ++---- specs/2007.1/ppc/ppc64/livecd-stage2.spec | 22 ++++++++----------- .../hardened/installcd-stage2-minimal.spec | 8 ++----- specs/2007.1/x86/i686/livecd-stage2.spec | 14 +++++------- specs/2007.1/x86/i686/livedvd-stage2.spec | 18 +++++---------- .../2007.1/x86/installcd-stage2-minimal.spec | 6 +---- 18 files changed, 73 insertions(+), 106 deletions(-) diff --git a/specs/2007.1/ChangeLog b/specs/2007.1/ChangeLog index d3ee1655..4508cbf4 100644 --- a/specs/2007.1/ChangeLog +++ b/specs/2007.1/ChangeLog @@ -1,5 +1,19 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.1/ChangeLog,v 1.32 2007-11-24 22:39:02 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.1/ChangeLog,v 1.33 2007-11-28 20:19:49 wolf31o2 Exp $ + + 28 Nov 2007; Chris Gianelloni + alpha/installcd-stage2-minimal.spec, + alpha/installcd-stage2-universal.spec, alpha/livecd-stage2.spec, + amd64/installcd-stage2-minimal.spec, amd64/livecd-stage2.spec, + amd64/livedvd-stage2.spec, hppa/installcd-stage2-minimal.spec, + hppa/installcd-stage2-universal.spec, ia64/installcd-stage2-minimal.spec, + ia64/livecd-stage2.spec, ppc/ppc64/installcd-stage2-minimal.spec, + ppc/ppc64/installcd-stage2-universal.spec, ppc/ppc64/livecd-stage2.spec, + x86/hardened/installcd-stage2-minimal.spec, x86/i686/livecd-stage2.spec, + x86/i686/livedvd-stage2.spec, x86/installcd-stage2-minimal.spec: + Made a few edits. Removed splash stuff, changed /root/livecd to + /var/cvsroot/gentoo/src/releng so it makes more sense to people, made sure + --mdadm was being used. 24 Nov 2007; Chris Gianelloni alpha/livecd-stage1.spec, amd64/livecd-stage1.spec, diff --git a/specs/2007.1/alpha/installcd-stage2-minimal.spec b/specs/2007.1/alpha/installcd-stage2-minimal.spec index 326d675e..ddcc8a86 100644 --- a/specs/2007.1/alpha/installcd-stage2-minimal.spec +++ b/specs/2007.1/alpha/installcd-stage2-minimal.spec @@ -14,10 +14,8 @@ livecd/iso: /var/tmp/catalyst/builds/default/install-alpha-minimal-2007.1.iso livecd/volid: Gentoo Linux alpha 2007.1 livecd/type: gentoo-release-minimal -#livecd/overlay: /root/livecd/overlays/alpha-minimal - livecd/bootargs: dokeymap -livecd/gk_mainargs: --lvm --dmraid --evms +livecd/gk_mainargs: --lvm --dmraid --evms --mdadm boot/kernel: gentoo gentoo2.4 boot/kernel/gentoo/sources: vanilla-sources diff --git a/specs/2007.1/alpha/installcd-stage2-universal.spec b/specs/2007.1/alpha/installcd-stage2-universal.spec index 392e06e2..4ffebebb 100644 --- a/specs/2007.1/alpha/installcd-stage2-universal.spec +++ b/specs/2007.1/alpha/installcd-stage2-universal.spec @@ -14,10 +14,10 @@ livecd/iso: /var/tmp/catalyst/builds/default/install-alpha-universal-2007.1.iso livecd/volid: Gentoo Linux alpha 2007.1 livecd/type: gentoo-release-universal -livecd/overlay: /root/livecd/overlays/alpha-universal +livecd/overlay: /var/cvsroot/gentoo/src/releng/overlays/2007.1/common/overlay/installcd livecd/bootargs: dokeymap -livecd/gk_mainargs: --lvm --dmraid --evms +livecd/gk_mainargs: --lvm --dmraid --evms --mdadm boot/kernel: gentoo gentoo2.4 boot/kernel/gentoo/sources: vanilla-sources diff --git a/specs/2007.1/alpha/livecd-stage2.spec b/specs/2007.1/alpha/livecd-stage2.spec index 94f2b2e8..b6adc256 100644 --- a/specs/2007.1/alpha/livecd-stage2.spec +++ b/specs/2007.1/alpha/livecd-stage2.spec @@ -10,11 +10,10 @@ livecd/fstype: squashfs livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/aboot-0.9-r1-cdtar.tar.bz2 livecd/iso: /var/tmp/catalyst/builds/default/livecd-alpha-installer-2007.1.iso -#livecd/splash_type: gensplash -#livecd/splash_theme: livecd-2007.1 + livecd/xdm: gdm livecd/xsession: xfce -livecd/fsscript: /root/livecd/scripts/2007.1/livecd.sh +livecd/fsscript: /var/cvsroot/gentoo/src/releng/scripts/2007.1/livecd.sh livecd/volid: Gentoo Linux alpha LiveCD 2007.1 livecd/users: gentoo @@ -24,7 +23,7 @@ livecd/overlay: /root/livecd/overlays/livecd/2007.1/common/overlay/livecd livecd/root_overlay: /root/livecd/overlays/2007.1/common/root_overlay livecd/bootargs: dokeymap -livecd/gk_mainargs: --lvm --dmraid --evms +livecd/gk_mainargs: --lvm --dmraid --evms --mdadm boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources diff --git a/specs/2007.1/amd64/installcd-stage2-minimal.spec b/specs/2007.1/amd64/installcd-stage2-minimal.spec index bf494853..d21ebd8a 100644 --- a/specs/2007.1/amd64/installcd-stage2-minimal.spec +++ b/specs/2007.1/amd64/installcd-stage2-minimal.spec @@ -10,16 +10,14 @@ livecd/fstype: squashfs livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2 livecd/iso: /var/tmp/catalyst/builds/default/install-amd64-minimal-2007.1.iso -livecd/splash_type: gensplash -livecd/splash_theme: livecd-2007.0 livecd/volid: Gentoo Linux amd64 2007.1 livecd/type: gentoo-release-minimal -#livecd/overlay: /root/livecd/overlays/amd64-minimal +#livecd/overlay: /var/cvsroot/gentoo/src/releng/overlays/2007.1/common/overlay/installcd livecd/bootargs: dokeymap -livecd/gk_mainargs: --makeopts=-j16 --lvm --dmraid +livecd/gk_mainargs: --lvm --dmraid --evms --mdadm boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources @@ -29,8 +27,6 @@ boot/kernel/gentoo/config: /root/livecd/kconfig/2007.1/amd64/installcd-2.6.22.co boot/kernel/gentoo/use: pcmcia usb -X png truetype -qt boot/kernel/gentoo/packages: - media-gfx/splashutils - media-gfx/splash-themes-livecd sys-apps/pcmciautils sys-fs/cryptsetup net-dialup/globespan-adsl diff --git a/specs/2007.1/amd64/livecd-stage2.spec b/specs/2007.1/amd64/livecd-stage2.spec index a716f114..aced9b6c 100644 --- a/specs/2007.1/amd64/livecd-stage2.spec +++ b/specs/2007.1/amd64/livecd-stage2.spec @@ -9,31 +9,27 @@ source_subpath: default/livecd-stage1-amd64-installer-2007.1 livecd/fstype: squashfs livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/iso: /var/tmp/catalyst/builds/default/livecd-amd64-installer-2007.1.iso -#livecd/splash_type: gensplash -#livecd/splash_theme: livecd-2007.1 livecd/xsession: xfce -#livecd/fsscript: /root/livecd/scripts/2007.1/livecd.sh +livecd/fsscript: /var/cvsroot/gentoo/src/releng/scripts/2007.1/livecd.sh livecd/type: gentoo-release-livecd livecd/users: gentoo livecd/volid: Gentoo Linux 2007.1 amd64 LiveCD -livecd/overlay: /root/livecd/overlays/2007.1/common/overlay/livecd -livecd/root_overlay: /root/livecd/overlays/2007.1/common/root_overlay +livecd/overlay: /var/cvsroot/gentoo/src/releng/overlays/2007.1/common/overlay/livecd +livecd/root_overlay: /var/cvsroot/gentoo/src/releng/overlays/2007.1/common/root_overlay livecd/bootargs: dokeymap -livecd/gk_mainargs: --makeopts=-j16 --lvm --dmraid --evms --mdadm +livecd/gk_mainargs: --lvm --dmraid --evms --mdadm boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: /root/livecd/kconfig/2007.1/amd64/livecd-2.6.22.config +boot/kernel/gentoo/config: /var/cvsroot/gentoo/src/releng/kconfig/2007.1/amd64/livecd-2.6.22.config boot/kernel/gentoo/use: pcmcia usb oss atm boot/kernel/gentoo/packages: - media-gfx/splashutils - media-gfx/splash-themes-livecd media-libs/alsa-lib media-libs/alsa-oss media-sound/alsa-utils diff --git a/specs/2007.1/amd64/livedvd-stage2.spec b/specs/2007.1/amd64/livedvd-stage2.spec index 2ce0f8ec..2c7b5569 100644 --- a/specs/2007.1/amd64/livedvd-stage2.spec +++ b/specs/2007.1/amd64/livedvd-stage2.spec @@ -9,34 +9,28 @@ source_subpath: default/livecd-stage1-amd64-installer-2007.1 livecd/fstype: squashfs livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2 livecd/iso: /var/tmp/catalyst/builds/default/livedvd-amd64-installer-2007.1.iso -livecd/splash_type: gensplash -livecd/splash_theme: livecd-2007.1 livecd/xdm: gdm -livecd/xsession: gnome -livecd/fsscript: /root/livecd/scripts/2007.1/livecd.sh +livecd/xsession: xfce +livecd/fsscript: /var/cvsroot/gentoo/src/releng/scripts/2007.1/livecd.sh livecd/type: gentoo-release-livecd livecd/users: gentoo livecd/volid: Gentoo Linux AMD64 LiveDVD -livecd/overlay: - /root/livecd/overlays/2007.1/common/overlay/livedvd - /root/livecd/overlays/2007.1/amd64/overlay/livedvd -livecd/root_overlay: /root/livecd/overlays/root-livecd +livecd/overlay: /var/cvsroot/gentoo/src/releng/overlays/2007.1/common/overlay/livedvd +livecd/root_overlay: /var/cvsroot/gentoo/src/releng/overlays/root-livecd livecd/bootargs: dokeymap -livecd/gk_mainargs: --makeopts=-j16 --lvm --dmraid --evms --unionfs-dev +livecd/gk_mainargs: --lvm --dmraid --evms --mdadm boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: /root/livecd/kconfig/2007.1/amd64/livecd-2.6.19.config +boot/kernel/gentoo/config: /var/cvsroot/gentoo/src/releng/kconfig/2007.1/amd64/livecd-2.6.22.config boot/kernel/gentoo/use: pcmcia usb oss atm truetype png boot/kernel/gentoo/packages: - media-gfx/splashutils - media-gfx/splash-themes-livecd media-libs/alsa-lib media-libs/alsa-oss media-sound/alsa-utils diff --git a/specs/2007.1/hppa/installcd-stage2-minimal.spec b/specs/2007.1/hppa/installcd-stage2-minimal.spec index 83a9ca9c..59c3a14e 100644 --- a/specs/2007.1/hppa/installcd-stage2-minimal.spec +++ b/specs/2007.1/hppa/installcd-stage2-minimal.spec @@ -10,12 +10,13 @@ livecd/fstype: squashfs livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2 livecd/iso: /var/tmp/catalyst/builds/default/install-hppa-minimal-2007.1.iso -livecd/devmanager: udev livecd/type: gentoo-release-minimal livecd/bootargs: dokeymap -#livecd/overlay: /root/livecd/overlays/hppa-minimal +#livecd/overlay: /var/cvsroot/gentoo/src/releng/overlays/2007.1/common/overlay/installcd + +livecd/gk_mainargs: --lvm --dmraid --evms --mdadm boot/kernel: livecd32 livecd64 diff --git a/specs/2007.1/hppa/installcd-stage2-universal.spec b/specs/2007.1/hppa/installcd-stage2-universal.spec index 260165a7..0fbdf3ce 100644 --- a/specs/2007.1/hppa/installcd-stage2-universal.spec +++ b/specs/2007.1/hppa/installcd-stage2-universal.spec @@ -10,12 +10,13 @@ livecd/fstype: squashfs livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2 livecd/iso: /var/tmp/catalyst/builds/default/install-hppa-universal-2007.1.iso -livecd/devmanager: udev livecd/type: gentoo-release-universal livecd/bootargs: dokeymap -livecd/overlay: /root/livecd/overlays/hppa-universal +livecd/overlay: /var/cvsroot/gentoo/src/releng/overlays/2007.1/common/overlay/installcd + +livecd/gk_mainargs: --lvm --dmraid --evms --mdadm boot/kernel: livecd32 livecd64 diff --git a/specs/2007.1/ia64/installcd-stage2-minimal.spec b/specs/2007.1/ia64/installcd-stage2-minimal.spec index 85795015..99b482ba 100644 --- a/specs/2007.1/ia64/installcd-stage2-minimal.spec +++ b/specs/2007.1/ia64/installcd-stage2-minimal.spec @@ -17,7 +17,7 @@ livecd/type: gentoo-release-minimal #livecd/overlay: /root/livecd/overlays/ia64-minimal livecd/bootargs: dokeymap -livecd/gk_mainargs: --makeopts=-j16 --evms --dmraid +livecd/gk_mainargs: --lvm --evms --dmraid --mdadm boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources diff --git a/specs/2007.1/ia64/livecd-stage2.spec b/specs/2007.1/ia64/livecd-stage2.spec index 8b6c5b07..9f94109f 100644 --- a/specs/2007.1/ia64/livecd-stage2.spec +++ b/specs/2007.1/ia64/livecd-stage2.spec @@ -9,33 +9,28 @@ source_subpath: default/livecd-stage1-ia64-installer-2007.1 livecd/fstype: squashfs livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/elilo-3.6-cdtar.tar.bz2 livecd/iso: /var/tmp/catalyst/builds/default/livecd-ia64-installer-2007.1.iso -#livecd/splash_type: gensplash -#livecd/splash_theme: livecd-2007.1 livecd/xdm: gdm livecd/xsession: xfce -livecd/fsscript: /root/livecd/scripts/2007.1/livecd.sh +livecd/fsscript: /var/cvsroot/gentoo/src/releng/scripts/2007.1/livecd.sh livecd/type: gentoo-release-livecd livecd/users: gentoo livecd/volid: Gentoo Linux 2007.1 IA64 LiveCD -livecd/overlay: /root/livecd/overlays/2007.1/common/overlay/livecd -livecd/root_overlay: /root/livecd/overlays/2007.1/common/root_overlay +livecd/overlay: /var/cvsroot/gentoo/src/releng/overlays/2007.1/common/overlay/livecd +livecd/root_overlay: /var/cvsroot/gentoo/src/releng/overlays/2007.1/common/root_overlay livecd/bootargs: dokeymap -livecd/gk_mainargs: --makeopts=-j16 --dmraid --evms -#--unionfs-dev +livecd/gk_mainargs: --dmraid --evms --lvm --mdadm boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: /root/livecd/kconfig/2007.1/ia64/livecd-2.6.18.config +boot/kernel/gentoo/config: /var/cvsroot/gentoo/src/releng/kconfig/2007.1/ia64/livecd-2.6.18.config boot/kernel/gentoo/use: pcmcia usb oss atm boot/kernel/gentoo/packages: -# media-gfx/splashutils -# media-gfx/splash-themes-livecd media-libs/alsa-lib media-libs/alsa-oss media-sound/alsa-utils diff --git a/specs/2007.1/ppc/ppc64/installcd-stage2-minimal.spec b/specs/2007.1/ppc/ppc64/installcd-stage2-minimal.spec index 879d6d1a..f3e2287c 100644 --- a/specs/2007.1/ppc/ppc64/installcd-stage2-minimal.spec +++ b/specs/2007.1/ppc/ppc64/installcd-stage2-minimal.spec @@ -6,24 +6,22 @@ version_stamp: minimal-2007.1 profile: default-linux/ppc/ppc64/2007.1/32bit-userland source_subpath: default/livecd-stage1-ppc64-32ul-2007.1/ - chost: powerpc-unknown-linux-gnu cflags: -O2 -pipe cxxflags: -O2 -pipe +# What are these here for? livecd/readme: /2007.1/overlay/README.txt livecd/overlay: /2007.1/minimal-overlay/ livecd/type: gentoo-release-minimal -livecd/gk_mainargs: --kernel-cross-compile=powerpc64-unknown-linux-gnu- --utils-arch=ppc --arch-override=ppc --makeopts=-j8 --lvm +livecd/gk_mainargs: --kernel-cross-compile=powerpc64-unknown-linux-gnu- --utils-arch=ppc --arch-override=ppc --makeopts=-j8 --lvm --evms --dmraid --mdadm livecd/fstype: squashfs livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 livecd/iso: /root/install-ppc64-minimal-2007.1.iso -livecd/devmanager: udev - boot/kernel: ibmpower G5 ## IBM hardware diff --git a/specs/2007.1/ppc/ppc64/installcd-stage2-universal.spec b/specs/2007.1/ppc/ppc64/installcd-stage2-universal.spec index 0f60c05a..ae6af8bb 100644 --- a/specs/2007.1/ppc/ppc64/installcd-stage2-universal.spec +++ b/specs/2007.1/ppc/ppc64/installcd-stage2-universal.spec @@ -6,7 +6,6 @@ version_stamp: 2007.1 profile: default-linux/ppc/ppc64/2007.1/32bit-userland source_subpath: default/livecd-stage1-ppc64-32ul-2007.1/ - chost: powerpc-unknown-linux-gnu cflags: -O2 -pipe cxxflags: -O2 -pipe @@ -14,17 +13,15 @@ cxxflags: -O2 -pipe livecd/readme: /2007.1/overlay/README.txt livecd/overlay: /2007.1/minimal-overlay/ -livecd/type: livecd/type: gentoo-release-universal +livecd/type: gentoo-release-universal livecd/overlay: /2007.1/overlay/ -livecd/gk_mainargs: --kernel-cross-compile=powerpc64-unknown-linux-gnu- --utils-arch=ppc --arch-override=ppc --makeopts=-j8 --lvm +livecd/gk_mainargs: --kernel-cross-compile=powerpc64-unknown-linux-gnu- --utils-arch=ppc --arch-override=ppc --makeopts=-j8 --lvm --evms --mdadm --dmraid livecd/fstype: squashfs livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 livecd/iso: /root/install-ppc64-universal-2007.1.iso -livecd/devmanager: udev - boot/kernel: ibmpower G5 ## IBM hardware diff --git a/specs/2007.1/ppc/ppc64/livecd-stage2.spec b/specs/2007.1/ppc/ppc64/livecd-stage2.spec index 44bbf775..ad7fc448 100644 --- a/specs/2007.1/ppc/ppc64/livecd-stage2.spec +++ b/specs/2007.1/ppc/ppc64/livecd-stage2.spec @@ -9,21 +9,19 @@ source_subpath: default/livecd-stage1-ppc64-installer-32ul-2007.1 livecd/fstype: squashfs livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 livecd/iso: /var/tmp/catalyst/builds/default/livecd-ppc64-installer-32ul-2007.1.iso -livecd/splash_type: gensplash -livecd/splash_theme: livecd-2007.1 livecd/xdm: gdm -livecd/xsession: gnome -livecd/fsscript: /root/livecd/scripts/2007.1/livecd.sh +livecd/xsession: xfce +livecd/fsscript: /var/cvsroot/gentoo/src/releng/scripts/2007.1/livecd.sh livecd/type: gentoo-release-livecd livecd/users: xfce livecd/volid: Gentoo Linux 2007.1 PPC LiveCD -livecd/overlay: /root/livecd/overlays/livecd/2007.1/common/overlay/livecd -livecd/root_overlay: /root/livecd/overlays/2007.1/common/root_overlay +livecd/overlay: /var/cvsroot/gentoo/src/releng/overlays/livecd/2007.1/common/overlay/livecd +livecd/root_overlay: /var/cvsroot/gentoo/src/releng/overlays/2007.1/common/root_overlay #livecd/bootargs: dokeymap -livecd/gk_mainargs: --kernel-cross-compile=powerpc64-unknown-linux-gnu- --utils-arch=ppc --arch-override=ppc --makeopts=-j8 --lvm --dmraid --evms --unionfs-dev +livecd/gk_mainargs: --kernel-cross-compile=powerpc64-unknown-linux-gnu- --utils-arch=ppc --arch-override=ppc --makeopts=-j8 --lvm --dmraid --evms --mdadm livecd/rcadd: pbbuttonsd|default @@ -31,18 +29,16 @@ boot/kernel: ibm ppc32 ppc64 pegasos boot/kernel/ibm/sources: sys-kernel/gentoo-sources boot/kernel/ibm/use: extlib usb oss atm truetype -qt -qt3 -qt4 -boot/kernel/ibm/config: /root/livecd/kconfig/releases/2007.1/ppc/ppc64/livecd-2.6.20-ibm.config +boot/kernel/ibm/config: /var/cvsroot/gentoo/src/releng/kconfig/releases/2007.1/ppc/ppc64/livecd-2.6.20-ibm.config boot/kernel/ibm/console: ttyS0,9600 hvc0 hvsi0 boot/kernel/ibm/machine_type: ibm boot/kernel/ibm/extraversion: ibm -boot/kernel/ppc32/config: /root/livecd/kconfig/releases/2007.1/ppc/ppc32/livecd-2.6.20-ppc32.config +boot/kernel/ppc32/config: /var/cvsroot/gentoo/src/releng/kconfig/releases/2007.1/ppc/ppc32/livecd-2.6.20-ppc32.config boot/kernel/ppc32/sources: gentoo-sources boot/kernel/ppc32/extraversion: ppc32 boot/kernel/ppc32/use: pcmcia usb oss atm truetype -qt -qt3 -qt4 boot/kernel/ppc32/packages: - media-gfx/splashutils - media-gfx/splash-themes-livecd sys-apps/pcmciautils # net-dialup/speedtouch # net-dialup/slmodem @@ -62,11 +58,11 @@ boot/kernel/ppc32/packages: boot/kernel/ppc64/sources: sys-kernel/gentoo-sources boot/kernel/ppc64/use: extlib usb oss atm truetype -qt -qt3 -qt4 -boot/kernel/ppc64/config: /root/livecd/kconfig/releases/2007.1/ppc/ppc64/livecd-2.6.20-ppc64.config +boot/kernel/ppc64/config: /var/cvsroot/gentoo/src/releng/kconfig/releases/2007.1/ppc/ppc64/livecd-2.6.20-ppc64.config boot/kernel/ppc64/console: ttyS0,57600 boot/kernel/ppc64/extraversion: ppc64 -boot/kernel/pegasos/config: /root/livecd/kconfig/releases/2007.1/ppc/ppc32/installcd-2.6.20-pegasos.config +boot/kernel/pegasos/config: /var/cvsroot/gentoo/src/releng/kconfig/releases/2007.1/ppc/ppc32/installcd-2.6.20-pegasos.config boot/kernel/pegasos/sources: sys-kernel/gentoo-sources boot/kernel/pegasos/use: usb -X png truetype boot/kernel/pegasos/extraversion: pegasos diff --git a/specs/2007.1/x86/hardened/installcd-stage2-minimal.spec b/specs/2007.1/x86/hardened/installcd-stage2-minimal.spec index 6ee18a9f..d0e00498 100644 --- a/specs/2007.1/x86/hardened/installcd-stage2-minimal.spec +++ b/specs/2007.1/x86/hardened/installcd-stage2-minimal.spec @@ -10,25 +10,21 @@ livecd/fstype: squashfs livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/iso: /var/tmp/catalyst/builds/default/install-x86-minimal-2007.1.iso -livecd/splash_type: gensplash -livecd/splash_theme: livecd-2007.1 livecd/volid: Gentoo Linux x86 2007.1 livecd/type: gentoo-release-minimal livecd/bootargs: dokeymap -livecd/gk_mainargs: --lvm --dmraid --evms +livecd/gk_mainargs: --lvm --dmraid --evms --mdadm boot/kernel: gentoo boot/kernel/gentoo/sources: hardened-sources -boot/kernel/gentoo/config: /cvs/releng/kconfig/2007.1/x86/hardened/installcd-2.6.20.config +boot/kernel/gentoo/config: /var/cvsroot/gentoo/src/releng/kconfig/2007.1/x86/hardened/installcd-2.6.20.config boot/kernel/gentoo/use: pcmcia usb -X png truetype -qt -qt3 -qt4 boot/kernel/gentoo/packages: - media-gfx/splashutils - media-gfx/splash-themes-livecd sys-apps/pcmciautils net-dialup/slmodem net-dialup/globespan-adsl diff --git a/specs/2007.1/x86/i686/livecd-stage2.spec b/specs/2007.1/x86/i686/livecd-stage2.spec index 733caff7..99c8ebc6 100644 --- a/specs/2007.1/x86/i686/livecd-stage2.spec +++ b/specs/2007.1/x86/i686/livecd-stage2.spec @@ -9,32 +9,28 @@ source_subpath: default/livecd-stage1-i686-installer-2007.1 livecd/fstype: squashfs livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/iso: /var/tmp/catalyst/builds/default/livecd-i686-installer-2007.1.iso -livecd/splash_type: gensplash -livecd/splash_theme: livecd-2007.1 livecd/xdm: gdm livecd/xsession: xfce -livecd/fsscript: /root/livecd/scripts/2007.1/livecd.sh +livecd/fsscript: /var/cvsroot/gentoo/src/releng/scripts/2007.1/livecd.sh livecd/type: gentoo-release-livecd livecd/users: gentoo livecd/volid: Gentoo Linux 2007.1 x86 LiveCD -livecd/overlay: /root/livecd/overlays/2007.1/common/overlay/livecd -livecd/root_overlay: /root/livecd/overlays/2007.1/common/root_overlay +livecd/overlay: /var/cvsroot/gentoo/src/releng/overlays/2007.1/common/overlay/livecd +livecd/root_overlay: /var/cvsroot/gentoo/src/releng/overlays/2007.1/common/root_overlay livecd/bootargs: dokeymap -livecd/gk_mainargs: --lvm --dmraid --evms +livecd/gk_mainargs: --lvm --dmraid --evms --mdadm boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: /root/livecd/kconfig/2007.1/x86/livecd-2.6.19.config +boot/kernel/gentoo/config: /var/cvsroot/gentoo/src/releng/kconfig/2007.1/x86/livecd-2.6.19.config boot/kernel/gentoo/use: pcmcia usb oss atm boot/kernel/gentoo/packages: - media-gfx/splashutils - media-gfx/splash-themes-livecd media-libs/alsa-lib media-sound/alsa-utils # net-dialup/fcdsl diff --git a/specs/2007.1/x86/i686/livedvd-stage2.spec b/specs/2007.1/x86/i686/livedvd-stage2.spec index 72b9bac7..687f0e5c 100644 --- a/specs/2007.1/x86/i686/livedvd-stage2.spec +++ b/specs/2007.1/x86/i686/livedvd-stage2.spec @@ -9,35 +9,29 @@ source_subpath: default/livecd-stage1-i686-installer-2007.1 livecd/fstype: squashfs livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/iso: /var/tmp/catalyst/builds/default/livedvd-i686-installer-2007.1.iso -livecd/splash_type: gensplash -livecd/splash_theme: livecd-2007.1 livecd/xdm: gdm -livecd/xsession: gnome -livecd/fsscript: /root/livecd/scripts/2007.1/livecd.sh +livecd/xsession: xfce +livecd/fsscript: /var/cvsroot/gentoo/src/releng/scripts/2007.1/livecd.sh livecd/type: gentoo-release-livecd livecd/users: gentoo livecd/volid: Gentoo Linux 2007.1 x86 LiveDVD -livecd/overlay: - /root/livecd/overlays/2007.1/common/overlay/livedvd - /root/livecd/overlays/2007.1/x86/overlay/livedvd -livecd/root_overlay: /root/livecd/overlays/2007.1/common/root_overlay +livecd/overlay: /var/cvsroot/gentoo/src/releng/overlays/2007.1/common/overlay/livedvd +livecd/root_overlay: /var/cvsroot/gentoo/src/releng/overlays/2007.1/common/root_overlay livecd/bootargs: dokeymap -livecd/gk_mainargs: --makeopts=-j16 --lvm --dmraid --evms --unionfs-dev +livecd/gk_mainargs: --lvm --dmraid --evms --mdadm boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: /root/livecd/kconfig/2007.1/x86/livecd-2.6.19.config +boot/kernel/gentoo/config: /var/cvsroot/gentoo/src/releng/kconfig/2007.1/x86/livecd-2.6.19.config boot/kernel/gentoo/use: pcmcia usb oss atm boot/kernel/gentoo/packages: app-laptop/laptop-mode-tools - media-gfx/splashutils - media-gfx/splash-themes-livecd media-libs/alsa-lib media-sound/alsa-utils # net-dialup/fcdsl diff --git a/specs/2007.1/x86/installcd-stage2-minimal.spec b/specs/2007.1/x86/installcd-stage2-minimal.spec index 9357aaa0..88757ce5 100644 --- a/specs/2007.1/x86/installcd-stage2-minimal.spec +++ b/specs/2007.1/x86/installcd-stage2-minimal.spec @@ -10,14 +10,12 @@ livecd/fstype: squashfs livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/iso: /var/tmp/catalyst/builds/default/install-x86-minimal-2007.1.iso -livecd/splash_type: gensplash -livecd/splash_theme: livecd-2007.1 livecd/volid: Gentoo Linux x86 2007.1 livecd/type: gentoo-release-minimal livecd/bootargs: dokeymap -livecd/gk_mainargs: --lvm --dmraid --evms +livecd/gk_mainargs: --lvm --dmraid --evms --mdadm boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources @@ -27,8 +25,6 @@ boot/kernel/gentoo/config: /root/livecd/kconfig/2007.1/x86/installcd-2.6.19.conf boot/kernel/gentoo/use: pcmcia usb -X png truetype -qt -qt3 -qt4 boot/kernel/gentoo/packages: - media-gfx/splashutils - media-gfx/splash-themes-livecd sys-apps/pcmciautils net-dialup/slmodem net-dialup/globespan-adsl