Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dziallas <sebastian@when.com>2009-05-28 15:02:59 (GMT)
committer Sebastian Dziallas <sebastian@when.com>2009-05-28 15:02:59 (GMT)
commitc68167984f618da253e4096d3bb86df52ceae679 (patch)
tree479817baa1b83f42bf9c374e9c7d5a5887ede3ff
parent29a49236be0f29b1654ea95e82e6ced67555c4dc (diff)
fix excludes due to updated sugar repo
-rw-r--r--soas-appliance.ks10
-rw-r--r--soas-base.ks6
2 files changed, 11 insertions, 5 deletions
diff --git a/soas-appliance.ks b/soas-appliance.ks
index 2091dd5..655ce3d 100644
--- a/soas-appliance.ks
+++ b/soas-appliance.ks
@@ -19,10 +19,10 @@ part / --size 1536 --fstype ext3 --ondisk sda
repo --name=sugar --baseurl=http://download.sugarlabs.org/soas/repositories/2/
# compose against rawhide now again
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386 --excludepkgs=abiword,libabiword,generic-logos,plymouth,plymouth-*,PolicyKit-kde
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386 --excludepkgs=abiword,libabiword,generic-release,generic-release-notes,plymouth,plymouth-*,PolicyKit-kde
# use if mirrors are outdated
-# repo --name=rawhide --baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/i386/os/ --excludepkgs=abiword,libabiword,generic-logos,plymouth,plymouth-*,PolicyKit-kde
+# repo --name=rawhide --baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/i386/os/ --excludepkgs=abiword,libabiword,generic-release,generic-release-notes,plymouth,plymouth-*,PolicyKit-kde
%packages --excludedocs --instLangs en_US
@@ -175,9 +175,13 @@ gstreamer-plugins-espeak
-compiz-gnome
-nautilus-cd-burner-PackageKit*
-# strip fedora trademarks
+# strip fedora trademarks and use the soas release package
-fedora-logos
+-fedora-release
+-fedora-release-notes
generic-logos
+generic-release
+generic-release-notes
# make sure debuginfo doesn't end up on the live image
-*debuginfo
diff --git a/soas-base.ks b/soas-base.ks
index 0939bb7..6bc6f78 100644
--- a/soas-base.ks
+++ b/soas-base.ks
@@ -10,10 +10,10 @@ part / --size 2048
services --enabled=NetworkManager --disabled=acpid,auditd,cups,dnsmasq,exim,ip6tables,iptables,irda,kerneloops,mdmonitor,netfs,network,nfs,nfslock,nscd,portreserve,rpcbind,rpcgssd,rpcidmapd,sshd
# compose against rawhide now again
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386 --excludepkgs=abiword,libabiword,generic-logos,generic-release,generic-release-notes,plymouth,plymouth-*,PolicyKit-kde
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386 --excludepkgs=abiword,libabiword,generic-release,generic-release-notes,plymouth,plymouth-*,PolicyKit-kde
# use if mirrors are outdated
-# repo --name=rawhide --baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/i386/os/ --excludepkgs=abiword,libabiword,generic-logos,generic-release,generic-release-notes,plymouth,plymouth-*,PolicyKit-kde
+# repo --name=rawhide --baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/i386/os/ --excludepkgs=abiword,libabiword,generic-release,generic-release-notes,plymouth,plymouth-*,PolicyKit-kde
%packages
@base
@@ -113,8 +113,10 @@ kernel
# strip fedora trademarks and use the soas release package
-fedora-logos
-fedora-release
+-fedora-release-notes
generic-logos
generic-release
+generic-release-notes
# bits to set up the livecd while anaconda has been removed here
isomd5sum