From 66d1b8d816c85d7ab6b21424e84f2cb4b73317b1 Mon Sep 17 00:00:00 2001
From: Bruno Wolff III <bruno@wolff.to>
Date: Sat, 29 Jun 2013 11:15:20 -0500
Subject: [PATCH] Move forced excludes out of repo commands

Because pungi is an inclusive depsolver we can exclude some packages it
brings in and still get all of what we need. In particular we need to do
this to save space.

At one time only excludes on the repo commands were truly forced. It
had been the case that packages excluded in the %packages section
could still be included to satisfy dependencies. This is no longer the
case.

Doing the excludes in the packages sections allows us to list the
packages just once and it makes overriding the repo commands simpler
since the excludes don't need to be repeated.
---
 fedora-install-fedora.ks | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks
index 2f88d60..f014584 100644
--- a/fedora-install-fedora.ks
+++ b/fedora-install-fedora.ks
@@ -10,18 +10,33 @@
 #part iso --size=4998
 
 # Add the repos you wish to use to compose here.  At least one of them needs group data.
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --exclude kernel*debug* --exclude kernel-kdump* --exclude kernel-tools* --exclude syslog-ng* --exclude astronomy-bookmarks --exclude generic* --exclude btanks* --exclude GConf2-dbus* --exclude bluez-gnome --exclude java-1.8.0-openjdk --exclude community-mysql* --exclude jruby*
-repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --exclude kernel*debug* --exclude kernel-kdump* --exclude kernel-tools* --exclude syslog-ng* --exclude astronomy-bookmarks --exclude generic* --exclude btanks* --exclude GConf2-dbus* --exclude bluez-gnome --exclude java-1.8.0-openjdk --exclude community-mysql* --exclude jruby*
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
 
 
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
 %packages --default
+
+# pungi is an inclusive depsolver so that multiple packages are brought 
+# in to satisify dependencies and we don't always want that. So we  use
+# an exclusion list to cut out things we don't want
+
+-kernel*debug*
+-kernel-kdump*
+-kernel-tools*
+-syslog-ng*
+-astronomy-bookmarks
+-generic*
+-btanks*
+-GConf2-dbus*
+-bluez-gnome
+-java-1.8.0-openjdk
+-community-mysql*
+-jruby*
+
 # core
 kernel*
--kernel-tools*
--kernel-debug*
--kernel-PAEdebug*
 dracut-*
 
 # Desktops