Added some vars to the spec files to make it easier to change locations and fixed whitespace.

svn path=/trunk/; revision=707
This commit is contained in:
Jorge Manuel B. S. Vicetto 2009-09-23 01:56:55 +00:00
parent bc4730c69f
commit 08f56255ac
3 changed files with 80 additions and 76 deletions

View file

@ -1,3 +1,5 @@
releng_root_dir=/var/svnroot/releng/trunk/
subarch: amd64 subarch: amd64
version_stamp: 10.0 version_stamp: 10.0
target: livecd-stage1 target: livecd-stage1
@ -5,7 +7,7 @@ rel_type: default
profile: default/linux/amd64/10.0/desktop profile: default/linux/amd64/10.0/desktop
snapshot: 20090921 snapshot: 20090921
source_subpath: default/stage3-amd64-desktop-10.0 source_subpath: default/stage3-amd64-desktop-10.0
portage_confdir: /var/svnroot/releng/trunk/releases/10.0/portage/ portage_confdir: ${portage_root_dir}/releases/10.0/portage/
livecd/use: livecd/use:
branding branding

View file

@ -1,3 +1,6 @@
releng_root_dir=/var/svnroot/releng/trunk
build_root_dir=/tmp/catalyst/builds
subarch: amd64 subarch: amd64
version_stamp: 10.0 version_stamp: 10.0
target: livecd-stage2 target: livecd-stage2
@ -8,10 +11,10 @@ source_subpath: default/livecd-stage1-amd64-10.0
livecd/bootargs: dokeymap livecd/bootargs: dokeymap
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
#livecd/fsscript: /var/svnroot/releng/trunk/releases/10.0/scripts/livecd.sh #livecd/fsscript: ${releng_root_dir}/releases/10.0/scripts/livecd.sh
livecd/fstype: squashfs livecd/fstype: squashfs
livecd/gk_mainargs: --lvm --dmraid --evms --mdadm --makeopts=-j8 livecd/gk_mainargs: --lvm --dmraid --evms --mdadm --makeopts=-j8
livecd/iso: /tmp/catalyst/builds/default/livedvd-amd64-10.0.iso livecd/iso: ${build_root_dir}/default/livedvd-amd64-10.0.iso
livecd/type: gentoo-release-livecd livecd/type: gentoo-release-livecd
livecd/volid: Gentoo Linux 10.0 amd64 LiveDVD livecd/volid: Gentoo Linux 10.0 amd64 LiveDVD
livecd/xsession: default livecd/xsession: default
@ -20,12 +23,12 @@ livecd/rcadd:
hald|default hald|default
dbus|default dbus|default
#livecd/overlay: /var/svnroot/releng/trunk/releases/10.0/overlays/common/overlay/livecd #livecd/overlay: ${releng_root_dir}/releases/10.0/overlays/common/overlay/livecd
livecd/root_overlay: /var/svnroot/releng/trunk/releases/10.0/livecd/root_overlay livecd/root_overlay: ${releng_root_dir}/releases/10.0/livecd/root_overlay
boot/kernel: gentoo boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources boot/kernel/gentoo/sources: gentoo-sources
boot/kernel/gentoo/config: /var/svnroot/releng/trunk/releases/10.0/kconfig/amd64/installcd-2.6.30.config boot/kernel/gentoo/config: ${releng_root_dir}/releases/10.0/kconfig/amd64/installcd-2.6.30.config
boot/kernel/gentoo/use: boot/kernel/gentoo/use:
atm atm
fbcondecor fbcondecor
@ -34,50 +37,47 @@ boot/kernel/gentoo/use:
portaudio portaudio
truetype truetype
usb usb
boot/kernel/gentoo/use: atm fbcondecor mng png portaudio truetype usb
boot/kernel/gentoo/packages: boot/kernel/gentoo/packages:
app-accessibility/espeakup app-accessibility/espeakup
# keywords. # keywords.
# net-wireless/rt73-firmware # net-wireless/rt73-firmware
net-dialup/ppp net-dialup/ppp
net-dialup/pppconfig net-dialup/pppconfig
net-dialup/rp-pppoe net-dialup/rp-pppoe
# keywords. # keywords.
# net-dialup/speedtouch-usb # net-dialup/speedtouch-usb
net-firewall/iptables net-firewall/iptables
# keywords. # keywords.
# net-wireless/ndiswrapper # net-wireless/ndiswrapper
sys-apps/lm_sensors sys-apps/lm_sensors
# keywords. # keywords.
# net-wireless/acx-firmware # net-wireless/acx-firmware
net-wireless/atmel-firmware net-wireless/atmel-firmware
net-wireless/b43-fwcutter net-wireless/b43-fwcutter
net-wireless/bcm43xx-fwcutter net-wireless/bcm43xx-fwcutter
net-wireless/zd1201-firmware net-wireless/zd1201-firmware
net-wireless/zd1211-firmware net-wireless/zd1211-firmware
sys-block/iscsitarget sys-block/iscsitarget
net-wireless/zd1211-firmware sys-block/open-iscsi
sys-block/iscsitarget net-misc/openswan
sys-block/open-iscsi
net-misc/openswan
# failed # failed
# sys-apps/pcmcia-cs # sys-apps/pcmcia-cs
sys-fs/sshfs-fuse sys-fs/sshfs-fuse
app-laptop/laptop-mode-tools app-laptop/laptop-mode-tools
media-libs/alsa-lib media-libs/alsa-lib
media-sound/alsa-utils media-sound/alsa-utils
# net-dialup/fcdsl # net-dialup/fcdsl
# net-dialup/fritzcapi # net-dialup/fritzcapi
net-dialup/globespan-adsl net-dialup/globespan-adsl
### Compile failure w/ 2.6.24 ### Compile failure w/ 2.6.24
# net-dialup/slmodem # net-dialup/slmodem
net-misc/br2684ctl net-misc/br2684ctl
### Compile failure ### Compile failure
# net-wireless/acx # net-wireless/acx
net-wireless/hostap-utils net-wireless/hostap-utils
net-wireless/kismet net-wireless/kismet
sys-apps/pcmciautils sys-apps/pcmciautils
sys-fs/ntfs3g sys-fs/ntfs3g
media-libs/alsa-oss media-libs/alsa-oss
livecd/empty: livecd/empty:

