From 3a792b051d72bec7fa9837d8ae383cf0347bf761 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 12 Oct 2007 20:28:19 +0000 Subject: [PATCH] Changed cryptsetup-luks to cryptsetup for bug #188900. svn path=/trunk/; revision=351 --- specs/2007.1/ChangeLog | 11 ++++++++++- specs/2007.1/alpha/installcd-stage2-minimal.spec | 4 ++-- specs/2007.1/alpha/installcd-stage2-universal.spec | 4 ++-- specs/2007.1/alpha/livecd-stage2.spec | 2 +- specs/2007.1/amd64/installcd-stage2-minimal.spec | 8 ++++---- specs/2007.1/amd64/livecd-stage2.spec | 2 +- specs/2007.1/amd64/livedvd-stage2.spec | 2 +- specs/2007.1/ia64/livecd-stage2.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 +- 12 files changed, 26 insertions(+), 17 deletions(-) diff --git a/specs/2007.1/ChangeLog b/specs/2007.1/ChangeLog index 19f7b6c8..a93a6459 100644 --- a/specs/2007.1/ChangeLog +++ b/specs/2007.1/ChangeLog @@ -1,5 +1,14 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.1/ChangeLog,v 1.6 2007-10-12 20:26:57 phreak Exp $ +# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.1/ChangeLog,v 1.7 2007-10-12 20:28:15 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/livecd-stage2.spec, + ppc/ppc64/livecd-stage2.spec, x86/i686/livecd-stage2-gnome.spec, + x86/i686/livedvd-stage2-large.spec, x86/installcd-stage2-minimal.spec: + Changed cryptsetup-luks to cryptsetup for bug #188900. 12 Oct 2007; Chris Gianelloni amd64/installcd-stage2-minimal.spec, ppc/ppc64/livecd-stage2.spec: diff --git a/specs/2007.1/alpha/installcd-stage2-minimal.spec b/specs/2007.1/alpha/installcd-stage2-minimal.spec index b23f4913..5e55adf9 100644 --- a/specs/2007.1/alpha/installcd-stage2-minimal.spec +++ b/specs/2007.1/alpha/installcd-stage2-minimal.spec @@ -24,14 +24,14 @@ boot/kernel/gentoo/sources: vanilla-sources boot/kernel/gentoo/config: /root/livecd/kconfig/releases/2007.1/alpha/installcd-2.6.15.1.config boot/kernel/gentoo/use: usb -X png truetype boot/kernel/gentoo/packages: - cryptsetup-luks + cryptsetup boot/kernel/gentoo2.4/sources: =vanilla-sources-2.4* boot/kernel/gentoo2.4/config: /root/livecd/kconfig/releases/2007.1/alpha/installcd-2.4.30.config boot/kernel/gentoo2.4/use: usb -X png truetype boot/kernel/gentoo2.4/packages: devfsd - cryptsetup-luks + cryptsetup livecd/unmerge: # acl diff --git a/specs/2007.1/alpha/installcd-stage2-universal.spec b/specs/2007.1/alpha/installcd-stage2-universal.spec index 8dcde649..2ca210c4 100644 --- a/specs/2007.1/alpha/installcd-stage2-universal.spec +++ b/specs/2007.1/alpha/installcd-stage2-universal.spec @@ -24,14 +24,14 @@ boot/kernel/gentoo/sources: vanilla-sources boot/kernel/gentoo/config: /root/livecd/kconfig/releases/2007.1/alpha/installcd-2.6.15.1.config boot/kernel/gentoo/use: usb -X png truetype boot/kernel/gentoo/packages: - cryptsetup-luks + cryptsetup boot/kernel/gentoo2.4/sources: =vanilla-sources-2.4* boot/kernel/gentoo2.4/config: /root/livecd/kconfig/releases/2007.1/alpha/installcd-2.4.30.config boot/kernel/gentoo2.4/use: usb -X png truetype boot/kernel/gentoo2.4/packages: devfsd - cryptsetup-luks + cryptsetup livecd/unmerge: # acl diff --git a/specs/2007.1/alpha/livecd-stage2.spec b/specs/2007.1/alpha/livecd-stage2.spec index 964b6602..8725e256 100644 --- a/specs/2007.1/alpha/livecd-stage2.spec +++ b/specs/2007.1/alpha/livecd-stage2.spec @@ -34,7 +34,7 @@ boot/kernel/gentoo/packages: media-libs/alsa-lib media-libs/alsa-oss media-sound/alsa-utils - sys-fs/cryptsetup-luks + sys-fs/cryptsetup livecd/empty: /var/tmp diff --git a/specs/2007.1/amd64/installcd-stage2-minimal.spec b/specs/2007.1/amd64/installcd-stage2-minimal.spec index 42f40d62..1ef4c410 100644 --- a/specs/2007.1/amd64/installcd-stage2-minimal.spec +++ b/specs/2007.1/amd64/installcd-stage2-minimal.spec @@ -11,7 +11,7 @@ livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar. livecd/iso: /var/tmp/catalyst/builds/default/install-amd64-minimal-2007.1.iso livecd/splash_type: gensplash -livecd/splash_theme: livecd-2007.1 +livecd/splash_theme: livecd-2007.0 livecd/volid: Gentoo Linux amd64 2007.1 livecd/type: gentoo-release-minimal @@ -19,12 +19,12 @@ livecd/type: gentoo-release-minimal #livecd/overlay: /root/livecd/overlays/amd64-minimal livecd/bootargs: dokeymap -livecd/gk_mainargs: --makeopts=-j16 --lvm --dmraid --emvs +livecd/gk_mainargs: --makeopts=-j16 --lvm --dmraid boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: /root/livecd/kconfig/2007.1/amd64/installcd-2.6.20.config +boot/kernel/gentoo/config: /root/livecd/kconfig/2007.1/amd64/installcd-2.6.22.config boot/kernel/gentoo/use: pcmcia usb -X png truetype -qt @@ -32,7 +32,7 @@ boot/kernel/gentoo/packages: media-gfx/splashutils media-gfx/splash-themes-livecd sys-apps/pcmciautils - sys-fs/cryptsetup-luks + sys-fs/cryptsetup # These were not stable at time of snapshot/release. # net-wireless/rtl8180 # net-wireless/rtl8187 diff --git a/specs/2007.1/amd64/livecd-stage2.spec b/specs/2007.1/amd64/livecd-stage2.spec index 46489fde..0683a6e4 100644 --- a/specs/2007.1/amd64/livecd-stage2.spec +++ b/specs/2007.1/amd64/livecd-stage2.spec @@ -49,7 +49,7 @@ boot/kernel/gentoo/packages: net-wireless/rt2500 # net-wireless/rtl8187 sys-apps/pcmciautils - sys-fs/cryptsetup-luks + sys-fs/cryptsetup livecd/empty: /var/tmp diff --git a/specs/2007.1/amd64/livedvd-stage2.spec b/specs/2007.1/amd64/livedvd-stage2.spec index 5ba64a7e..755e864b 100644 --- a/specs/2007.1/amd64/livedvd-stage2.spec +++ b/specs/2007.1/amd64/livedvd-stage2.spec @@ -51,7 +51,7 @@ boot/kernel/gentoo/packages: net-wireless/rt2500 # net-wireless/rtl8187 sys-apps/pcmciautils - sys-fs/cryptsetup-luks + sys-fs/cryptsetup livecd/empty: /var/tmp diff --git a/specs/2007.1/ia64/livecd-stage2.spec b/specs/2007.1/ia64/livecd-stage2.spec index 65f288c6..512a8c10 100644 --- a/specs/2007.1/ia64/livecd-stage2.spec +++ b/specs/2007.1/ia64/livecd-stage2.spec @@ -50,7 +50,7 @@ boot/kernel/gentoo/packages: # net-wireless/rt2500 # net-wireless/rtl8187 # sys-apps/pcmciautils - sys-fs/cryptsetup-luks + sys-fs/cryptsetup livecd/empty: /var/tmp diff --git a/specs/2007.1/ppc/ppc64/livecd-stage2.spec b/specs/2007.1/ppc/ppc64/livecd-stage2.spec index 0cdd285f..2ea806f9 100644 --- a/specs/2007.1/ppc/ppc64/livecd-stage2.spec +++ b/specs/2007.1/ppc/ppc64/livecd-stage2.spec @@ -50,7 +50,7 @@ boot/kernel/ppc32/packages: # net-wireless/hostap-utils # net-dialup/fritzcapi # net-dialup/fcdsl - sys-fs/cryptsetup-luks + sys-fs/cryptsetup # net-wireless/rt2500 # net-wireless/rtl8180 # net-wireless/adm8211 diff --git a/specs/2007.1/x86/i686/livecd-stage2-gnome.spec b/specs/2007.1/x86/i686/livecd-stage2-gnome.spec index d83f6efc..25c3ef7e 100644 --- a/specs/2007.1/x86/i686/livecd-stage2-gnome.spec +++ b/specs/2007.1/x86/i686/livecd-stage2-gnome.spec @@ -48,7 +48,7 @@ boot/kernel/gentoo/packages: net-wireless/rt2500 # net-wireless/rtl8187 sys-apps/pcmciautils - sys-fs/cryptsetup-luks + sys-fs/cryptsetup livecd/empty: /var/tmp diff --git a/specs/2007.1/x86/i686/livedvd-stage2-large.spec b/specs/2007.1/x86/i686/livedvd-stage2-large.spec index 72d80a89..68781eb0 100644 --- a/specs/2007.1/x86/i686/livedvd-stage2-large.spec +++ b/specs/2007.1/x86/i686/livedvd-stage2-large.spec @@ -52,7 +52,7 @@ boot/kernel/gentoo/packages: net-wireless/rt2500 # net-wireless/rtl8187 sys-apps/pcmciautils - sys-fs/cryptsetup-luks + sys-fs/cryptsetup livecd/unmerge: sys-kernel/gentoo-sources diff --git a/specs/2007.1/x86/installcd-stage2-minimal.spec b/specs/2007.1/x86/installcd-stage2-minimal.spec index 8bfa45df..a8e7c8e7 100644 --- a/specs/2007.1/x86/installcd-stage2-minimal.spec +++ b/specs/2007.1/x86/installcd-stage2-minimal.spec @@ -35,7 +35,7 @@ boot/kernel/gentoo/packages: net-wireless/hostap-utils # net-dialup/fritzcapi # net-dialup/fcdsl - sys-fs/cryptsetup-luks + sys-fs/cryptsetup net-wireless/rt2500 net-wireless/acx net-wireless/ipw3945