import the gpg key since live and cloud is

because that's more useful in openstack. Note does not affect pvgrub
(and therefore ec2)

fedora-arm-base.ks

@@ -50,6 +50,16 @@ uboot-wandboard_quad
 
 %post
 
+# work around for poor key import UI in PackageKit
+rm -f /var/lib/rpm/__db*
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+basearch=armhfp
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+echo "Packages within this LiveCD"
+rpm -qa
+# Note that running rpm recreates the rpm db files which aren't needed or wanted
+rm -f /var/lib/rpm/__db*
+
 # Because memory is scarce resource in most arm systems we are differing from the Fedora
 # default of having /tmp on tmpfs.
 echo "Disabling tmpfs for /tmp."

fedora-cloud-base.ks

@@ -21,7 +21,7 @@ rootpw --lock --iscrypted locked
 
 firewall --disabled
 
-bootloader --timeout=1 --append="console=ttyS0,115200n8 console=tty0" extlinux
+bootloader --timeout=1 --append="console=tty1 console=ttyS0,115200n8" extlinux
 
 network --bootproto=dhcp --device=eth0 --onboot=on
 services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
@@ -195,8 +195,26 @@ yum history new
 yum clean all
 truncate -c -s 0 /var/log/yum.log
 
+echo "Import RPM GPG key"
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+basearch=$(uname -i)
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+echo "Packages within this cloud image:"
+echo "-----------------------------------------------------------------------"
+rpm -qa
+echo "-----------------------------------------------------------------------"
+# Note that running rpm recreates the rpm db files which aren't needed/wanted
+rm -f /var/lib/rpm/__db*
+
+
 echo "Fixing SELinux contexts."
+touch /var/log/cron
+touch /var/log/boot.log
+mkdir -p /var/cache/yum
+chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
+chattr +i /boot/extlinux/ldlinux.sys
 
 echo "Zeroing out empty space."
 # This forces the filesystem to reclaim space from deleted files

fedora-install-cloud.ks

@@ -0,0 +1,99 @@
+# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
+# Maintained by the Fedora Release Engineering team:
+# https://fedoraproject.org/wiki/ReleaseEngineering
+# mailto:rel-eng@lists.fedoraproject.org
+
+# Use a part of 'iso' to define how large you want your isos.
+# Only used when composing to more than one iso.
+# Default is 695 (megs), CD size.
+# Listed below is the size of a DVD if you wanted to split higher.
+#part iso --size=4998
+
+# Add the repos you wish to use to compose here.  At least one of them needs group data.
+
+# Only uncomment repo commands in one of the two following sections.
+# Because the install kickstart doesn't use the updates repo and does 
+# use the source repo, we can't just include fedora-repo.ks
+
+# In the master branch the rawhide repo commands should be uncommented.
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+
+# In non-master branches the fedora repo commands should be uncommented
+#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)
+# @base got renamed to @standard, but @base is still included by default by pungi.
+%packages --default --nobase
+
+# 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*
+-GConf2-dbus*
+-bluez-gnome
+# Periods cause problems in paterns, so replace with *s
+-java-1*8*0-openjdk
+-community-mysql*
+-jruby*
+
+# core
+kernel*
+dracut-*
+
+# Desktops
+
+## common stuff
+@base-x
+@guest-desktop-agents
+@guest-agents
+@standard
+@core
+@dial-up
+@fonts
+@input-methods
+@multimedia
+@hardware-support
+@printing
+@admin-tools
+@basic-desktop
+
+
+@virtualization
+@web-server
+@mongodb
+@perl-web
+@php
+@python-web
+@rubyonrails
+@mysql
+@sql-server
+@jbossas
+
+# Things needed for installation
+@anaconda-tools
+
+# Langpacks
+autocorr-*
+eclipse-nls-*
+hunspell-*
+hyphen-*
+calligra-l10n-*
+kde-l10n-*
+libreoffice-langpack-*
+man-pages-*
+mythes-*
+-gimp-help-*
+
+# Removals
+-PackageKit-zif
+-zif
+%end