View file

@ -1,3 +1,5 @@
releng_root_dir=/var/svnroot/releng/trunk/
subarch: i686 subarch: i686
version_stamp: 10.0 version_stamp: 10.0
target: livecd-stage1 target: livecd-stage1
@ -5,7 +7,7 @@ rel_type: default
profile: default/linux/x86/10.0/desktop profile: default/linux/x86/10.0/desktop
snapshot: 20090921 snapshot: 20090921
source_subpath: default/stage3-i686-desktop-10.0 source_subpath: default/stage3-i686-desktop-10.0
portage_confdir: /var/svnroot/releng/trunk/releases/10.0/portage portage_confdir: ${portage_root_dir}/releases/10.0/portage/
livecd/use: livecd/use:
branding branding
@ -15,33 +17,33 @@ livecd/use:
gnome gnome
qt4 qt4
livecd/packages: livecd/packages:
dev-util/devhelp dev-util/devhelp
net-p2p/transmission net-p2p/transmission
net-p2p/linuxdcpp net-p2p/linuxdcpp
dev-util/giggle dev-util/giggle
media-libs/gstreamer media-libs/gstreamer
media-libs/gst-plugins-base media-libs/gst-plugins-base
media-libs/schroedinger media-libs/schroedinger
dev-libs/liboil dev-libs/liboil
media-libs/gst-plugins-bad media-libs/gst-plugins-bad
media-libs/gst-plugins-good media-libs/gst-plugins-good
media-plugins/gst-plugins-gconf media-plugins/gst-plugins-gconf
media-plugins/gst-plugins-jpeg media-plugins/gst-plugins-jpeg
media-plugins/gst-plugins-libpng media-plugins/gst-plugins-libpng
media-plugins/gst-plugins-soup media-plugins/gst-plugins-soup
media-plugins/gst-plugins-speex media-plugins/gst-plugins-speex
media-plugins/gst-plugins-alsa media-plugins/gst-plugins-alsa
media-plugins/gst-plugins-cdparanoia media-plugins/gst-plugins-cdparanoia
media-plugins/gst-plugins-gio media-plugins/gst-plugins-gio
media-plugins/gst-plugins-libvisual media-plugins/gst-plugins-libvisual
media-plugins/gst-plugins-ogg media-plugins/gst-plugins-ogg
media-plugins/gst-plugins-pango media-plugins/gst-plugins-pango
media-plugins/gst-plugins-theora media-plugins/gst-plugins-theora
media-plugins/gst-plugins-v4l media-plugins/gst-plugins-v4l
media-plugins/gst-plugins-v4l2 media-plugins/gst-plugins-v4l2
media-plugins/gst-plugins-vorbis media-plugins/gst-plugins-vorbis
media-plugins/gst-plugins-x media-plugins/gst-plugins-x
media-plugins/gst-plugins-xvideo media-plugins/gst-plugins-xvideo
dev-util/qt-creator dev-util/qt-creator
dev-util/kdevelop dev-util/kdevelop
dev-util/kdesvn dev-util/kdesvn
@ -51,14 +53,14 @@ livecd/packages:
net-irc/konversation net-irc/konversation
net-irc/cwirc net-irc/cwirc
# keywords. # keywords.
# net-irc/irssi-otr # net-irc/irssi-otr
net-irc/ninja net-irc/ninja
net-irc/rhapsody net-irc/rhapsody
# keywords. # keywords.
# net-irc/sic # net-irc/sic
# net-irc/smuxi # net-irc/smuxi
# net-irc/telepathy-idle # net-irc/telepathy-idle
net-irc/xchat-xsys net-irc/xchat-xsys
net-im/kmess net-im/kmess
www-client/arora www-client/arora
app-backup/luckybackup app-backup/luckybackup