From 72320ed245ac80486a1c5d1be9cb98690f92e0d0 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 12 Oct 2007 18:51:41 +0000 Subject: [PATCH] Change all instances of --lvm2 to --lvm and all instances of --evms2 to --evms. svn path=/trunk/; revision=348 --- specs/2007.1/ChangeLog | 13 ++++++++++++- specs/2007.1/alpha/installcd-stage2-minimal.spec | 2 +- specs/2007.1/alpha/installcd-stage2-universal.spec | 2 +- specs/2007.1/alpha/livecd-stage2.spec | 2 +- specs/2007.1/amd64/installcd-stage2-minimal.spec | 4 ++-- specs/2007.1/amd64/livecd-stage2.spec | 2 +- specs/2007.1/amd64/livedvd-stage2.spec | 2 +- specs/2007.1/ia64/installcd-stage2-minimal.spec | 2 +- specs/2007.1/ia64/livecd-stage2.spec | 2 +- .../2007.1/ppc/ppc64/installcd-stage2-minimal.spec | 2 +- .../ppc/ppc64/installcd-stage2-universal.spec | 2 +- specs/2007.1/ppc/ppc64/livecd-stage2.spec | 2 +- specs/2007.1/x86/i686/livecd-stage2-gnome.spec | 2 +- specs/2007.1/x86/i686/livedvd-stage2-large.spec | 2 +- specs/2007.1/x86/installcd-stage2-minimal.spec | 2 +- 15 files changed, 27 insertions(+), 16 deletions(-) diff --git a/specs/2007.1/ChangeLog b/specs/2007.1/ChangeLog index 8c08dbf4..59bd5c33 100644 --- a/specs/2007.1/ChangeLog +++ b/specs/2007.1/ChangeLog @@ -1,5 +1,16 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.1/ChangeLog,v 1.3 2007-10-12 17:42:43 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.1/ChangeLog,v 1.4 2007-10-12 18:51:37 wolf31o2 Exp $ + + 12 Oct 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, 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/i686/livecd-stage2-gnome.spec, x86/i686/livedvd-stage2-large.spec, + x86/installcd-stage2-minimal.spec: + Change all instances of --lvm2 to --lvm and all instances of --evms2 to --evms. 12 Oct 2007; Chris Gianelloni alpha/installcd-stage1.spec, alpha/livecd-stage1.spec, diff --git a/specs/2007.1/alpha/installcd-stage2-minimal.spec b/specs/2007.1/alpha/installcd-stage2-minimal.spec index 2bf2ceb4..b23f4913 100644 --- a/specs/2007.1/alpha/installcd-stage2-minimal.spec +++ b/specs/2007.1/alpha/installcd-stage2-minimal.spec @@ -17,7 +17,7 @@ livecd/type: gentoo-release-minimal #livecd/overlay: /root/livecd/overlays/alpha-minimal livecd/bootargs: dokeymap -livecd/gk_mainargs: --lvm2 --dmraid --evms2 +livecd/gk_mainargs: --lvm --dmraid --emvs 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 b46117c4..8dcde649 100644 --- a/specs/2007.1/alpha/installcd-stage2-universal.spec +++ b/specs/2007.1/alpha/installcd-stage2-universal.spec @@ -17,7 +17,7 @@ livecd/type: gentoo-release-universal livecd/overlay: /root/livecd/overlays/alpha-universal livecd/bootargs: dokeymap -livecd/gk_mainargs: --lvm2 --dmraid --evms2 +livecd/gk_mainargs: --lvm --dmraid --emvs 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 bb519c63..964b6602 100644 --- a/specs/2007.1/alpha/livecd-stage2.spec +++ b/specs/2007.1/alpha/livecd-stage2.spec @@ -24,7 +24,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: --lvm2 --dmraid --evms2 +livecd/gk_mainargs: --lvm --dmraid --emvs 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 aad5a29a..4c70cd7b 100644 --- a/specs/2007.1/amd64/installcd-stage2-minimal.spec +++ b/specs/2007.1/amd64/installcd-stage2-minimal.spec @@ -19,12 +19,12 @@ livecd/type: gentoo-release-minimal #livecd/overlay: /root/livecd/overlays/amd64-minimal livecd/bootargs: dokeymap -livecd/gk_mainargs: --makeopts=-j16 --lvm2 --dmraid --evms2 +livecd/gk_mainargs: --makeopts=-j16 --lvm --dmraid --emvs boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: /root/livecd/kconfig/2007.1/amd64/installcd-2.6.19.config +boot/kernel/gentoo/config: /root/livecd/kconfig/2007.1/amd64/installcd-2.6.20.config boot/kernel/gentoo/use: pcmcia usb -X png truetype -qt diff --git a/specs/2007.1/amd64/livecd-stage2.spec b/specs/2007.1/amd64/livecd-stage2.spec index d721ba86..46489fde 100644 --- a/specs/2007.1/amd64/livecd-stage2.spec +++ b/specs/2007.1/amd64/livecd-stage2.spec @@ -23,7 +23,7 @@ livecd/overlay: /root/livecd/overlays/2007.1/common/overlay/livecd livecd/root_overlay: /root/livecd/overlays/2007.1/common/root_overlay livecd/bootargs: dokeymap -livecd/gk_mainargs: --makeopts=-j16 --lvm2 --dmraid --evms2 --unionfs-dev +livecd/gk_mainargs: --makeopts=-j16 --lvm --dmraid --emvs --unionfs-dev boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources diff --git a/specs/2007.1/amd64/livedvd-stage2.spec b/specs/2007.1/amd64/livedvd-stage2.spec index 6939ad70..5ba64a7e 100644 --- a/specs/2007.1/amd64/livedvd-stage2.spec +++ b/specs/2007.1/amd64/livedvd-stage2.spec @@ -25,7 +25,7 @@ livecd/overlay: livecd/root_overlay: /root/livecd/overlays/root-livecd livecd/bootargs: dokeymap -livecd/gk_mainargs: --makeopts=-j16 --lvm2 --dmraid --evms2 --unionfs-dev +livecd/gk_mainargs: --makeopts=-j16 --lvm --dmraid --emvs --unionfs-dev boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources diff --git a/specs/2007.1/ia64/installcd-stage2-minimal.spec b/specs/2007.1/ia64/installcd-stage2-minimal.spec index 67b12ec8..f0378106 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 --evms2 --dmraid +livecd/gk_mainargs: --makeopts=-j16 --emvs --dmraid 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 6ce6496d..65f288c6 100644 --- a/specs/2007.1/ia64/livecd-stage2.spec +++ b/specs/2007.1/ia64/livecd-stage2.spec @@ -23,7 +23,7 @@ livecd/overlay: /root/livecd/overlays/2007.1/common/overlay/livecd livecd/root_overlay: /root/livecd/overlays/2007.1/common/root_overlay livecd/bootargs: dokeymap -livecd/gk_mainargs: --makeopts=-j16 --dmraid --evms2 +livecd/gk_mainargs: --makeopts=-j16 --dmraid --emvs #--unionfs-dev boot/kernel: gentoo diff --git a/specs/2007.1/ppc/ppc64/installcd-stage2-minimal.spec b/specs/2007.1/ppc/ppc64/installcd-stage2-minimal.spec index 2255a9b8..879d6d1a 100644 --- a/specs/2007.1/ppc/ppc64/installcd-stage2-minimal.spec +++ b/specs/2007.1/ppc/ppc64/installcd-stage2-minimal.spec @@ -16,7 +16,7 @@ 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 --lvm2 +livecd/gk_mainargs: --kernel-cross-compile=powerpc64-unknown-linux-gnu- --utils-arch=ppc --arch-override=ppc --makeopts=-j8 --lvm livecd/fstype: squashfs livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 diff --git a/specs/2007.1/ppc/ppc64/installcd-stage2-universal.spec b/specs/2007.1/ppc/ppc64/installcd-stage2-universal.spec index ff2173b8..0f60c05a 100644 --- a/specs/2007.1/ppc/ppc64/installcd-stage2-universal.spec +++ b/specs/2007.1/ppc/ppc64/installcd-stage2-universal.spec @@ -17,7 +17,7 @@ livecd/overlay: /2007.1/minimal-overlay/ livecd/type: 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 --lvm2 +livecd/gk_mainargs: --kernel-cross-compile=powerpc64-unknown-linux-gnu- --utils-arch=ppc --arch-override=ppc --makeopts=-j8 --lvm livecd/fstype: squashfs livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 diff --git a/specs/2007.1/ppc/ppc64/livecd-stage2.spec b/specs/2007.1/ppc/ppc64/livecd-stage2.spec index 79c0982d..6037da3d 100644 --- a/specs/2007.1/ppc/ppc64/livecd-stage2.spec +++ b/specs/2007.1/ppc/ppc64/livecd-stage2.spec @@ -23,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: --kernel-cross-compile=powerpc64-unknown-linux-gnu- --utils-arch=ppc --arch-override=ppc --makeopts=-j8 --lvm2 --dmraid --evms2 --unionfs-dev +livecd/gk_mainargs: --kernel-cross-compile=powerpc64-unknown-linux-gnu- --utils-arch=ppc --arch-override=ppc --makeopts=-j8 --lvm --dmraid --emvs --unionfs-dev livecd/rcadd: pbbuttonsd|default diff --git a/specs/2007.1/x86/i686/livecd-stage2-gnome.spec b/specs/2007.1/x86/i686/livecd-stage2-gnome.spec index abb4ec1a..d83f6efc 100644 --- a/specs/2007.1/x86/i686/livecd-stage2-gnome.spec +++ b/specs/2007.1/x86/i686/livecd-stage2-gnome.spec @@ -23,7 +23,7 @@ livecd/overlay: /root/livecd/overlays/2007.1/common/overlay/livecd livecd/root_overlay: /root/livecd/overlays/2007.1/common/root_overlay livecd/bootargs: dokeymap -livecd/gk_mainargs: --lvm2 --dmraid --evms2 --unionfs-dev +livecd/gk_mainargs: --lvm --dmraid --emvs --unionfs-dev boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources diff --git a/specs/2007.1/x86/i686/livedvd-stage2-large.spec b/specs/2007.1/x86/i686/livedvd-stage2-large.spec index 3c7345cb..72d80a89 100644 --- a/specs/2007.1/x86/i686/livedvd-stage2-large.spec +++ b/specs/2007.1/x86/i686/livedvd-stage2-large.spec @@ -25,7 +25,7 @@ livecd/overlay: livecd/root_overlay: /root/livecd/overlays/2007.1/common/root_overlay livecd/bootargs: dokeymap -livecd/gk_mainargs: --makeopts=-j16 --lvm2 --dmraid --evms2 --unionfs-dev +livecd/gk_mainargs: --makeopts=-j16 --lvm --dmraid --emvs --unionfs-dev boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources diff --git a/specs/2007.1/x86/installcd-stage2-minimal.spec b/specs/2007.1/x86/installcd-stage2-minimal.spec index a8427c1e..8bfa45df 100644 --- a/specs/2007.1/x86/installcd-stage2-minimal.spec +++ b/specs/2007.1/x86/installcd-stage2-minimal.spec @@ -17,7 +17,7 @@ livecd/volid: Gentoo Linux x86 2007.1 livecd/type: gentoo-release-minimal livecd/bootargs: dokeymap -livecd/gk_mainargs: --lvm2 --dmraid --evms2 +livecd/gk_mainargs: --lvm --dmraid --emvs boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources