From 54feb2e6447a0447e550d7a9493a6d27f1e1a8b1 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 13 Mar 2007 01:55:04 +0000 Subject: [PATCH] Fixing kernel config location and cleaning up the package list on the LiveDVD spec. svn path=/trunk/; revision=284 --- specs/2007.0/ChangeLog | 7 ++++- specs/2007.0/amd64/livecd-stage2-gnome.spec | 4 +-- specs/2007.0/amd64/livedvd-stage2-large.spec | 28 +++++++++++--------- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/specs/2007.0/ChangeLog b/specs/2007.0/ChangeLog index ace2dec6..d7d6131c 100644 --- a/specs/2007.0/ChangeLog +++ b/specs/2007.0/ChangeLog @@ -1,5 +1,10 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.0/ChangeLog,v 1.45 2007-03-13 00:59:58 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.0/ChangeLog,v 1.46 2007-03-13 01:55:04 wolf31o2 Exp $ + + 13 Mar 2007; Chris Gianelloni + amd64/livecd-stage2-gnome.spec, amd64/livedvd-stage2-large.spec: + Fixing kernel config location and cleaning up the package list on the + LiveDVD spec. 13 Mar 2007; Chris Gianelloni ppc/ppc32/g4/packages.spec, ppc/ppc32/packages.spec: diff --git a/specs/2007.0/amd64/livecd-stage2-gnome.spec b/specs/2007.0/amd64/livecd-stage2-gnome.spec index 47b94ab4..622e739a 100644 --- a/specs/2007.0/amd64/livecd-stage2-gnome.spec +++ b/specs/2007.0/amd64/livecd-stage2-gnome.spec @@ -19,7 +19,7 @@ livecd/type: gentoo-release-livecd livecd/users: gentoo livecd/volid: Gentoo Linux 2007.0 amd64 LiveCD -livecd/overlay: /root/livecd/overlays/livecd/2007.0 +livecd/overlay: /root/livecd/overlays/2007.0/common/overlay/livecd livecd/root_overlay: /root/livecd/overlays/root-livecd livecd/bootargs: dokeymap @@ -28,7 +28,7 @@ livecd/gk_mainargs: --makeopts=-j16 --lvm2 --dmraid --evms2 --unionfs-dev boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: /root/livecd/kconfig/releases/2007.0/amd64/livecd-2.6.19.config +boot/kernel/gentoo/config: /root/livecd/kconfig/2007.0/amd64/livecd-2.6.19.config boot/kernel/gentoo/use: pcmcia usb oss atm diff --git a/specs/2007.0/amd64/livedvd-stage2-large.spec b/specs/2007.0/amd64/livedvd-stage2-large.spec index 7022b6e6..df45cb2b 100644 --- a/specs/2007.0/amd64/livedvd-stage2-large.spec +++ b/specs/2007.0/amd64/livedvd-stage2-large.spec @@ -19,35 +19,37 @@ livecd/type: gentoo-release-livecd livecd/users: gentoo livecd/volid: Gentoo Linux AMD64 LiveDVD -livecd/overlay: /root/livecd/overlays/livecd/amd64-2007.0 +livecd/overlay: /root/livecd/overlays/2007.0/common/overlay/livecd livecd/root_overlay: /root/livecd/overlays/root-livecd livecd/bootargs: dokeymap -livecd/gk_mainargs: --makeopts=-j16 --lvm2 --dmraid --evms2 -#--unionfs-dev - -#livecd/rcadd: x-setup|default spind|default xdm|default famd|default +livecd/gk_mainargs: --makeopts=-j16 --lvm2 --dmraid --evms2 --unionfs-dev boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: /root/livecd/kconfig/releases/2007.0/amd64/livecd-2.6.17.config +boot/kernel/gentoo/config: /root/livecd/kconfig/2007.0/amd64/livecd-2.6.19.config boot/kernel/gentoo/use: pcmcia usb oss atm truetype png boot/kernel/gentoo/packages: media-gfx/splashutils media-gfx/splash-themes-livecd - sys-apps/pcmciautils - sys-power/acpid - sys-fs/cryptsetup-luks - net-wireless/rt2500 media-libs/alsa-lib media-libs/alsa-oss media-sound/alsa-utils - -livecd/unmerge: - sys-kernel/gentoo-sources +# net-dialup/fcdsl +# net-dialup/fritzcapi +# net-dialup/globespan-adsl +# net-dialup/slmodem +# net-wireless/acx + net-wireless/hostap-utils + net-wireless/ipw3945 + net-wireless/madwifi-ng-tools + net-wireless/rt2500 +# net-wireless/rtl8187 + sys-apps/pcmciautils + sys-fs/cryptsetup-luks livecd/empty: /var/tmp