Add hardware and network support groups to ARM server (#1569183)

These groups were added to the server environment group in comps
but the change was not mirrored here, so the ARM server disk
image is still missing wifi support etc.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

fedora-arm-base.ks

@@ -6,14 +6,15 @@ firewall --enabled --service=mdns,ssh
 
 bootloader --location=mbr
 
-part /boot/efi --size=80 --fstype vfat --asprimary
+part /boot/fw --size=30 --fstype vfat --asprimary
 part /boot --size=512 --fstype ext4 --asprimary
+part swap --size=512 --fstype swap --asprimary
 part / --size=2800 --fstype ext4 --asprimary
 
 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig
 
-services --enabled=sshd,NetworkManager,avahi-daemon,chronyd,initial-setup,zram-swap
+services --enabled=sshd,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup
 
 %include fedora-repo.ks
 
@@ -21,7 +22,6 @@ services --enabled=sshd,NetworkManager,avahi-daemon,chronyd,initial-setup,zram-s
 @core
 @standard
 @hardware-support
-zram
 
 kernel
 # remove this in %post
@@ -51,8 +51,10 @@ glibc-all-langpacks
 %post
 
 # Setup Raspberry Pi firmware
-cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
-cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
+cp -Pr /usr/share/bcm283x-firmware/* /boot/fw/
+cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/fw/rpi2-u-boot.bin
+cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/fw/rpi3-u-boot.bin
+sed -i '/vfat/ d' /etc/fstab
 
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*

fedora-arm-minimal.ks

@@ -2,6 +2,7 @@
 %include fedora-minimal-common.ks
 
 part /boot --size=512 --fstype ext4
+part swap --size=256 --fstype swap
 part / --size=1256 --fstype ext4
 
 %packages

fedora-atomic.ks

@@ -58,17 +58,30 @@ logvol / --size=3000 --grow --fstype="xfs" --name=root --vgname=atomicos
 
 # Equivalent of %include fedora-repo.ks
 # Pull from the ostree repo that was created during the compose
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/repo/ --ref=fedora/rawhide/${basearch}/atomic-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/repo/ --ref=fedora/28/${basearch}/updates/atomic-host
 
 reboot
 
 %post --erroronfail
-# See https://github.com/projectatomic/rpm-ostree/issues/42
-# Set the ostree repo to the location we want users to upgrade from
-# This location is where the compose gets synced to after the compose
-# is done.
+# Find the architecture we are on
+arch=$(uname -m)
+
+# Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes.
+# We want consumers of this image to track the two week releases.
+ostree admin set-origin --index 0 fedora-atomic https://kojipkgs.fedoraproject.org/atomic/28/ "fedora/28/${arch}/atomic-host"
+
+# Make sure the ref we're supposedly sitting on (according
+# to the updated origin) exists.
+ostree refs "fedora-atomic:fedora/28/${arch}/updates/atomic-host" --create "fedora-atomic:fedora/28/${arch}/atomic-host"
+
+# Remove the old ref so that the commit eventually gets
+# cleaned up.
+ostree refs "fedora-atomic:fedora/28/${arch}/updates/atomic-host" --delete
+
+# delete/add the remote with new options to enable gpg verification
+# and to point them at the cdn url
 ostree remote delete fedora-atomic
-ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-30-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/repo/'
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-28-primary fedora-atomic 'https://dl.fedoraproject.org/atomic/repo/'
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299

fedora-cinnamon-common.ks

@@ -11,9 +11,8 @@
 @networkmanager-submodules
 @cinnamon-desktop
 @libreoffice
-parole
 
 # extra backgrounds
-f29-backgrounds-extras-gnome
+f27-backgrounds-extras-gnome
 
 %end

fedora-cloud-base.ks

@@ -15,9 +15,9 @@
 # For a TDL file, I store one here:
 # https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
 # (Koji generates one internally...what we really want is Koji to publish it statically)
-#
+# 
 # Once you have imagefactory and imagefactory-plugins installed, run:
-#
+# 
 #   curl -O https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
 #   tempfile=$(mktemp --suffix=.ks)
 #   ksflatten -v F22 -c fedora-cloud-base.ks > ${tempfile}
@@ -75,6 +75,7 @@ which
 # Need to also add back plymouth in order to mask failure of
 # systemd-vconsole-setup.service. BZ#1272684. Comment out for now
 #-plymouth
+-NetworkManager
 -iprutils
 # Now that BZ#1199868 is fixed kbd really gets removed but it breaks
 # systemd-vconsole-setup.service on boot. Comment out for now
@@ -240,10 +241,10 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"
 
-# When we build the image with oz, dracut is used
-# and sets up a ifcfg-en<whatever> for the device. We don't
-# want to use this, we use eth0 so it is always the same.
-# So we remove all these ifcfg-en<whatever> devices so
+# When we build the image with oz, dracut is used 
+# and sets up a ifcfg-en<whatever> for the device. We don't 
+# want to use this, we use eth0 so it is always the same. 
+# So we remove all these ifcfg-en<whatever> devices so 
 # The 'network' service can come up cleanly.
 rm -f /etc/sysconfig/network-scripts/ifcfg-en*
 

fedora-disk-base.ks

@@ -14,7 +14,7 @@ timezone US/Eastern
 auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns
-services --enabled=sshd,NetworkManager,chronyd,zram-swap
+services --enabled=sshd,NetworkManager,chronyd
 network --bootproto=dhcp --device=link --activate
 rootpw --lock --iscrypted locked
 shutdown
@@ -33,7 +33,6 @@ firstboot --reconfig
 @core
 @standard
 @hardware-support
-zram
 
 kernel
 # remove this in %post
@@ -46,10 +45,11 @@ rng-tools
 chrony
 bcm283x-firmware
 initial-setup
-# Intel wireless firmware assumed never of use for disk images
 -iwl*
 -ipw*
+-trousers-lib
 -usb_modeswitch
+-iproute-tc
 -generic-release*
 
 # make sure all the locales are available for inital0-setup and anaconda to work
@@ -60,6 +60,8 @@ glibc-all-langpacks
 %post
 
 # Setup Raspberry Pi firmware
+cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/
+mv -f /boot/efi/config-64.txt /boot/efi/config.txt
 cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
 
 releasever=$(rpm -q --qf '%{version}\n' fedora-release)

fedora-disk-minimal.ks

@@ -1,9 +1,9 @@
 %include fedora-disk-base.ks
 %include fedora-minimal-common.ks
 
-services --enabled=sshd,NetworkManager,chronyd,initial-setup,zram-swap
+services --enabled=sshd,NetworkManager,chronyd,initial-setup
 
-autopart --type=plain --noswap
+autopart --type=plain
 
 %packages
 -xkeyboard-config

fedora-disk-server.ks

@@ -1,17 +1,14 @@
 %include fedora-disk-base.ks
 
-services --enabled=sshd,NetworkManager,chronyd,initial-setup,zram-swap
+services --enabled=sshd,NetworkManager,chronyd,initial-setup
 
-autopart --noswap
+autopart
 
 %packages
-# install the default groups for the server environment since installing the environment is not working
+# install the default groups for the server evironment since installing the environment is not working
 @server-product
 @standard
 @headless-management
-@hardware-support
-@networkmanager-submodules
-
 @container-management
 @domain-client
 -initial-setup-gui

fedora-disk-workstation.ks

@@ -4,9 +4,9 @@
 
 bootloader --append="cma=256MB"
 
-services --enabled=sshd,NetworkManager,chronyd,zram-swap
+services --enabled=sshd,NetworkManager,chronyd
 
-autopart --type=plain --noswap
+autopart --type=plain
 
 %packages
 -initial-setup

fedora-docker-base.ks

@@ -5,8 +5,6 @@
 
 %packages --excludedocs --instLangs=en --nocore
 rootfiles
-# https://communityblog.fedoraproject.org/modularity-dead-long-live-modularity/
-fedora-repos-modular
 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
 vim-minimal
 dnf
@@ -23,9 +21,6 @@ rm -rf /tmp/*
 # https://pagure.io/atomic-wg/issue/308
 printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1576993
-systemctl disable dnf-makecache.timer
-
 #Mask mount units and getty service so that we don't get login prompt
 systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service
 

fedora-iot.ks

@@ -1,118 +0,0 @@
-# This is the kickstart for Fedora IoT disk images.
-
-text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
-lang en_US.UTF-8
-keyboard us
-timezone --utc Etc/UTC
-
-auth --useshadow --passalgo=sha512
-selinux --enforcing
-rootpw --lock --iscrypted locked
-
-# Add most common consoles console=ttyAMA0 console=ttyS0 console=ttyS1 as kernel boot parameter
-bootloader --timeout=1 --append="console=tty1 console=ttyS0,115200n8 console=ttyS1,115200n8 console=ttyAMA0,115200n8 net.ifnames=0 modprobe.blacklist=vc4"
-
-network --bootproto=dhcp --device=link --activate --onboot=on
-services --enabled=NetworkManager,sshd,rngd,initial-setup,zram-swap
-
-# tell Initial Setup to run in the reconfig mode
-firstboot --reconfig --enable
-
-zerombr
-clearpart --all --initlabel --disklabel=msdos
-autopart --nohome --noswap --type=plain
-
-# Equivalent of %include fedora-repo.ks
-# Pull from the ostree repo that was created during the compose
-ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/29/${basearch}/iot
-
-reboot
-
-%post --erroronfail
-# Find the architecture we are on
-arch=$(uname -m)
-
-# Setup Raspberry Pi firmware
-if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
-if [[ $arch == "aarch64" ]]; then
-cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
-else
-cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/fw/rpi2-u-boot.bin
-cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/fw/rpi3-u-boot.bin
-fi
-fi
-
-# Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes.
-# We want consumers of this image to track the two week releases.
-ostree admin set-origin --index 0 fedora-iot https://kojipkgs.fedoraproject.org/iot/29/ "fedora/29/${arch}/iot"
-
-# Make sure the ref we're supposedly sitting on (according
-# to the updated origin) exists.
-ostree refs "fedora-iot:fedora/29/${arch}/iot" --create "fedora-iot:fedora/29/${arch}/iot"
-
-# Remove the old ref so that the commit eventually gets cleaned up.
-ostree refs "fedora-iot:fedora/29/${arch}/iot" --delete
-
-# delete/add the remote with new options to enable gpg verification
-# and to point them at the cdn url
-ostree remote delete fedora-iot
-ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary fedora-iot 'https://dl.fedoraproject.org/iot/repo/'
-
-# older versions of livecd-tools do not follow "rootpw --lock" line above
-# https://bugzilla.redhat.com/show_bug.cgi?id=964299
-passwd -l root
-
-# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1193590
-cp /etc/skel/.bash* /var/roothome
-
-echo -n "Network fixes"
-# initscripts don't like this file to be missing.
-cat > /etc/sysconfig/network << EOF
-NETWORKING=yes
-NOZEROCONF=yes
-EOF
-
-# Remove any persistent NIC rules generated by udev
-rm -vf /etc/udev/rules.d/*persistent-net*.rules
-# And ensure that we will do DHCP on eth0 on startup
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-PERSISTENT_DHCLIENT="yes"
-EOF
-
-echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/systemd/random-seed
-
-echo "Packages within this iot 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 "Zeroing out empty space."
-# This forces the filesystem to reclaim space from deleted files
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
-
-# For trac ticket https://pagure.io/atomic-wg/issue/128
-rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
-
-echo "Adding Developer Mode GRUB2 menu item."
-/usr/libexec/atomic-devmode/bootentry add
-
-# Disable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network off
-
-# Anaconda is writing an /etc/resolv.conf from the install environment.
-# The system should start out with an empty file, otherwise cloud-init
-# will try to use this information and may error:
-# https://bugs.launchpad.net/cloud-init/+bug/1670052
-truncate -s 0 /etc/resolv.conf
-
-%end

fedora-kde-common.ks

@@ -5,6 +5,7 @@
 @kde-desktop
 @kde-media
 @kde-office
+@kde-telepathy
 @networkmanager-submodules
 
 ### The KDE-Desktop

fedora-live-base.ks

@@ -49,7 +49,6 @@ memtest86+
 
 # The point of a live image is to install
 anaconda
-anaconda-install-env-deps
 @anaconda-tools
 
 # Need aajohan-comfortaa-fonts for the SVG rnotes images
@@ -95,10 +94,11 @@ livedir="LiveOS"
 for arg in \`cat /proc/cmdline\` ; do
   if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then
     livedir=\${arg##rd.live.dir=}
-    continue
+    return
   fi
   if [ "\${arg##live_dir=}" != "\${arg}" ]; then
     livedir=\${arg##live_dir=}
+    return
   fi
 done
 
@@ -153,6 +153,7 @@ findPersistentHome() {
   for arg in \`cat /proc/cmdline\` ; do
     if [ "\${arg##persistenthome=}" != "\${arg}" ]; then
       homedev=\${arg##persistenthome=}
+      return
     fi
   done
 }
@@ -205,10 +206,6 @@ systemctl --no-reload disable atd.service 2> /dev/null || :
 systemctl stop crond.service 2> /dev/null || :
 systemctl stop atd.service 2> /dev/null || :
 
-# turn off abrtd on a live image
-systemctl --no-reload disable abrtd.service 2> /dev/null || :
-systemctl stop abrtd.service 2> /dev/null || :
-
 # Don't sync the system clock when running live (RHBZ #1018162)
 sed -i 's/rtcsync//' /etc/chrony.conf
 

fedora-live-cinnamon.ks

@@ -7,6 +7,7 @@
 # - Dan Book <grinnz@grinnz.com>
 
 %include fedora-live-base.ks
+%include fedora-live-minimization.ks
 %include fedora-cinnamon-common.ks
 
 part / --size=6144

fedora-live-design_suite.ks

@@ -32,8 +32,8 @@ powerline
 powerline-fonts
 
 # Extra wallpapers
-f28-backgrounds-extras-base
-f28-backgrounds-extras-gnome
+# f26-backgrounds-extras-base
+# f26-backgrounds-extras-gnome
 
 # removal of unneeded applications
 -gnome-boxes

fedora-live-kde.ks

@@ -12,7 +12,7 @@
 %include fedora-kde-minimization.ks
 
 # DVD payload
-part / --size=6500
+part / --size=6200
 
 %post
 %end

fedora-live-minimization.ks

@@ -5,8 +5,13 @@
 
 # save some space
 -mpage
+-sox
 -hplip
+-numactl
 -isdn4k-utils
+-autofs
+# smartcards won't really work on the livecd.
+-coolkey
 
 # scanning takes quite a bit of space :/
 -xsane

fedora-live-scientific_kde.ks

@@ -10,11 +10,168 @@
 
 %include fedora-live-kde-base.ks
 %include fedora-live-minimization.ks
-%include fedora-scientific-common.ks
 
 # The recommended part size for DVDs is too close to use for the scientific spin
 part / --size 14500
 
+%packages
+
+# Installing the default/mandatory packages from engineering & scientific
+@engineering-and-scientific
+
+# scilab
+#scilab
+#scilab-devel
+#scilab-doc
+
+# Remove sagemath explicitly?
+-sagemath
+
+#Devel tools
+
+#Install the mandatory packages from dev-tools and dev-libs
+# C/C++ compiler, gdb, autotools, bison, flex, make, strace..
+@development-tools
+@development-libs
+@c-development
+@rpm-development-tools
+#others, not included
+# C++ libraries
+blitz-devel
+armadillo-devel
+
+# Misc. related utils
+ddd
+valgrind
+
+#python 2 tools/libraries not included from the groups
+python2-tools
+python-ipython
+python-ipython-console
+python-ipython-notebook
+sympy
+#python-networkx
+python-pandas
+
+#python 3 and tools/libraries not included from the groups
+python3
+python3-tools
+python3-matplotlib
+python3-scipy
+python3-numpy
+python3-ipython
+python3-ipython-console
+python3-ipython-notebook
+python3-sympy
+#python3-networkx
+python3-pandas
+
+# matplotlib backends
+python-matplotlib-qt4
+python-matplotlib-tk
+python3-matplotlib-qt4
+python3-matplotlib-tk
+
+# Include Java development tools
+@java-development
+apache-commons-math
+
+#fortran compiler
+gcc-gfortran
+
+# GUI for R
+#rkward
+
+# GUI for Octave
+qtoctave
+
+# julia
+julia
+julia-doc
+
+# IDEs for the IDE folks
+@eclipse
+spyder
+
+#writing & publishing
+emacs
+emacs-color-theme
+vim
+scribus
+#scite
+lyx
+kile
+
+#Presentation, Bibliography & Document arrangement 
+#tools
+BibTool
+pdfshuffler
+
+# Parallel/Distributed computing libraries/tools
+openmpi
+openmpi-devel
+valgrind-openmpi
+libgomp
+python-pp
+mpi4py-openmpi
+python3-mpi4py-openmpi
+
+#Version control- a GUI for each as well
+
+# Installing rapidsvn will also install subversion package
+rapidsvn 
+git
+git-gui
+# Mercurial
+mercurial
+mercurial-hgk
+
+#Backup Utilities
+backintime-kde
+
+#needs to install this specifically because of some conflict between openmpi
+#and emacs (http://lists.fedoraproject.org/pipermail/devel/2011-July/153812.html)
+libotf
+
+#root
+root
+root-gui-fitpanel
+root-python
+
+#Multiple jobs/clustering system
+# torque
+# torque-server
+# torque-scheduler
+# torque-gui
+# torque-libs
+# torque-mom
+# python-pbs
+
+#Drawing, Picture viewing tools, Visualization tools
+dia
+inkscape
+xzgv
+gimp
+ggobi
+ggobi-devel
+#g3data
+#Mayavi
+
+#Misc. Utils
+screen
+tmux
+rlwrap
+hexchat
+shutter
+fig2ps
+bibtex2html
+hevea
+
+#Include Mozilla Firefox
+firefox
+
+%end
+
 %post
 
 %end

fedora-live-soas.ks

@@ -5,6 +5,8 @@
 #
 # Maintainers:
 # - Peter Robinson <pbrobinson AT gmail DOT com>
+# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
+# - Mel Chua <mchua AT fedoraproject DOT org>
 
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks

fedora-lxqt-common.ks

@@ -5,7 +5,6 @@
 #
 # Maintainer(s):
 # – Christian Dersch <lupinix@fedoraproject.org>
-# – Zamir SUN <zsun@fedoraproject.org>
 #
 
 %packages
@@ -27,9 +26,6 @@ pavucontrol-qt-l10n
 # MP3
 gstreamer1-plugin-mpg123
 
-# Text Editor
-enki
-
 # remove unneeded stuff to get a lightweight system
 # fonts (we make no bones about admitting we're english-only)
 wqy-microhei-fonts          # a compact CJK font, to replace:
@@ -45,8 +41,7 @@ wqy-microhei-fonts          # a compact CJK font, to replace:
 -@input-methods
 -scim*
 -m17n*
-# Temporary include ibus to workaround RHBZ 1633225
-# -ibus*
+-ibus*
 -iok
 
 # Fix https://bugzilla.redhat.com/show_bug.cgi?id=1429132

fedora-mate-common.ks

@@ -35,6 +35,7 @@ nss-mdns
 # Drop things for size
 -@3d-printing
 -brasero
+-colord
 -fedora-icon-theme
 -gnome-icon-theme
 -gnome-icon-theme-symbolic

fedora-minimal-common.ks

@@ -3,10 +3,6 @@
 -initial-setup-gui
 -generic-release*
 -glibc-all-langpacks
-# recommended by iproute, we don't want it in minimal
--iproute-tc
-# recommended by gnutls, we don't want it in minimal
--trousers
 glibc-langpack-en
 iw
 NetworkManager-wifi

fedora-modular-disk-minimal.ks

@@ -56,6 +56,8 @@ dhcp-client
 %post
 
 # Setup Raspberry Pi firmware
+#cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/
+mv -f /boot/efi/config-64.txt /boot/efi/config.txt
 cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
 
 releasever=$(rpm -q --qf '%{version}\n' fedora-modular-release)

fedora-repo.ks

@@ -3,7 +3,7 @@
 # Exactly one of the following should be uncommented
 
 # For the master branch the following should be uncommented
-%include fedora-repo-rawhide.ks
+# %include fedora-repo-rawhide.ks
 
 # For non-master branches the following should be uncommented
-# %include fedora-repo-not-rawhide.ks
+%include fedora-repo-not-rawhide.ks

fedora-scientific-common.ks

@@ -1,162 +0,0 @@
-%packages
-
-# Installing the default/mandatory packages from engineering & scientific
-@engineering-and-scientific
-
-# scilab
-scilab
-scilab-devel
-scilab-doc
-
-# Remove sagemath explicitly?
--sagemath
-
-#Devel tools
-
-#Install the mandatory packages from dev-tools and dev-libs
-# C/C++ compiler, gdb, autotools, bison, flex, make, strace..
-@development-tools
-@development-libs
-@c-development
-@rpm-development-tools
-#others, not included
-# C++ libraries
-blitz-devel
-armadillo-devel
-
-# Misc. related utils
-ddd
-valgrind
-
-#python 2 tools/libraries not included from the groups
-python2-tools
-python-ipython
-python-ipython-console
-python-ipython-notebook
-sympy
-python-networkx
-python-pandas
-
-#python 3 and tools/libraries not included from the groups
-python3
-python3-tools
-python3-matplotlib
-python3-scipy
-python3-numpy
-python3-ipython
-python3-ipython-console
-python3-ipython-notebook
-python3-sympy
-python3-networkx
-python3-pandas
-
-# matplotlib backends
-python-matplotlib-qt4
-python-matplotlib-tk
-python3-matplotlib-qt4
-python3-matplotlib-tk
-
-# Include Java development tools
-@java-development
-apache-commons-math
-
-#fortran compiler
-gcc-gfortran
-
-# GUI for R
-rkward
-
-# GUI for Octave
-qtoctave
-
-# julia
-# Comment out till build failure is sorted
-# julia
-# julia-doc
-
-# IDEs for the IDE folks
-@eclipse
-
-# Workaround for https://pagure.io/releng/issue/7814
--eclipse-linuxtools-vagrant
-
-spyder
-
-#writing & publishing
-emacs
-emacs-color-theme
-vim
-scribus
-#scite
-lyx
-kile
-
-#Presentation, Bibliography & Document arrangement 
-#tools
-BibTool
-pdfshuffler
-
-# Parallel/Distributed computing libraries/tools
-openmpi
-openmpi-devel
-valgrind-openmpi
-libgomp
-python-pp
-mpi4py-openmpi
-python3-mpi4py-openmpi
-
-#Version control- a GUI for each as well
-
-# Installing rapidsvn will also install subversion package
-rapidsvn 
-git
-git-gui
-# Mercurial
-mercurial
-mercurial-hgk
-
-#Backup Utilities
-backintime-kde
-
-#needs to install this specifically because of some conflict between openmpi
-#and emacs (http://lists.fedoraproject.org/pipermail/devel/2011-July/153812.html)
-libotf
-
-#root
-root
-root-gui-fitpanel
-root-python
-
-#Multiple jobs/clustering system
-# torque
-# torque-server
-# torque-scheduler
-# torque-gui
-# torque-libs
-# torque-mom
-# python-pbs
-
-#Drawing, Picture viewing tools, Visualization tools
-dia
-inkscape
-xzgv
-gimp
-ggobi
-ggobi-devel
-#g3data
-#Mayavi
-
-#Misc. Utils
-screen
-tmux
-rlwrap
-hexchat
-shutter
-fig2ps
-bibtex2html
-hevea
-
-#Include Mozilla Firefox
-firefox
-
-%end

fedora-scientific-vagrant.ks

@@ -1,12 +0,0 @@
-# Fedora Scientific  Vagrant box
-
-# Fedora Scientific: For researchers in Science and Engineering
-# Fedora-Scientific aims to create a Fedora which has the generic
-# toolset for the researcher
-# Web: https://labs.fedoraproject.org/en/scientific/
-
-# Maintainer: Amit Saha <amitksaha@fedoraproject.org>
-#             https://fedoraproject.org/wiki/User:Amitksaha
-
-%include fedora-cloud-base-vagrant.ks
-%include fedora-scientific-common.ks

fedora-soas-common.ks

@@ -76,10 +76,6 @@ pulseaudio-utils
 # http://bugs.sugarlabs.org/ticket/1951
 rp-pppoe
 
-# Useful for SoaS duplication from:
-# http://bugs.sugarlabs.org/ticket/74
-livecd-tools
-
 # Get the Sugar boot screen
 -plymouth-system-theme
 -plymouth-theme-charge
@@ -92,7 +88,7 @@ sugar-logos
 # Rebuild initrd for Sugar boot screen
 KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
 /usr/sbin/plymouth-set-default-theme sugar
-dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
+/sbin/dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
 
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*
@@ -163,16 +159,6 @@ show-logout=false
 [org.sugarlabs.power]
 automatic=true
 EOF
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
-# For lorax/livemedia-creator builds.
-sed -i '
-/## make boot.iso/ i\
-# Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
-<% f = "usr/bin/livecd-iso-to-disk" %>\
-%if exists(f):\
-    install ${f} ${LIVEDIR}/${f|basename}\
-%endif\
-' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
+/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
 
 %end

fedora-xfce-common.ks

@@ -38,5 +38,6 @@ system-config-printer
 -desktop-backgrounds-basic
 -aspell-*                   # dictionaries are big
 -xfce4-sensors-plugin
+-foomatic-db-ppds
 
 %end

l10n/fedora-live-workstation-ja_JP.ks

@@ -1,40 +0,0 @@
-# fedora-live-workstation-ja_JP.ks
-#
-# Description:
-# - Japanese Fedora Live Spin with the Gnome Desktop Environment
-#
-# Maintainer(s):
-# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
-
-%include ../fedora-live-workstation.ks
-
-lang ja_JP.UTF-8
-keyboard jp
-timezone Asia/Tokyo
-
-%packages
-@japanese-support
-# exclude input methods except ibus:
--m17n*
--scim*
--iok
-# ibus stuff
-ibus-kkc
-imsettings
-%end
-
-%post
-cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
-# Read and parsed by systemd-localed. It's probably wise not to edit this file
-# manually too freely.
-Section "InputClass"
-        Identifier "system-keyboard"
-        MatchIsKeyboard "on"
-        Option "XkbLayout" "jp"
-        Option "XkbModel" "jp106"
-EndSection
-EOF
-
-gsettings set org.gnome.desktop.input-sources sources "[('ibus', 'kkc'), ('xkb', 'jp')]"
-
-%end

l10n/fedora-livecd-kde-ja_JP.ks

@@ -1,40 +0,0 @@
-# fedora-livecd-kde-ja_JP.ks
-#
-# Description:
-# - Japanese Fedora Live Spin with the KDE Desktop Environment
-#
-# Maintainer(s):
-# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
-
-%include ../fedora-live-kde.ks
-
-lang ja_JP.UTF-8
-keyboard jp
-timezone Asia/Tokyo
-
-%packages
-@japanese-support
-# exclude input methods except ibus:
--m17n*
--scim*
--iok
-# ibus-stuff 
-fcitx-qt5
-ibus-kkc
-ibus-mozc
-ibus-qt
-kcm-fcitx
-%end
-
-%post
-cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
-# Read and parsed by systemd-localed. It's probably wise not to edit this file
-# manually too freely.
-Section "InputClass"
-        Identifier "system-keyboard"
-        MatchIsKeyboard "on"
-        Option "XkbLayout" "jp"
-        Option "XkbModel" "jp106"
-EndSection
-EOF
-%end

l10n/fedora-livecd-lxde-ja_JP.ks

@@ -14,9 +14,10 @@ timezone Asia/Tokyo
 
 %packages
 @japanese-support
-# exclude input methods except ibus:
+# exclude input methods:
 -m17n*
 -scim*
+-ibus*
 -iok
 # Better more popular browser
 firefox

l10n/fedora-livedvd-games-ja_JP.ks

@@ -1,40 +0,0 @@
-# fedora-livedvd-games-ja_JP.ks
-#
-# Description:
-# - Japanese Fedora Live Spin with the game Desktop Environment
-# 
-# Maintainer(s):
-# - Mika Tsukada  <mika.tsukada@miraclelinux.com>
-
-%include ../fedora-live-games.ks
-
-lang ja_JP.UTF-8
-keyboard ja
-timezone Asia/Tokyo
-
-%packages
-@japanese-support
-# exclude input methods except ibus:
--m17n*
--scim*
--iok
-glibc-langpack-ja
-# ibus-stuff
-ibus-kkc
-ibus-mozc
-%end
-
-%post
-cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
-# Read and parsed by systemd-localed. It's probably wise not to edit this file
-# manually too freely.
-Section "InputClass"
-        Identifier "system-keyboard"
-        MatchIsKeyboard "on"
-        Option "XkbLayout" "jp"
-        Option "XkbModel" "jp106"
-EndSection
-EOF
-%end
-
-