Removed some packages which triggered X, choose correct livecd kernels.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@279 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/examples/livecd/ppc/ppc-kdegnome-stage1-20040225.spec b/examples/livecd/ppc/ppc-kdegnome-stage1-20040225.spec
index b37f280fe70ae1177d903a91765d8acfc87e8c75..55b72ced2ba103a116a948936bbecff76d58c596 100644 (file)
--- a/examples/livecd/ppc/ppc-kdegnome-stage1-20040225.spec
+++ b/examples/livecd/ppc/ppc-kdegnome-stage1-20040225.spec
@@ -165,12 +165,10 @@ livecd/packages:
        popt
        powerprefs
        ppc-development-sources
-       ppc-sources
        ppp
        pppconfig
        pppoed
        pwgen
-       quik
        raidtools
        rdate
        reiserfsprogs
@@ -203,6 +201,5 @@ livecd/packages:
        xemacs
        xfce4
        xfree
-       xfsprogs
        xmms
        yaboot

diff --git a/examples/livecd/ppc/ppc-kdegnome-stage2-20040225.spec b/examples/livecd/ppc/ppc-kdegnome-stage2-20040225.spec
index 70c08599df84acd68f347a63c4f0339c18879da0..3c8ac49cb85cea826a57e925ace5652ddf2139c5 100644 (file)
--- a/examples/livecd/ppc/ppc-kdegnome-stage2-20040225.spec
+++ b/examples/livecd/ppc/ppc-kdegnome-stage2-20040225.spec
@@ -13,38 +13,38 @@ livecd/runscript: examples/livecd/runscript/default-runscript.sh
 livecd/cdtar: examples/livecd/cdtar/yaboot-1.3.11-cdtar.tar.bz2
 
 boot/kernel: G3 G4 G5 G3-SMP G4-SMP G5-SMP
-boot/kernel/G3/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
+boot/kernel/G3/sources: =sys-kernel/ppc-development-sources-2.6.3-r2
 boot/kernel/G3/config: /usr/src/configs/G3
 boot/kernel/G3/use: extlib
 boot/kernel/G3/packages: >=sys-apps/pcmcia-cs-3.2.7
 boot/kernel/G3/extraversion: G3
-boot/kernel/G4/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
+boot/kernel/G4/sources: =sys-kernel/ppc-development-sources-2.6.3-r2
 boot/kernel/G4/config: /usr/src/configs/G4
 boot/kernel/G4/use: extlib
 boot/kernel/G4/packages: >=sys-apps/pcmcia-cs-3.2.7
 boot/kernel/G4/extraversion: G4
-boot/kernel/G5/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
+boot/kernel/G5/sources: =sys-kernel/ppc-development-sources-2.6.3-r2
 boot/kernel/G5/config: /usr/src/configs/G5
 boot/kernel/G5/use: extlib
 boot/kernel/G5/extraversion: G5
-boot/kernel/G3-SMP/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
+boot/kernel/G3-SMP/sources: =sys-kernel/ppc-development-sources-2.6.3-r2
 boot/kernel/G3-SMP/config: /usr/src/configs/G3-SMP
 boot/kernel/G3-SMP/use: extlib
 boot/kernel/G3-SMP/packages: >=sys-apps/pcmcia-cs-3.2.7
 boot/kernel/G3-SMP/extraversion: G3-SMP
-boot/kernel/G4-SMP/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
+boot/kernel/G4-SMP/sources: =sys-kernel/ppc-development-sources-2.6.3-r2
 boot/kernel/G4-SMP/config: /usr/src/configs/G4-SMP
 boot/kernel/G4-SMP/use: extlib
 boot/kernel/G4-SMP/packages: >=sys-apps/pcmcia-cs-3.2.7
 boot/kernel/G4-SMP/extraversion: G4-SMP
-boot/kernel/G5-SMP/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
+boot/kernel/G5-SMP/sources: =sys-kernel/ppc-development-sources-2.6.3-r2
 boot/kernel/G5-SMP/use: extlib
 boot/kernel/G5-SMP/config: /usr/src/configs/G5-SMP
 boot/kernel/G5-SMP/extraversion: G5-SMP
 
 livecd/unmerge:
-       autoconf automake binutils libtool m4 bison ld.so make perl patch linux-headers man-pages
-       sash bison flex gettext texinfo ccache addpatches man groff lib-compat gcc python miscfiles
+       autoconf automake binutils libtool m4 bison make perl patch linux-headers man-pages
+       sash bison flex gettext sys-apps/texinfo ccache addpatches man groff lib-compat gcc python miscfiles
        
 livecd/empty:
        /var/tmp