fedora-install-server.ks

@@ -0,0 +1,102 @@
+# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
+# Maintained by the Fedora Release Engineering team:
+# https://fedoraproject.org/wiki/ReleaseEngineering
+# mailto:rel-eng@lists.fedoraproject.org
+
+# Use a part of 'iso' to define how large you want your isos.
+# Only used when composing to more than one iso.
+# Default is 695 (megs), CD size.
+# Listed below is the size of a DVD if you wanted to split higher.
+#part iso --size=4998
+
+# Add the repos you wish to use to compose here.  At least one of them needs group data.
+
+# Only uncomment repo commands in one of the two following sections.
+# Because the install kickstart doesn't use the updates repo and does 
+# use the source repo, we can't just include fedora-repo.ks
+
+# In the master branch the rawhide repo commands should be uncommented.
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+
+# In non-master branches the fedora repo commands should be uncommented
+#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)
+# @base got renamed to @standard, but @base is still included by default by pungi.
+%packages --default --nobase
+
+# 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*
+-GConf2-dbus*
+-bluez-gnome
+# Periods cause problems in paterns, so replace with *s
+-java-1*8*0-openjdk
+-community-mysql*
+-jruby*
+
+# core
+kernel*
+dracut-*
+
+# Desktops
+
+## common stuff
+@base-x
+@guest-agents
+@standard
+@core
+@input-methods
+@multimedia
+@hardware-support
+@admin-tools
+@basic-desktop
+
+# Workstation
+@eclipse
+@development-libs
+@development-tools
+@c-development
+@rpm-development-tools
+@fedora-packager
+@virtualization
+@web-server
+@mongodb
+@perl-web
+@php
+@python-web
+@rubyonrails
+@mysql
+@sql-server
+@design-suite
+@jbossas
+
+# Things needed for installation
+@anaconda-tools
+
+# Langpacks
+autocorr-*
+eclipse-nls-*
+hunspell-*
+hyphen-*
+calligra-l10n-*
+kde-l10n-*
+libreoffice-langpack-*
+man-pages-*
+mythes-*
+-gimp-help-*
+
+# Removals
+-PackageKit-zif
+-zif
+%end

fedora-live-base.ks

@@ -280,6 +280,8 @@ systemctl enable tmp.mount
 
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"
 rpm -qa
@@ -301,7 +303,7 @@ rm -f /core*
 
 
 %post --nochroot
-cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL
+cp $INSTALL_ROOT/usr/share/doc/*-release/GPL $LIVE_ROOT/GPL
 
 # only works on x86, x86_64
 if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then

fedora-live-design-suite.ks

@@ -32,6 +32,7 @@ gimp-paint-studio
 gimp-high-pass-filter
 gimp-normalmap
 gimp-resynthesizer
+gimp-separate+
 gpick
 GREYCstoration-gimp 
 hugin 

fedora-lxde-packages.ks

@@ -12,7 +12,9 @@
 @lxde-apps
 @lxde-media
 @lxde-office
-@firefox
+
+# FIXME: can be omitted once comps is updated
+midori
 
 # pam-fprint causes a segfault in LXDM when enabled
 -fprintd-pam
@@ -35,9 +37,6 @@ metacity
 #-man-pages-*
 #-words
 
-# use ssmtp
-ssmtp
-
 # save some space
 -autofs
 -acpid
@@ -50,10 +49,7 @@ ssmtp
 -stix-fonts
 -ibus-typing-booster
 -xscreensaver-extras
--wqy-zenhei-fonts           # FIXME: Workaround to save space, do this in comps
-
-# FIXME: can be removed once mtpaint is gone from lxde-apps in comps
--mtpaint
+#-wqy-zenhei-fonts           # FIXME: Workaround to save space, do this in comps
 
 # drop some system-config things
 -system-config-boot

fedora-mate-packages.ks

@@ -1,6 +1,8 @@
 %packages
 -realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
+-ConsoleKit                 # ConsoleKit is deprecated
+-ConsoleKit-x11             # ConsoleKit is deprecated
 firefox
 @mate
 compiz