From cb9c3876b7fef7bfded64c263a5ae9cfc8041ec1 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 2 Jun 2009 12:15:58 -0700 Subject: [PATCH 1/5] Exclude packages which are causing conflicts --- fedora-install-fedora.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks index bdb1c73..f9c1ccd 100644 --- a/fedora-install-fedora.ks +++ b/fedora-install-fedora.ks @@ -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. From 3e28840706c73680c60e8cfa8011be71745688f3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 2 Jun 2009 16:16:08 -0700 Subject: [PATCH 2/5] Drop all of GConf2-dbus* --- fedora-install-fedora.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks index f9c1ccd..d1f7941 100644 --- a/fedora-install-fedora.ks +++ b/fedora-install-fedora.ks @@ -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 --exclude GConf2-dbus --exclude bluez-gnome +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. From f3bdc1672b1f91f9e9ec143f6039c4ec033f1add Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 11 Jun 2009 10:46:01 +1000 Subject: [PATCH 3/5] - update example repos from f10 to f11 - comment out -debuginfo to avoid annoying warning every spin debuginfo should only get pulled in if a debuginfo repo is explicitly enabled and someone might actually want to have it for testing say, so hope we can drop it completely --- fedora-live-base.ks | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 64fbbe9..d476c1e 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -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 # 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 @@ -84,8 +84,9 @@ sendmail anaconda isomd5sum -# make sure debuginfo doesn't end up on the live image --*debuginfo +# commented out to avoid warning +# # make sure debuginfo doesn't end up on the live image +#-*debuginfo %end %post From f1c7268d7b7af08af0cc9b75d82b2da0250cc803 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 22 Jun 2009 14:18:23 +1000 Subject: [PATCH 4/5] totem-gstreamer was dropped from rawhide --- fedora-livecd-desktop.ks | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index 8a07fcb..9c971cc 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -36,7 +36,8 @@ festvox-slt-arctic-hts -evolution-help -gnome-games -gnome-games-help -totem-gstreamer +# gone from rawhide +#totem-gstreamer -totem-xine -nss_db -vino From 6a6e3abe47ea1a3b892f6dafadbaedef7d716c63 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 23 Jun 2009 10:07:04 +1000 Subject: [PATCH 5/5] totem-xine is gone too (so totem-gstreamer moved into totem) --- fedora-livecd-desktop.ks | 3 --- 1 file changed, 3 deletions(-) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index 9c971cc..ed57ff0 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -36,9 +36,6 @@ festvox-slt-arctic-hts -evolution-help -gnome-games -gnome-games-help -# gone from rawhide -#totem-gstreamer --totem-xine -nss_db -vino -isdn4k-utils