diff --git a/examples/livecd/ppc/ppc-livecd-stage1-20040225.spec b/examples/livecd/ppc/ppc-livecd-stage1-20040225.spec
index adeda454ff00f08d31a9fa4490e2ac2514e47dfb..dd95839737b1dddaab2ab3614593601cf8bbbfef 100644 (file)
--- a/examples/livecd/ppc/ppc-livecd-stage1-20040225.spec
+++ b/examples/livecd/ppc/ppc-livecd-stage1-20040225.spec
@@ -8,15 +8,13 @@ version_stamp: 20040225
 source_subpath: default-ppc-2004.0/stage3-ppc-20040225
 
 livecd/use:
-       -X
-       -gtk
+       -*
        ipv6
        pic
        livecd
 
 livecd/packages:
        baselayout
-       bootsplash
        ccache
        curl
        cvs
@@ -32,7 +30,6 @@ livecd/packages:
        hotplug
        iputils
        irssi
-       jfsutils
        keychain
        kpnadsl4linux
        less
@@ -54,6 +51,7 @@ livecd/packages:
        ppp
        pppconfig
        pppoed
+       ppc-development-sources
        pwgen
        raidtools
        reiserfsprogs
@@ -69,5 +67,4 @@ livecd/packages:
        vixie-cron
        wget
        wireless-tools
-       xfsprogs
        yaboot

diff --git a/examples/livecd/ppc/ppc-livecd-stage2-20040225.spec b/examples/livecd/ppc/ppc-livecd-stage2-20040225.spec
index 7c85b5de407a63444bdbbffe42f217881ec95df8..31c24f9b479e42984c9fd51bf9268bca7bf1ef7a 100644 (file)
--- a/examples/livecd/ppc/ppc-livecd-stage2-20040225.spec
+++ b/examples/livecd/ppc/ppc-livecd-stage2-20040225.spec
@@ -13,39 +13,39 @@ livecd/runscript: examples/livecd/runscript/default-runscript.sh
 livecd/cdtar: examples/livecd/cdtar/yaboot-1.3.11-cdtar.tar.bz2
 
 boot/kernel: G3 G4 G5 G3-SMP G4-SMP G5-SMP
-boot/kernel/G3/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
+boot/kernel/G3/sources: =sys-kernel/ppc-development-sources-2.6.3-r2
 boot/kernel/G3/config: /usr/src/configs/G3
 boot/kernel/G3/use: extlib
 boot/kernel/G3/packages: >=sys-apps/pcmcia-cs-3.2.7
 boot/kernel/G3/extraversion: G3
-boot/kernel/G4/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
+boot/kernel/G4/sources: =sys-kernel/ppc-development-sources-2.6.3-r2
 boot/kernel/G4/config: /usr/src/configs/G4
 boot/kernel/G4/use: extlib
 boot/kernel/G4/packages: >=sys-apps/pcmcia-cs-3.2.7
 boot/kernel/G4/extraversion: G4
-boot/kernel/G5/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
+boot/kernel/G5/sources: =sys-kernel/ppc-development-sources-2.6.3-r2
 boot/kernel/G5/config: /usr/src/configs/G5
 boot/kernel/G5/use: extlib
 boot/kernel/G5/extraversion: G5
-boot/kernel/G3-SMP/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
+boot/kernel/G3-SMP/sources: =sys-kernel/ppc-development-sources-2.6.3-r2
 boot/kernel/G3-SMP/config: /usr/src/configs/G3-SMP
 boot/kernel/G3-SMP/use: extlib
 boot/kernel/G3-SMP/packages: >=sys-apps/pcmcia-cs-3.2.7
 boot/kernel/G3-SMP/extraversion: G3-SMP
-boot/kernel/G4-SMP/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
+boot/kernel/G4-SMP/sources: =sys-kernel/ppc-development-sources-2.6.3-r2
 boot/kernel/G4-SMP/config: /usr/src/configs/G4-SMP
 boot/kernel/G4-SMP/use: extlib
 boot/kernel/G4-SMP/packages: >=sys-apps/pcmcia-cs-3.2.7
 boot/kernel/G4-SMP/extraversion: G4-SMP
-boot/kernel/G5-SMP/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
+boot/kernel/G5-SMP/sources: =sys-kernel/ppc-development-sources-2.6.3-r2
 boot/kernel/G5-SMP/use: extlib
 boot/kernel/G5-SMP/config: /usr/src/configs/G5-SMP
 boot/kernel/G5-SMP/extraversion: G5-SMP
 
 livecd/unmerge:
-       autoconf automake binutils libtool m4 bison ld.so make perl patch linux-headers man-pages
-       sash bison flex gettext texinfo ccache addpatches man groff lib-compat gcc python miscfiles
-       
+       autoconf automake binutils libtool m4 bison  make perl patch linux-headers man-pages
+       sash bison flex gettext sys-apps/texinfo ccache addpatches man groff lib-compat gcc python miscfiles xfree
+
 livecd/empty:
        /var/tmp
        /var/cache