Added some masking information to the amd64 specs, changed the fsscript location to point to the new location, and fixing kconfig locations on specs that pointed to my own /root/livecd directory.

svn path=/trunk/; revision=417
This commit is contained in:
Chris Gianelloni 2008-02-13 22:16:49 +00:00
parent 8d98f01eba
commit fcbd05d8da
9 changed files with 72 additions and 25 deletions

View file

@ -2,6 +2,17 @@
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
13 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
specs/alpha/installcd-stage2-minimal.spec,
specs/alpha/installcd-stage2-universal.spec,
specs/alpha/livecd-stage2.spec, specs/amd64/installcd-stage1.spec,
specs/amd64/livecd-stage1.spec, specs/amd64/livecd-stage2.spec,
specs/hppa/installcd-stage2-minimal.spec,
specs/hppa/installcd-stage2-universal.spec:
Added some masking information to the amd64 specs, changed the fsscript
location to point to the new location, and fixing kconfig locations on specs
that pointed to my own /root/livecd directory.
13 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
specs/ppc/ppc64/power5/stage2-32ul.spec,
specs/ppc/ppc64/power6/stage3-32ul.spec,

View file

@ -19,7 +19,7 @@ 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/config: /var/svnroot/releng/trunk/releases/2008.0/kconfig/alpha/installcd-2.6.15.1.config
livecd/unmerge:
# acl

View file

@ -21,7 +21,7 @@ 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/config: /var/svnroot/releng/trunk/releases/2008.0/kconfig/alpha/installcd-2.6.15.1.config
livecd/unmerge:
# acl

View file

@ -27,7 +27,7 @@ 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/livecd-2.6.19.config
boot/kernel/gentoo/config: /var/svnroot/releng/trunk/releases/2008.0/kconfig/alpha/livecd-2.6.19.config
boot/kernel/gentoo/use: atm fbcondecor mng png truetype usb
boot/kernel/gentoo/packages:
media-libs/alsa-lib

View file

@ -37,7 +37,8 @@ livecd/packages:
net-analyzer/tcptraceroute
net-analyzer/traceroute
net-dialup/mingetty
net-dialup/penggy
### Masked (no keywords)
# net-dialup/penggy
net-dialup/pptpclient
net-dialup/rp-pppoe
net-fs/nfs-utils
@ -46,14 +47,17 @@ livecd/packages:
net-misc/iputils
net-misc/rdate
net-misc/vconfig
net-wireless/ipw2100-firmware
net-wireless/ipw2200-firmware
### Masked (no keywords)
# net-wireless/ipw2100-firmware
### Masked (~amd64)
# net-wireless/ipw2200-firmware
net-wireless/iwl3945-ucode
net-wireless/iwl4965-ucode
net-wireless/prism54-firmware
net-wireless/wireless-tools
net-wireless/wpa_supplicant
net-wireless/zd1201-firmware
### Masked (~amd64)
# net-wireless/zd1201-firmware
net-wireless/zd1211-firmware
sys-apps/apmd
sys-apps/eject
@ -62,25 +66,35 @@ livecd/packages:
sys-apps/hdparm
sys-apps/hwsetup
sys-apps/iproute2
### Masked (no keywords)
# sys-apps/lssbus
sys-apps/memtester
sys-apps/netplug
sys-apps/parted
### Masked (no keywords)
# sys-apps/powerpc-utils
### Masked (no keywords)
# sys-apps/ibm-powerpc-utils
### Masked (no keywords)
# sys-apps/ibm-powerpc-utils-papr
sys-apps/sdparm
sys-block/partimage
### Masked (~amd64)
# sys-block/partimage
sys-block/qla-fc-firmware
### Masked (no keywords)
# sys-boot/yaboot
### Masked (no keywords)
# sys-devel/binutils-hppa64
### Masked (no keywords)
# sys-devel/gcc-hppa64
sys-fs/dmraid
### Masked (~amd64)
# sys-fs/dmraid
sys-fs/dosfstools
sys-fs/e2fsprogs
sys-fs/evms
sys-fs/hfsplusutils
sys-fs/hfsutils
### Masked (no keywords)
# sys-fs/iprutils
sys-fs/jfsutils
sys-fs/lsscsi
@ -94,5 +108,6 @@ livecd/packages:
sys-fs/xfsprogs
sys-libs/gpm
sys-power/acpid
### Masked (no keywords)
# sys-power/apmd
www-client/links

View file

