Bump Jam_KDE root size a bit

It's failing on Rawhide and F41 because it's running out of
space. It's a few hundred megs over, so let's give it an extra
gig.

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

fedora-cinnamon-common.ks

@@ -14,6 +14,9 @@ fedora-release-cinnamon
 @^cinnamon-desktop-environment
 
 @libreoffice
-exaile
+rhythmbox
+
+# extra backgrounds
+f36-backgrounds-extras-gnome
 
 %end

fedora-comp-neuro-common.ks

@@ -0,0 +1,29 @@
+# Description: Packages for the NeuroFedora computational neuroscience lab image.
+#
+# Maintained by the NeuroFedora SIG:
+# https://neuro.fedoraproject.org
+# mailto:neuro-sig@lists.fedoraproject.org
+
+%packages
+fedora-release-compneuro
+# Includes numpy, scipy, jupyter, pandas, scikit, scipy, statsmodels, sympy, matplotlib
+@python-science
+
+#Computational neuroscience packages
+arbor
+genesis-simulator
+moose
+nest
+neuron
+neuron-devel
+python3
+python3-brian2
+python3-ipython
+python3-lfpy
+python3-nest
+python3-netpyne
+python3-neuron
+python3-pynn
+python3-steps
+
+%end

fedora-disk-minimal.ks

@@ -0,0 +1,6 @@
+%include fedora-disk-base.ks
+%include fedora-minimal-common.ks
+
+services --enabled=sshd,NetworkManager,chronyd,initial-setup
+
+autopart --type=plain --noswap

fedora-disk-workstation.ks

@@ -7,7 +7,5 @@ autopart --type=btrfs --noswap
 %packages
 -initial-setup
 -initial-setup-gui
-gnome-initial-setup
-anaconda-webui
 
 %end

fedora-iot.ks

