Merge branch 'F-11' of ssh://git.fedorahosted.org/git/spin-kickstarts into F-11

This commit is contained in:
Jeroen van Meeuwen (Fedora Unity)
2009-06-17 03:01:00 +02:00
3 changed files with 11 additions and 11 deletions

View File

@@ -27,16 +27,16 @@ part / --size 550 --fstype ext3 --ondisk sda
# Repositories
#
# To compose against the current release tree, use the following "repo" (enabled by default)
#repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=$basearch
repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=$basearch
# To include updates, use the following "repo" (enabled by default)
#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=$basearch
repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=$basearch
# To compose against rawhide, use the following "repo" (disabled by default)
repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
# To compose against local trees, (edit and) use:
#repo --name=f10 --baseurl=http://localrepo/fedora/releases/10/Everything/$basearch/os/
#repo --name=f10-updates --baseurl=http://localrepo/fedora/updates/10/$basearch/
#repo --name=f11 --baseurl=http://localrepo/fedora/releases/11/Everything/$basearch/os/
#repo --name=f11-updates --baseurl=http://localrepo/fedora/updates/11/$basearch/
#
# Add all the packages after the base packages

View File

@@ -10,7 +10,7 @@
#part iso --size=4998
# Add the repos you wish to use to compose here. At least one of them needs group data.
repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --exclude kernel*debug* --exclude kernel-kdump* --exclude syslog-ng --exclude java-1.5.0-gcj-devel --exclude astronomy-bookmarks --exclude generic* --exclude java-1.5.0-gcj-javadoc --exclude btanks
repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --exclude kernel*debug* --exclude kernel-kdump* --exclude syslog-ng --exclude java-1.5.0-gcj-devel --exclude astronomy-bookmarks --exclude generic* --exclude java-1.5.0-gcj-javadoc --exclude btanks --exclude GConf2-dbus --exclude bluez-gnome
repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
# Package manifest for the compose. Uses repo group metadata to translate groups.

View File

@@ -18,16 +18,16 @@ part / --size 3072 --fstype ext4
services --enabled=NetworkManager --disabled=network,sshd
# To compose against the current release tree, use the following "repo" (enabled by default)
#repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=$basearch
repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=$basearch
# To include updates, use the following "repo" (enabled by default)
#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=$basearch
repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=$basearch
# To compose against rawhide, use the following "repo" (disabled by default)
repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
# To compose against local trees, (edit and) use:
#repo --name=f10 --baseurl=http://localrepo/fedora/releases/10/Everything/$basearch/os/
#repo --name=f10-updates --baseurl=http://localrepo/fedora/updates/10/$basearch/
#repo --name=f11 --baseurl=http://localrepo/fedora/releases/11/Everything/$basearch/os/
#repo --name=f11-updates --baseurl=http://localrepo/fedora/updates/11/$basearch/
%packages
@base-x