diff --git a/specs/2007.0/ChangeLog b/specs/2007.0/ChangeLog index 5bc022f9..af26c4df 100644 --- a/specs/2007.0/ChangeLog +++ b/specs/2007.0/ChangeLog @@ -1,5 +1,11 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.0/ChangeLog,v 1.68 2007-04-07 11:50:29 phreak Exp $ +# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.0/ChangeLog,v 1.69 2007-04-13 14:19:21 wolf31o2 Exp $ + + 13 Apr 2007; Chris Gianelloni + alpha/livecd-stage2-gnome.spec, amd64/livecd-stage2-gnome.spec, + amd64/livedvd-stage2-large.spec, ppc/ppc32/livecd-stage2-gnome.spec, + x86/i686/livecd-stage2-gnome.spec, x86/i686/livedvd-stage2-large.spec: + Fixing up the overlays so they are correct for the given architecture. 07 Apr 2007; Christian Heim x86/hardened/stage1-2.6.spec, x86/hardened/stage2-2.6.spec: diff --git a/specs/2007.0/alpha/livecd-stage2-gnome.spec b/specs/2007.0/alpha/livecd-stage2-gnome.spec index 8fdca27f..1b182fca 100644 --- a/specs/2007.0/alpha/livecd-stage2-gnome.spec +++ b/specs/2007.0/alpha/livecd-stage2-gnome.spec @@ -20,8 +20,8 @@ livecd/volid: Gentoo Linux alpha LiveCD 2007.0 livecd/users: gentoo livecd/type: gentoo-release-livecd -livecd/overlay: /root/livecd/overlays/livecd/2007.0 -livecd/root_overlay: /root/livecd/overlays/root-livecd +livecd/overlay: /root/livecd/overlays/livecd/2007.0/common/overlay/livecd +livecd/root_overlay: /root/livecd/overlays/2007.0/common/root_overlay livecd/bootargs: dokeymap livecd/gk_mainargs: --lvm2 --dmraid --evms2 diff --git a/specs/2007.0/amd64/livecd-stage2-gnome.spec b/specs/2007.0/amd64/livecd-stage2-gnome.spec index 622e739a..6d4db5df 100644 --- a/specs/2007.0/amd64/livecd-stage2-gnome.spec +++ b/specs/2007.0/amd64/livecd-stage2-gnome.spec @@ -20,7 +20,7 @@ livecd/users: gentoo livecd/volid: Gentoo Linux 2007.0 amd64 LiveCD livecd/overlay: /root/livecd/overlays/2007.0/common/overlay/livecd -livecd/root_overlay: /root/livecd/overlays/root-livecd +livecd/root_overlay: /root/livecd/overlays/2007.0/common/root_overlay livecd/bootargs: dokeymap livecd/gk_mainargs: --makeopts=-j16 --lvm2 --dmraid --evms2 --unionfs-dev diff --git a/specs/2007.0/amd64/livedvd-stage2-large.spec b/specs/2007.0/amd64/livedvd-stage2-large.spec index df45cb2b..dfe445eb 100644 --- a/specs/2007.0/amd64/livedvd-stage2-large.spec +++ b/specs/2007.0/amd64/livedvd-stage2-large.spec @@ -19,7 +19,9 @@ livecd/type: gentoo-release-livecd livecd/users: gentoo livecd/volid: Gentoo Linux AMD64 LiveDVD -livecd/overlay: /root/livecd/overlays/2007.0/common/overlay/livecd +livecd/overlay: + /root/livecd/overlays/2007.0/common/overlay/livedvd + /root/livecd/overlays/2007.0/amd64/overlay/livedvd livecd/root_overlay: /root/livecd/overlays/root-livecd livecd/bootargs: dokeymap diff --git a/specs/2007.0/ppc/ppc32/livecd-stage2-gnome.spec b/specs/2007.0/ppc/ppc32/livecd-stage2-gnome.spec index 65f09dd4..8fe7eab1 100644 --- a/specs/2007.0/ppc/ppc32/livecd-stage2-gnome.spec +++ b/specs/2007.0/ppc/ppc32/livecd-stage2-gnome.spec @@ -9,8 +9,8 @@ source_subpath: default/livecd-stage1-ppc-installer-2007.0 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-ppc-installer-2007.0.iso -#livecd/splash_type: gensplash -#livecd/splash_theme: livecd-2007.0 +livecd/splash_type: gensplash +livecd/splash_theme: livecd-2007.0 livecd/xdm: gdm livecd/xsession: gnome livecd/fsscript: /root/livecd/scripts/2007.0/livecd.sh @@ -19,12 +19,11 @@ livecd/type: gentoo-release-livecd livecd/users: gentoo livecd/volid: Gentoo Linux 2007.0 PPC LiveCD -livecd/overlay: /root/livecd/overlays/livecd/2007.0 -livecd/root_overlay: /root/livecd/overlays/root-livecd +livecd/overlay: /root/livecd/overlays/livecd/2007.0/common/overlay/livecd +livecd/root_overlay: /root/livecd/overlays/2007.0/common/root_overlay #livecd/bootargs: dokeymap -livecd/gk_mainargs: --makeopts=-j4 --lvm2 --dmraid --evms2 -#--unionfs-dev +livecd/gk_mainargs: --makeopts=-j4 --lvm2 --dmraid --evms2 --unionfs-dev livecd/rcadd: pbbuttonsd|default @@ -34,8 +33,8 @@ 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 + media-gfx/splashutils + media-gfx/splash-themes-livecd sys-apps/pcmciautils # net-dialup/speedtouch # net-dialup/slmodem diff --git a/specs/2007.0/x86/i686/livecd-stage2-gnome.spec b/specs/2007.0/x86/i686/livecd-stage2-gnome.spec index 15d53b71..bb5fedc1 100644 --- a/specs/2007.0/x86/i686/livecd-stage2-gnome.spec +++ b/specs/2007.0/x86/i686/livecd-stage2-gnome.spec @@ -20,7 +20,7 @@ livecd/users: gentoo livecd/volid: Gentoo Linux 2007.0 x86 LiveCD livecd/overlay: /root/livecd/overlays/2007.0/common/overlay/livecd -livecd/root_overlay: /root/livecd/overlays/root-livecd +livecd/root_overlay: /root/livecd/overlays/2007.0/common/root_overlay livecd/bootargs: dokeymap livecd/gk_mainargs: --lvm2 --dmraid --evms2 --unionfs-dev diff --git a/specs/2007.0/x86/i686/livedvd-stage2-large.spec b/specs/2007.0/x86/i686/livedvd-stage2-large.spec index 2f1b7027..8383177b 100644 --- a/specs/2007.0/x86/i686/livedvd-stage2-large.spec +++ b/specs/2007.0/x86/i686/livedvd-stage2-large.spec @@ -19,8 +19,10 @@ livecd/type: gentoo-release-livecd livecd/users: gentoo livecd/volid: Gentoo Linux 2007.0 x86 LiveDVD -livecd/overlay: /root/livecd/overlays/2007.0/common/overlay/livecd -livecd/root_overlay: /root/livecd/overlays/root-livecd +livecd/overlay: + /root/livecd/overlays/2007.0/common/overlay/livedvd + /root/livecd/overlays/2007.0/x86/overlay/livedvd +livecd/root_overlay: /root/livecd/overlays/2007.0/common/root_overlay livecd/bootargs: dokeymap livecd/gk_mainargs: --makeopts=-j16 --lvm2 --dmraid --evms2 --unionfs-dev