@@ -0,0 +1,88 @@
+# 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
+
+selinux --enforcing
+rootpw --lock --iscrypted locked
+
+bootloader --timeout=1 --append="modprobe.blacklist=vc4"
+
+network --bootproto=dhcp --device=link --activate --onboot=on
+services --enabled=NetworkManager,sshd
+
+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/41/${basearch}/iot
+
+reboot
+
+%post --erroronfail
+
+# Find the architecture we are on
+arch=$(uname -m)
+# Setup Raspberry Pi firmware
+if [[ $arch == "aarch64" ]]; then
+cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
+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://dl.fedoraproject.org/iot/repo/ "fedora/41/${arch}/iot"
+
+# Make sure the ref we're supposedly sitting on (according
+# to the updated origin) exists.
+ostree refs "fedora-iot:fedora/41/${arch}/iot" --create "fedora-iot:fedora/41/${arch}/iot"
+
+# Remove the old ref so that the commit eventually gets cleaned up.
+ostree refs "fedora-iot:fedora/41/${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/ --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist  fedora-iot 'https://ostree.fedoraproject.org/iot'
+
+# We're getting a stray console= from somewhere, work around it
+rpm-ostree kargs --delete=console=tty0
+
+# 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
+
+# Remove any persistent NIC rules generated by udev
+rm -vf /etc/udev/rules.d/*persistent-net*.rules
+
+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 --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
+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.)"
+
+rm -f /etc/NetworkManager/system-connections/*.nmconnection
+
+# 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-live-astronomy_kde.ks

@@ -13,8 +13,6 @@
 
 # Maintainer: Christian Dersch <lupinix@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Lupinix
-# Co-Maintainer: JT Pennington <q5sys@fedoraproject.org>
-#             https://fedoraproject.org/wiki/User:q5sys
 
 %include fedora-live-kde-base.ks
 %include fedora-live-minimization.ks
@@ -83,6 +81,7 @@ python3-astroML
 python3-astroquery
 python3-astroscrappy
 python3-APLpy
+python3-ATpy
 python3-ccdproc
 python3-fitsio
 python3-gatspy

fedora-live-base.ks

@@ -31,6 +31,7 @@ kernel-modules
 kernel-modules-extra
 
 # The point of a live image is to install
+anaconda
 anaconda-install-env-deps
 anaconda-live
 @anaconda-tools

fedora-live-cinnamon.ks

@@ -9,7 +9,7 @@
 %include fedora-live-base.ks
 %include fedora-cinnamon-common.ks
 
-part / --size=9216
+part / --size=8192
 
 %post
 # cinnamon configuration

fedora-live-comp_neuro.ks

@@ -0,0 +1,12 @@
+# Description: The Workstation based NeuroFedora computational neuroscience lab image.
+# https://fedoraproject.org/wiki/Changes/Comp_Neuro_Lab
+#
+# Maintained by the NeuroFedora SIG:
+# https://neuro.fedoraproject.org
+# mailto:neuro-sig@lists.fedoraproject.org
+
+%include fedora-live-workstation.ks
+%include fedora-comp-neuro-common.ks
+%include fedora-neuro-gnome-common.ks
+
+part / --size 10240

fedora-live-games.ks

@@ -17,7 +17,8 @@
 
 %include fedora-live-xfce.ks
 
-part / --size 15360
+# The recommended part size for DVDs is too close to use for the games spin
+part / --size 14336
 
 %packages
 
@@ -26,7 +27,8 @@ part / --size 15360
 
 -wine
 
-# Remove libreoffice, we're here to have fun!
+# Remove libreoffice since it just got added to livecd-desktop and
+# will likely put the games spin over size and it is freeze time.
 -libreoffice*
 
 # Extra screensavers isn't much help for the games spin
@@ -44,10 +46,12 @@ armacycles-ad
 asc
 asc-music
 astromenace
+# beneath-a-steel-sky-cd scummvm games cut for size
 boswars
 bzflag
 crossfire-client
 extremetuxracer
+# flight-of-the-amazon-queen-cd scummvm games cut for size
 freeciv
 freecol
 freedoom
@@ -55,6 +59,9 @@ freedroidrpg
 frozen-bubble
 # glob2 - currently broken
 lincity-ng
+#tmw - currently broken
+#maniadrive - currently broken
+#maniadrive-music - has been retired
 megaglest
 nethack-vultures
 netpanzer
@@ -92,6 +99,7 @@ knights
 lbrickbuster2
 # liquidwar # Would pull in fluid-soundfont-lite-patches
 lordsawar
+# lure scummvm games cut for size
 # machineball # Would pull in fluid-soundfont-lite-patches
 nethack
 openlierox
@@ -99,7 +107,7 @@ pachi
 pioneers
 quarry
 # Ri-li cut for size
-rogue
+# rogue # recently abandoned. Someone picked it up. Waiting for approval.
 # scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
 solarwolf
 sopwith

fedora-live-mate_compiz.ks

@@ -7,7 +7,7 @@
 %include fedora-mate-common.ks
 %include fedora-live-minimization.ks
 
-part / --size 9216
+part / --size 8192
 
 %post
 # set livesys session type

fedora-live-scientific_kde.ks

@@ -12,7 +12,7 @@
 %include fedora-live-minimization.ks
 %include fedora-scientific-common.ks
 
-part / --size 18000
+part / --size 17000
 
 %post
 

fedora-live-security.ks

@@ -61,6 +61,7 @@ gnome-keyring-pam
 -binwalk
 -bkhive
 -bonesi
+-bro
 -cmospwd
 -dnstop
 -etherape
@@ -78,6 +79,7 @@ gnome-keyring-pam
 -pdfcrack
 -proxychains
 -pyrit
+-raddump
 -rkhunter
 -safecopy
 -samdump2

fedora-live-sway.ks

@@ -13,8 +13,6 @@
 %include fedora-live-minimization.ks
 %include fedora-sway-common.ks
 
-part / --size 6144
-
 %packages
 # To be able to show installation instructions on background
 nwg-wrapper

fedora-live-workstation.ks

@@ -12,11 +12,6 @@
 
 part / --size 8576
 
-%packages
-gnome-initial-setup
-anaconda-webui
-%end
-
 %post
 
 # set livesys session type

fedora-minimal-common.ks

@@ -0,0 +1,23 @@
+%packages
+dnf5
+-@standard
+-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
+%end
+
+%post
+
+# setup systemd to boot to the right runlevel
+echo -n "Setting default runlevel to multiuser text mode"
+systemctl set-default multi-user.target
+echo .
+
+%end

fedora-neuro-gnome-common.ks

@@ -0,0 +1,30 @@
+# Description: Common gnome based configuration for NeuroFedora spin images.
+#
+# Maintained by the NeuroFedora SIG:
+# https://neuro.fedoraproject.org
+# mailto:neuro-sig@lists.fedoraproject.org
+
+# Please specify the individual package sets in their own ks files:
+# - fedora-comp-neuro-common.ks
+
+%packages
+@firefox
+
+# Editors
+emacs
+vim-X11
+
+# This is no longer workstation
+-@workstation-product
+
+# No Workstation backgrounds
+#-desktop-backgrounds-basic
+#-*backgrounds-extras
+%end
+
+%post
+
+#Override the favorite desktop application in Dash
+sed -i "s/favorite-apps=."'*'"/favorite-apps=['firefox.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.gedit.desktop', 'anaconda.desktop']/" /etc/rc.d/init.d/livesys
+
+%end

fedora-server-vm-full.ks

@@ -162,10 +162,6 @@ if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
  sed -i -e 's|console=tty0||g' /boot/loader/entries/*conf
 fi
 
-# Trigger lvm-devices-import.path and .service to create
-# a new /etc/lvm/devices/system.devices for the root VG.
-rm -f /etc/lvm/devices/system.devices
-touch /etc/lvm/devices/auto-import-rootvg
 
 # Remove machine-id on pre generated images
 rm -f /etc/machine-id

maintainers.toml

@@ -20,10 +20,6 @@ maintainers = [ "Rex Dieter", "Marc Deop", "Neal Gompa" ]
 fas = [ "grinnz" ]
 maintainers = [ "Dan Book" ]
 
-[spins.mate_compiz.x86_64]
-fas = [ "raveit65" ]
-maintainers = [ "Wolfgang Ulbrich" ]
-
 [spins.lxde.x86_64]
 fas = [ "cwickert", "mtasaka" ]
 maintainers = [ "Christoph Wickert", "Mamoru TASAKA" ]
@@ -39,20 +35,24 @@ fas = [ "chimosky", "aperezbios", ]
 maintainers = [ "Chihurumnaya Ibiam", "Alex Perez" ]
 
 [labs.astronomy_kde.x86_64]
-fas = [ "lupinix", "q5sys" ]
+fas = [ "lupinix" ]
-maintainers = [ "Christian Dersch", "JT Pennington" ]
+maintainers = [ "Christian Dersch" ]
 
 [labs.security.x86_64]
 fas = [ "fab", "jsimon", "q5sys"]
 maintainers = [ "Fabian Affolter", "Joerg Simon", "JT Pennington" ]
 
+[labs.comp_neuro.x86_64]
+fas = [ "bt0dotninja", "dan1mal", "ankursinha", "neuro-sig" ]
+maintainers = [ "Alberto Rodriguez Sanchez", "Danny Lee", "Ankur Sinha", "NeuroFedora SIG" ]
+
 [labs.design_suite.x86_64]
 fas = [ "luya" ]
 maintainers = [ "Luya Tshimbalanga" ]
 
 [labs.games.x86_64]
-fas = [ "ngompa", "q5sys" ]
+fas = [ "dagostinelli", "richardanaya" ]
-maintainers = [ "Neal Gompa", "JT Pennington" ]
+maintainers = [ "Darryl T. Agostinelli", "Richard Anaya" ]
 
 [labs.jam_kde.x86_64]
 fas = [ "q5sys" ]
@@ -100,6 +100,9 @@ maintainers = [ "Timothée Ravier", "Tomáš Popela" ]
 [silverblue.aarch64]
 fas = [ "siosm", "tpopela" ]
 maintainers = [ "Timothée Ravier", "Tomáš Popela" ]
+[silverblue.ppc64le]
+fas = [ "siosm", "tpopela" ]
+maintainers = [ "Timothée Ravier", "Tomáš Popela" ]
 
 [kinoite.x86_64]
 fas = [ "siosm" ]
@@ -107,6 +110,9 @@ maintainers = [ "Timothée Ravier" ]
 [kinoite.aarch64]
 fas = [ "siosm" ]
 maintainers = [ "Timothée Ravier" ]
+[kinoite.ppc64le]
+fas = [ "siosm" ]
+maintainers = [ "Timothée Ravier" ]
 
 [sericea.x86_64]
 fas = [ "alebastr", "jkonecny", "anthr76", "fale" ]
@@ -114,6 +120,9 @@ maintainers = [ "Aleksei Bavshin", "Jiří Konečný", "Anthony Rabbito", "Fabio
 [sericea.aarch64]
 fas = [ "alebastr", "jkonecny", "anthr76", "fale" ]
 maintainers = [ "Aleksei Bavshin", "Jiří Konečný", "Anthony Rabbito", "Fabio Alessandro Locati" ]
+[sericea.ppc64le]
+fas = [ "alebastr", "jkonecny", "anthr76", "fale" ]
+maintainers = [ "Aleksei Bavshin", "Jiří Konečný", "Anthony Rabbito", "Fabio Alessandro Locati" ]
 
 [onyx.x86_64]
 fas = [ "joshstrobl" ]
@@ -121,3 +130,6 @@ maintainers = [ "Joshua Strobl" ]
 [onyx.aarch64]
 fas = [ "joshstrobl" ]
 maintainers = [ "Joshua Strobl" ]
+[onyx.ppc64le]
+fas = [ "joshstrobl" ]
+maintainers = [ "Joshua Strobl" ]

tools/list-packages-for-ks.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python
 # Given as input a comps definition and a .ks file, list
 # the packages which would be installed.  This list is
 # NOT depsolved, it's merely a textual list of explicitly
@@ -11,33 +11,31 @@
 import os
 import sys
 import getopt
-import xml.etree.ElementTree as ElementTree
+import xml.etree.cElementTree as ElementTree
 
 import pykickstart
 import pykickstart.parser
 import pykickstart.version
 
-
 def usage(ecode):
-    print("Usage: {} [--version=VERSION] COMPS.xml KICKSTART.ks".format(sys.argv[0]))
+    print "Usage: %s [--version=VERSION] COMPS.xml KICKSTART.ks" % (sys.argv[0], )
-    print("List packages installed by KICKSTART.")
+    print "List packages installed by KICKSTART."
     sys.exit(ecode)
 
-
 def main():
     try:
-        opts, args = getopt.getopt(sys.argv[1:], 'h', ['help', 'version=', 'debug'])
+        opts,args = getopt.getopt(sys.argv[1:], 'h', ['help', 'version=', 'debug'])
-    except getopt.GetoptError as e:
+    except getopt.GetoptError, e:
         usage(1)
         
     version = None
     debug = False
-    for o, a in opts:
+    for o,a in opts:
         if o in ('-h', '--help'):
             usage(0)
-        elif o in ('--debug',):
+        elif o in ('--debug', ):
             debug = True
-        elif o in ('--version',):
+        elif o in ('--version', ):
             version = a
         
     if len(args) != 2:
@@ -79,26 +77,24 @@ def main():
    
     for group in parser.handler.packages.groupList:
         if debug:
-            print("# Including {} packages from group '{}'".format(len(packages_for_group.get(group.name, [])),
+            print >>sys.stderr, "# Including %d packages from group %r" % (len(packages_for_group[group.name]), group.name)
-                                                                   group.name), file=sys.stderr)
+        for pkg in packages_for_group[group.name]:
-        for pkg in packages_for_group.get(group.name, []):
             pkg_list.add(pkg)
     if debug:
-        print("# Adding {} explicitly specified packages".format(len(parser.handler.packages.packageList)),
+        print >>sys.stderr, "# Adding %d explicitly specified packages" % (len(parser.handler.packages.packageList), )
-              file=sys.stderr)
     for pkg in parser.handler.packages.packageList:
         pkg_list.add(pkg)
     if debug:
-        print("# Processing {} explicitly excluded packages".format(len(parser.handler.packages.excludedList)),
+        print >>sys.stderr, "# Processing %d explicitly excluded packages" % (len(parser.handler.packages.excludedList), )
-              file=sys.stderr)
     for pkg in parser.handler.packages.excludedList:
-        pkg_list.discard(pkg)
+        if pkg in pkg_list:
+            pkg_list.remove(pkg)
 
     for pkg in sorted(pkg_list):
-        print(pkg)
+        print "%s" % (pkg, )
 
     sys.exit(0)
 
-
 if __name__ == '__main__':
     main()
+