From 60e8cba6e35f70c01034b09dd510be534ec1a63f Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 13 Feb 2008 01:29:56 +0000 Subject: [PATCH] Masking net-dialup/penggy, app-misc/beagle, and several kernel module packages on AMD64, fixed kconfig location on AMD64, and removed sys-fs/cryptsetup from all spec files since it is pulled in as a dependency and doesn't need to be explicitly listed. svn path=/trunk/; revision=415 --- releases/2008.0/ChangeLog | 13 ++++++++++++ .../specs/alpha/installcd-stage2-minimal.spec | 3 --- .../alpha/installcd-stage2-universal.spec | 3 --- .../specs/amd64/installcd-stage2-minimal.spec | 1 - .../2008.0/specs/amd64/livecd-stage1.spec | 3 ++- .../2008.0/specs/amd64/livecd-stage2.spec | 2 +- .../2008.0/specs/amd64/livedvd-stage1.spec | 3 ++- .../2008.0/specs/amd64/livedvd-stage2.spec | 21 ++++++++++++------- .../hardened/installcd-stage2-minimal.spec | 1 - .../specs/x86/installcd-stage2-minimal.spec | 1 - 10 files changed, 31 insertions(+), 20 deletions(-) diff --git a/releases/2008.0/ChangeLog b/releases/2008.0/ChangeLog index 636a2a7b..ac9bbbbb 100644 --- a/releases/2008.0/ChangeLog +++ b/releases/2008.0/ChangeLog @@ -2,6 +2,19 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 13 Feb 2008; Chris Gianelloni + specs/alpha/installcd-stage2-minimal.spec, + specs/alpha/installcd-stage2-universal.spec, + specs/amd64/installcd-stage2-minimal.spec, specs/amd64/livecd-stage1.spec, + specs/amd64/livecd-stage2.spec, specs/amd64/livedvd-stage1.spec, + specs/amd64/livedvd-stage2.spec, + specs/x86/hardened/installcd-stage2-minimal.spec, + specs/x86/installcd-stage2-minimal.spec: + Masking net-dialup/penggy, app-misc/beagle, and several kernel module + packages on AMD64, fixed kconfig location on AMD64, and removed + sys-fs/cryptsetup from all spec files since it is pulled in as a dependency + and doesn't need to be explicitly listed. + 12 Feb 2008; Chris Gianelloni specs/alpha/installcd-stage2-minimal.spec, specs/alpha/installcd-stage2-universal.spec, diff --git a/releases/2008.0/specs/alpha/installcd-stage2-minimal.spec b/releases/2008.0/specs/alpha/installcd-stage2-minimal.spec index ad2dcba1..69fe09cb 100644 --- a/releases/2008.0/specs/alpha/installcd-stage2-minimal.spec +++ b/releases/2008.0/specs/alpha/installcd-stage2-minimal.spec @@ -20,9 +20,6 @@ livecd/gk_mainargs: --lvm --dmraid --evms --mdadm boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources boot/kernel/gentoo/config: /root/livecd/kconfig/releases/2008.0/alpha/installcd-2.6.15.1.config -boot/kernel/gentoo/use: atm fbcondecor mng png truetype usb -qt3 -qt4 -X -boot/kernel/gentoo/packages: - cryptsetup livecd/unmerge: # acl diff --git a/releases/2008.0/specs/alpha/installcd-stage2-universal.spec b/releases/2008.0/specs/alpha/installcd-stage2-universal.spec index b9917765..f588dd15 100644 --- a/releases/2008.0/specs/alpha/installcd-stage2-universal.spec +++ b/releases/2008.0/specs/alpha/installcd-stage2-universal.spec @@ -22,9 +22,6 @@ livecd/gk_mainargs: --lvm --dmraid --evms --mdadm boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources boot/kernel/gentoo/config: /root/livecd/kconfig/releases/2008.0/alpha/installcd-2.6.15.1.config -boot/kernel/gentoo/use: atm fbcondecor mng png truetype usb -qt3 -qt4 -X -boot/kernel/gentoo/packages: - cryptsetup livecd/unmerge: # acl diff --git a/releases/2008.0/specs/amd64/installcd-stage2-minimal.spec b/releases/2008.0/specs/amd64/installcd-stage2-minimal.spec index f51e58c4..a6b326d0 100644 --- a/releases/2008.0/specs/amd64/installcd-stage2-minimal.spec +++ b/releases/2008.0/specs/amd64/installcd-stage2-minimal.spec @@ -26,7 +26,6 @@ boot/kernel/gentoo/config: /root/livecd/2008.0/kconfig/amd64/installcd-2.6.24.co boot/kernel/gentoo/use: atm fbcondecor mng png truetype usb -qt3 -qt4 -X boot/kernel/gentoo/packages: sys-apps/pcmciautils - sys-fs/cryptsetup net-dialup/globespan-adsl # These were not stable at time of snapshot/release. # net-wireless/rtl8180 diff --git a/releases/2008.0/specs/amd64/livecd-stage1.spec b/releases/2008.0/specs/amd64/livecd-stage1.spec index e658e379..aeb2a62f 100644 --- a/releases/2008.0/specs/amd64/livecd-stage1.spec +++ b/releases/2008.0/specs/amd64/livecd-stage1.spec @@ -45,7 +45,8 @@ livecd/packages: net-analyzer/traceroute net-dialup/mingetty net-dialup/minicom - net-dialup/penggy +### Masked (no keywords) +# net-dialup/penggy net-dialup/pptpclient net-dialup/rp-pppoe net-firewall/iptables diff --git a/releases/2008.0/specs/amd64/livecd-stage2.spec b/releases/2008.0/specs/amd64/livecd-stage2.spec index 63ea5ba2..7c2c5225 100644 --- a/releases/2008.0/specs/amd64/livecd-stage2.spec +++ b/releases/2008.0/specs/amd64/livecd-stage2.spec @@ -24,7 +24,7 @@ livecd/gk_mainargs: --lvm --dmraid --evms --mdadm boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: /root/livecd/2008.0/kconfig/amd64/livecd-2.6.24.config +boot/kernel/gentoo/config: /var/svnroot/releng/trunk/releases/2008.0/kconfig/amd64/livecd-2.6.24.config boot/kernel/gentoo/use: atm fbcondecor mng png truetype usb boot/kernel/gentoo/packages: media-libs/alsa-lib diff --git a/releases/2008.0/specs/amd64/livedvd-stage1.spec b/releases/2008.0/specs/amd64/livedvd-stage1.spec index 96ae59ea..606169ff 100644 --- a/releases/2008.0/specs/amd64/livedvd-stage1.spec +++ b/releases/2008.0/specs/amd64/livedvd-stage1.spec @@ -44,7 +44,8 @@ livecd/packages: app-editors/xemacs app-forensics/chkrootkit app-laptop/i8kutils - app-misc/beagle +### Compile fails +# app-misc/beagle app-misc/livecd-tools ### Compile fails # app-misc/mc diff --git a/releases/2008.0/specs/amd64/livedvd-stage2.spec b/releases/2008.0/specs/amd64/livedvd-stage2.spec index 92e1d025..4f870e0d 100644 --- a/releases/2008.0/specs/amd64/livedvd-stage2.spec +++ b/releases/2008.0/specs/amd64/livedvd-stage2.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/livedvd-amd64-installer-2008.0.iso livecd/xdm: gdm livecd/xsession: xfce -livecd/fsscript: /var/cvsroot/gentoo/src/releng/scripts/2008.0/livecd.sh +livecd/fsscript: /var/svnroot/releng/trunk/releases/2008.0/scripts/livecd.sh livecd/type: gentoo-release-livecd livecd/users: gentoo @@ -25,22 +25,27 @@ livecd/gk_mainargs: --lvm --dmraid --evms --mdadm boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: /root/livecd/2008.0/kconfig/amd64/livecd-2.6.24.config +boot/kernel/gentoo/config: /var/svnroot/releng/trunk/releases/2008.0/kconfig/amd64/livecd-2.6.24.config boot/kernel/gentoo/use: atm fbcondecor mng png truetype usb boot/kernel/gentoo/packages: media-libs/alsa-lib media-libs/alsa-oss media-sound/alsa-utils - net-dialup/fcdsl - net-dialup/fritzcapi +### Masked (no keyword) +# net-dialup/fcdsl +### Masked (~amd64) +# net-dialup/fritzcapi net-dialup/globespan-adsl - net-dialup/slmodem +### Masked (~amd64) +# net-dialup/slmodem net-misc/br2684ctl - net-wireless/acx +### Masked (~amd64) +# net-wireless/acx net-wireless/hostap-utils - net-wireless/madwifi-ng-tools +# net-wireless/madwifi-ng-tools net-wireless/rt2500 - net-wireless/rtl8187 +### Masked (~amd64) +# net-wireless/rtl8187 sys-apps/pcmciautils livecd/empty: diff --git a/releases/2008.0/specs/x86/hardened/installcd-stage2-minimal.spec b/releases/2008.0/specs/x86/hardened/installcd-stage2-minimal.spec index 8bfaaa2b..947f0b2f 100644 --- a/releases/2008.0/specs/x86/hardened/installcd-stage2-minimal.spec +++ b/releases/2008.0/specs/x86/hardened/installcd-stage2-minimal.spec @@ -31,7 +31,6 @@ boot/kernel/gentoo/packages: net-wireless/hostap-utils # net-dialup/fritzcapi # net-dialup/fcdsl - sys-fs/cryptsetup net-wireless/rt2500 net-wireless/acx net-wireless/ipw3945 diff --git a/releases/2008.0/specs/x86/installcd-stage2-minimal.spec b/releases/2008.0/specs/x86/installcd-stage2-minimal.spec index bcc1141b..9c72eddd 100644 --- a/releases/2008.0/specs/x86/installcd-stage2-minimal.spec +++ b/releases/2008.0/specs/x86/installcd-stage2-minimal.spec @@ -29,7 +29,6 @@ boot/kernel/gentoo/packages: net-wireless/hostap-utils # net-dialup/fritzcapi # net-dialup/fcdsl - sys-fs/cryptsetup net-wireless/rt2500 # net-wireless/acx net-wireless/ipw3945