From c5699dbfe60ace63f045587e0f10c6f1eab75dd8 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 14 Nov 2007 02:17:58 +0000 Subject: [PATCH] Removed net-misc/br2684ctl from livecd-stage1 spec files and moved to livecd-stage2 spec files. I also removed sys-fs/cryptsetup if it was listed, since it is safe to pull into livecd-stage1 now and we should be getting the correct version/package on each architecture. svn path=/trunk/; revision=385 --- specs/2007.1/ChangeLog | 19 ++++++++++++++++++- specs/2007.1/alpha/installcd-stage1.spec | 1 - specs/2007.1/alpha/livecd-stage1.spec | 1 - specs/2007.1/alpha/livecd-stage2.spec | 2 +- specs/2007.1/amd64/installcd-stage1.spec | 1 - specs/2007.1/amd64/livecd-stage1.spec | 1 - specs/2007.1/amd64/livecd-stage2.spec | 1 + specs/2007.1/amd64/livedvd-stage1.spec | 1 - specs/2007.1/amd64/livedvd-stage2.spec | 2 +- specs/2007.1/hppa/installcd-stage1.spec | 1 - specs/2007.1/ia64/installcd-stage1.spec | 1 - specs/2007.1/ia64/livecd-stage1.spec | 1 - specs/2007.1/ia64/livecd-stage2.spec | 2 +- specs/2007.1/ppc/ppc64/installcd-stage1.spec | 1 - specs/2007.1/ppc/ppc64/livecd-stage1.spec | 1 - specs/2007.1/ppc/ppc64/livecd-stage2.spec | 2 +- .../sparc/sparc64/installcd-stage1.spec | 1 - .../2007.1/x86/hardened/installcd-stage1.spec | 1 - specs/2007.1/x86/i686/livecd-stage1.spec | 1 - specs/2007.1/x86/i686/livecd-stage2.spec | 2 +- specs/2007.1/x86/i686/livedvd-stage1.spec | 1 - specs/2007.1/x86/i686/livedvd-stage2.spec | 2 +- specs/2007.1/x86/installcd-stage1.spec | 1 - 23 files changed, 25 insertions(+), 22 deletions(-) diff --git a/specs/2007.1/ChangeLog b/specs/2007.1/ChangeLog index 6bcc6c3c..036beaf2 100644 --- a/specs/2007.1/ChangeLog +++ b/specs/2007.1/ChangeLog @@ -1,5 +1,22 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.1/ChangeLog,v 1.29 2007-11-14 02:09:37 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.1/ChangeLog,v 1.30 2007-11-14 02:17:51 wolf31o2 Exp $ + + 14 Nov 2007; Chris Gianelloni + alpha/installcd-stage1.spec, alpha/livecd-stage1.spec, + alpha/livecd-stage2.spec, amd64/installcd-stage1.spec, + amd64/livecd-stage1.spec, amd64/livecd-stage2.spec, + amd64/livedvd-stage1.spec, amd64/livedvd-stage2.spec, + hppa/installcd-stage1.spec, ia64/installcd-stage1.spec, + ia64/livecd-stage1.spec, ia64/livecd-stage2.spec, + ppc/ppc64/installcd-stage1.spec, ppc/ppc64/livecd-stage1.spec, + ppc/ppc64/livecd-stage2.spec, sparc/sparc64/installcd-stage1.spec, + x86/hardened/installcd-stage1.spec, x86/i686/livecd-stage1.spec, + x86/i686/livecd-stage2.spec, x86/i686/livedvd-stage1.spec, + x86/i686/livedvd-stage2.spec, x86/installcd-stage1.spec: + Removed net-misc/br2684ctl from livecd-stage1 spec files and moved to + livecd-stage2 spec files. I also removed sys-fs/cryptsetup if it was listed, + since it is safe to pull into livecd-stage1 now and we should be getting the + correct version/package on each architecture. 14 Nov 2007; Chris Gianelloni amd64/livedvd-stage1.spec, x86/i686/livedvd-stage1.spec: diff --git a/specs/2007.1/alpha/installcd-stage1.spec b/specs/2007.1/alpha/installcd-stage1.spec index 67424d0d..23844756 100644 --- a/specs/2007.1/alpha/installcd-stage1.spec +++ b/specs/2007.1/alpha/installcd-stage1.spec @@ -39,7 +39,6 @@ livecd/packages: net-dialup/rp-pppoe net-fs/nfs-utils net-irc/irssi -# net-misc/br2684ctl net-misc/dhcpcd net-misc/iputils net-misc/rdate diff --git a/specs/2007.1/alpha/livecd-stage1.spec b/specs/2007.1/alpha/livecd-stage1.spec index 542c44b7..4db79393 100644 --- a/specs/2007.1/alpha/livecd-stage1.spec +++ b/specs/2007.1/alpha/livecd-stage1.spec @@ -50,7 +50,6 @@ livecd/packages: net-im/pidgin net-irc/irssi net-irc/xchat -# net-misc/br2684ctl # net-misc/bridge-utils net-misc/dhcpcd net-misc/iputils diff --git a/specs/2007.1/alpha/livecd-stage2.spec b/specs/2007.1/alpha/livecd-stage2.spec index b2ce5e1a..94f2b2e8 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 + net-misc/br2684ctl livecd/empty: /var/tmp diff --git a/specs/2007.1/amd64/installcd-stage1.spec b/specs/2007.1/amd64/installcd-stage1.spec index 1dd57bce..651d3cf7 100644 --- a/specs/2007.1/amd64/installcd-stage1.spec +++ b/specs/2007.1/amd64/installcd-stage1.spec @@ -40,7 +40,6 @@ livecd/packages: net-dialup/rp-pppoe net-fs/nfs-utils net-irc/irssi - net-misc/br2684ctl net-misc/dhcpcd net-misc/iputils net-misc/rdate diff --git a/specs/2007.1/amd64/livecd-stage1.spec b/specs/2007.1/amd64/livecd-stage1.spec index 6819c1b8..d8043bb1 100644 --- a/specs/2007.1/amd64/livecd-stage1.spec +++ b/specs/2007.1/amd64/livecd-stage1.spec @@ -50,7 +50,6 @@ livecd/packages: net-im/pidgin net-irc/irssi net-irc/xchat - net-misc/br2684ctl net-misc/bridge-utils net-misc/dhcpcd net-misc/iputils diff --git a/specs/2007.1/amd64/livecd-stage2.spec b/specs/2007.1/amd64/livecd-stage2.spec index 7cb08ed8..053aa8ec 100644 --- a/specs/2007.1/amd64/livecd-stage2.spec +++ b/specs/2007.1/amd64/livecd-stage2.spec @@ -45,6 +45,7 @@ boot/kernel/gentoo/packages: # net-dialup/globespan-adsl ### Masked # net-dialup/slmodem + net-misc/br2684ctl ### Masked # net-wireless/acx net-wireless/hostap-utils diff --git a/specs/2007.1/amd64/livedvd-stage1.spec b/specs/2007.1/amd64/livedvd-stage1.spec index 5a811578..e71644d7 100644 --- a/specs/2007.1/amd64/livedvd-stage1.spec +++ b/specs/2007.1/amd64/livedvd-stage1.spec @@ -142,7 +142,6 @@ livecd/packages: net-im/pidgin net-irc/irssi net-irc/xchat - net-misc/br2684ctl net-misc/bridge-utils net-misc/dhcpcd net-misc/iputils diff --git a/specs/2007.1/amd64/livedvd-stage2.spec b/specs/2007.1/amd64/livedvd-stage2.spec index b25ca8a7..3f9eccf3 100644 --- a/specs/2007.1/amd64/livedvd-stage2.spec +++ b/specs/2007.1/amd64/livedvd-stage2.spec @@ -44,6 +44,7 @@ boot/kernel/gentoo/packages: # net-dialup/fritzcapi # net-dialup/globespan-adsl # net-dialup/slmodem + net-misc/br2684ctl # net-wireless/acx net-wireless/hostap-utils net-wireless/ipw3945 @@ -51,7 +52,6 @@ boot/kernel/gentoo/packages: net-wireless/rt2500 # net-wireless/rtl8187 sys-apps/pcmciautils - sys-fs/cryptsetup livecd/empty: /var/tmp diff --git a/specs/2007.1/hppa/installcd-stage1.spec b/specs/2007.1/hppa/installcd-stage1.spec index ad0ba355..3ad84676 100644 --- a/specs/2007.1/hppa/installcd-stage1.spec +++ b/specs/2007.1/hppa/installcd-stage1.spec @@ -40,7 +40,6 @@ livecd/packages: net-dialup/rp-pppoe net-fs/nfs-utils net-irc/irssi -# net-misc/br2684ctl net-misc/dhcpcd net-misc/iputils net-misc/rdate diff --git a/specs/2007.1/ia64/installcd-stage1.spec b/specs/2007.1/ia64/installcd-stage1.spec index a65bcd60..51ab8d99 100644 --- a/specs/2007.1/ia64/installcd-stage1.spec +++ b/specs/2007.1/ia64/installcd-stage1.spec @@ -36,7 +36,6 @@ livecd/packages: # net-dialup/rp-pppoe net-fs/nfs-utils net-irc/irssi -# net-misc/br2684ctl net-misc/dhcpcd net-misc/iputils net-misc/rdate diff --git a/specs/2007.1/ia64/livecd-stage1.spec b/specs/2007.1/ia64/livecd-stage1.spec index d882f993..c168d442 100644 --- a/specs/2007.1/ia64/livecd-stage1.spec +++ b/specs/2007.1/ia64/livecd-stage1.spec @@ -50,7 +50,6 @@ livecd/packages: net-im/pidgin net-irc/irssi net-irc/xchat -# net-misc/br2684ctl net-misc/bridge-utils net-misc/dhcpcd net-misc/iputils diff --git a/specs/2007.1/ia64/livecd-stage2.spec b/specs/2007.1/ia64/livecd-stage2.spec index 0decc23c..8b6c5b07 100644 --- a/specs/2007.1/ia64/livecd-stage2.spec +++ b/specs/2007.1/ia64/livecd-stage2.spec @@ -43,6 +43,7 @@ boot/kernel/gentoo/packages: # net-dialup/fritzcapi # net-dialup/globespan-adsl # net-dialup/slmodem +# net-misc/br2684ctl # net-wireless/acx # net-wireless/hostap-utils # net-wireless/ipw3945 @@ -50,7 +51,6 @@ boot/kernel/gentoo/packages: # net-wireless/rt2500 # net-wireless/rtl8187 # sys-apps/pcmciautils - sys-fs/cryptsetup livecd/empty: /var/tmp diff --git a/specs/2007.1/ppc/ppc64/installcd-stage1.spec b/specs/2007.1/ppc/ppc64/installcd-stage1.spec index 54fd6853..3d9d316d 100644 --- a/specs/2007.1/ppc/ppc64/installcd-stage1.spec +++ b/specs/2007.1/ppc/ppc64/installcd-stage1.spec @@ -41,7 +41,6 @@ livecd/packages: net-dialup/rp-pppoe net-fs/nfs-utils net-irc/irssi -# net-misc/br2684ctl net-misc/dhcpcd net-misc/iputils net-misc/rdate diff --git a/specs/2007.1/ppc/ppc64/livecd-stage1.spec b/specs/2007.1/ppc/ppc64/livecd-stage1.spec index c22f5e06..138d1e5a 100644 --- a/specs/2007.1/ppc/ppc64/livecd-stage1.spec +++ b/specs/2007.1/ppc/ppc64/livecd-stage1.spec @@ -64,7 +64,6 @@ livecd/packages: net-im/pidgin net-irc/irssi net-irc/xchat -# net-misc/br2684ctl net-misc/bridge-utils net-misc/dhcpcd net-misc/iputils diff --git a/specs/2007.1/ppc/ppc64/livecd-stage2.spec b/specs/2007.1/ppc/ppc64/livecd-stage2.spec index 7c2f8db8..44bbf775 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 + net-misc/br2684ctl # net-wireless/rt2500 # net-wireless/rtl8180 # net-wireless/adm8211 diff --git a/specs/2007.1/sparc/sparc64/installcd-stage1.spec b/specs/2007.1/sparc/sparc64/installcd-stage1.spec index 14165e1e..c4965c13 100644 --- a/specs/2007.1/sparc/sparc64/installcd-stage1.spec +++ b/specs/2007.1/sparc/sparc64/installcd-stage1.spec @@ -42,7 +42,6 @@ livecd/packages: net-dialup/rp-pppoe net-fs/nfs-utils net-irc/irssi -# net-misc/br2684ctl net-misc/dhcpcd net-misc/iputils net-misc/rdate diff --git a/specs/2007.1/x86/hardened/installcd-stage1.spec b/specs/2007.1/x86/hardened/installcd-stage1.spec index 872b5883..ad7c2a7d 100644 --- a/specs/2007.1/x86/hardened/installcd-stage1.spec +++ b/specs/2007.1/x86/hardened/installcd-stage1.spec @@ -38,7 +38,6 @@ livecd/packages: net-dialup/rp-pppoe net-fs/nfs-utils net-irc/irssi - net-misc/br2684ctl net-misc/dhcpcd net-misc/iputils net-misc/rdate diff --git a/specs/2007.1/x86/i686/livecd-stage1.spec b/specs/2007.1/x86/i686/livecd-stage1.spec index 6bbc66a5..3854e80b 100644 --- a/specs/2007.1/x86/i686/livecd-stage1.spec +++ b/specs/2007.1/x86/i686/livecd-stage1.spec @@ -52,7 +52,6 @@ livecd/packages: net-im/pidgin net-irc/irssi net-irc/xchat - net-misc/br2684ctl net-misc/bridge-utils net-misc/dhcpcd net-misc/iputils diff --git a/specs/2007.1/x86/i686/livecd-stage2.spec b/specs/2007.1/x86/i686/livecd-stage2.spec index c9eb1627..733caff7 100644 --- a/specs/2007.1/x86/i686/livecd-stage2.spec +++ b/specs/2007.1/x86/i686/livecd-stage2.spec @@ -41,6 +41,7 @@ boot/kernel/gentoo/packages: # net-dialup/fritzcapi net-dialup/globespan-adsl net-dialup/slmodem + net-misc/br2684ctl # net-wireless/acx net-wireless/hostap-utils net-wireless/ipw3945 @@ -48,7 +49,6 @@ boot/kernel/gentoo/packages: net-wireless/rt2500 # net-wireless/rtl8187 sys-apps/pcmciautils - sys-fs/cryptsetup livecd/empty: /var/tmp diff --git a/specs/2007.1/x86/i686/livedvd-stage1.spec b/specs/2007.1/x86/i686/livedvd-stage1.spec index e2bd31af..cd66c89c 100644 --- a/specs/2007.1/x86/i686/livedvd-stage1.spec +++ b/specs/2007.1/x86/i686/livedvd-stage1.spec @@ -138,7 +138,6 @@ livecd/packages: net-im/pidgin net-irc/irssi net-irc/xchat - net-misc/br2684ctl net-misc/bridge-utils net-misc/dhcpcd net-misc/iputils diff --git a/specs/2007.1/x86/i686/livedvd-stage2.spec b/specs/2007.1/x86/i686/livedvd-stage2.spec index 2c732d32..72b9bac7 100644 --- a/specs/2007.1/x86/i686/livedvd-stage2.spec +++ b/specs/2007.1/x86/i686/livedvd-stage2.spec @@ -44,6 +44,7 @@ boot/kernel/gentoo/packages: # net-dialup/fritzcapi net-dialup/globespan-adsl net-dialup/slmodem + net-misc/br2684ctl net-wireless/acx net-wireless/hostap-utils net-wireless/kismet @@ -52,7 +53,6 @@ boot/kernel/gentoo/packages: net-wireless/rt2500 # net-wireless/rtl8187 sys-apps/pcmciautils - sys-fs/cryptsetup livecd/unmerge: sys-kernel/gentoo-sources diff --git a/specs/2007.1/x86/installcd-stage1.spec b/specs/2007.1/x86/installcd-stage1.spec index 3f8993a6..565ddced 100644 --- a/specs/2007.1/x86/installcd-stage1.spec +++ b/specs/2007.1/x86/installcd-stage1.spec @@ -38,7 +38,6 @@ livecd/packages: net-dialup/rp-pppoe net-fs/nfs-utils net-irc/irssi - net-misc/br2684ctl net-misc/dhcpcd net-misc/iputils net-misc/rdate