@ -65,15 +65,19 @@ livecd/packages:
net-p2p/bittorrent
net-proxy/dante
net-proxy/tsocks
net-wireless/ipw2100-firmware
net-wireless/ipw2200-firmware
### Masked (no keywords)
# net-wireless/ipw2100-firmware
### Masked (~amd64)
# net-wireless/ipw2200-firmware
net-wireless/iwl3945-ucode
net-wireless/iwl4965-ucode
net-wireless/prism54-firmware
net-wireless/wireless-tools
net-wireless/wpa_supplicant
net-wireless/zd1201-firmware
### Masked (~amd64)
# net-wireless/zd1201-firmware
net-wireless/zd1211-firmware
### Masked (no keywords)
# sys-apps/apmd
sys-apps/eject
sys-apps/ethtool
@ -81,13 +85,17 @@ livecd/packages:
sys-apps/gli
sys-apps/hdparm
sys-apps/hwsetup
### Masked (no keywords)
# sys-apps/ibm-powerpc-utils
### Masked (no keywords)
# sys-apps/ibm-powerpc-utils-papr
sys-apps/iproute2
### Masked (no keywords)
# sys-apps/lssbus
sys-apps/memtester
sys-apps/netplug
sys-apps/parted
### Masked (no keywords)
# sys-apps/powerpc-utils
sys-apps/sdparm
sys-apps/sg3_utils
@ -95,23 +103,31 @@ livecd/packages:
sys-apps/smartmontools
sys-block/aoetools
sys-block/disktype
sys-block/gpart
sys-block/partimage
### Masked (-amd64)
# sys-block/gpart
### Masked (~amd64)
# sys-block/partimage
sys-block/qla-fc-firmware
### Masked (no keywords)
# sys-boot/aboot
sys-boot/elilo
### Masked (no keywords)
# sys-boot/elilo
sys-boot/grub
sys-boot/lilo
sys-boot/syslinux
### Masked (no keywords)
# sys-boot/yaboot
### Masked (no keywords)
# sys-devel/binutils-hppa64
sys-devel/distcc
### Masked (no keywords)
# sys-devel/gcc-hppa64
sys-fs/dosfstools
sys-fs/e2fsprogs
sys-fs/evms
sys-fs/hfsplusutils
sys-fs/hfsutils
### Masked (no keywords)
# sys-fs/iprutils
sys-fs/jfsutils
sys-fs/lsscsi

View file

@ -10,7 +10,7 @@ livecd/fstype: squashfs
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
livecd/iso: /var/tmp/catalyst/builds/default/livecd-amd64-installer-2008.0.iso
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
@ -30,16 +30,21 @@ boot/kernel/gentoo/packages:
media-libs/alsa-lib
media-libs/alsa-oss
media-sound/alsa-utils
net-dialup/fcdsl
net-dialup/fritzcapi
### Masked (~amd64)
# 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/rt2500
net-wireless/rtl8187
### Masked (~amd64)
# net-wireless/rtl8187
sys-apps/pcmciautils
livecd/empty:

View file

@ -21,10 +21,10 @@ livecd/gk_mainargs: --lvm --dmraid --evms --mdadm
boot/kernel: livecd32 livecd64
boot/kernel/livecd32/sources: sys-kernel/hppa-sources
boot/kernel/livecd32/config: /root/livecd/kconfig/releases/2008.0/hppa/installcd-2.6.15-hppa32.config
boot/kernel/livecd32/config: /var/svnroot/releng/trunk/releases/2008.0/kconfig/hppa/installcd-2.6.15-hppa32.config
boot/kernel/livecd64/sources: sys-kernel/hppa-sources
boot/kernel/livecd64/config: /root/livecd/kconfig/releases/2008.0/hppa/installcd-2.6.15-hppa64.config
boot/kernel/livecd64/config: /var/svnroot/releng/trunk/releases/2008.0/kconfig/hppa/installcd-2.6.15-hppa64.config
boot/kernel/livecd64/gk_kernargs: --kernel-cc=hppa64-linux-gcc --kernel-ld=hppa64-linux-ld
boot/kernel/livecd32/extraversion: livecd32

View file

@ -21,10 +21,10 @@ livecd/gk_mainargs: --lvm --dmraid --evms --mdadm
boot/kernel: livecd32 livecd64
boot/kernel/livecd32/sources: sys-kernel/hppa-sources
boot/kernel/livecd32/config: /root/livecd/kconfig/releases/2008.0/hppa/installcd-2.6.15-hppa32.config
boot/kernel/livecd32/config: /var/svnroot/releng/trunk/releases/2008.0/kconfig/hppa/installcd-2.6.15-hppa32.config
boot/kernel/livecd64/sources: sys-kernel/hppa-sources
boot/kernel/livecd64/config: /root/livecd/kconfig/releases/2008.0/hppa/installcd-2.6.15-hppa64.config
boot/kernel/livecd64/config: /var/svnroot/releng/trunk/releases/2008.0/kconfig/hppa/installcd-2.6.15-hppa64.config
boot/kernel/livecd64/gk_kernargs: --kernel-cc=hppa64-linux-gcc --kernel-ld=hppa64-linux-ld
boot/kernel/livecd32/extraversion: livecd32