Bump root sizes for lxqt and i3 lives

These are both failing to build on aarch64 due to lack of space. Signed-off-by: Adam Williamson <awilliam@redhat.com>
Remove mrpt-devel from robotics (it was retired)
2025-12-09 08:30:30 +08:00 · 2024-03-26 15:21:35 -07:00 · 2024-03-21 12:25:59 -07:00 · 2024-03-19 16:35:49 -07:00 · 2024-03-19 15:46:25 -07:00 · 2024-03-18 14:44:04 -07:00
29 changed files with 166 additions and 108 deletions
--- a/fedora-cloud-base-gcp.ks
+++ b/fedora-cloud-base-gcp.ks
@@ -9,7 +9,7 @@
 # Don't show bootloader as it's impossible for the user to get to it in time
 # So we might as well not waste the 1 second on each boot.
 # https://cloud.google.com/compute/docs/import/import-existing-image
-bootloader --timeout=0 --location=mbr --append="no_timer_check console=ttyS0,38400n8d"
+bootloader --timeout=0 --location=mbr --append="no_timer_check net.ifnames=0 console=ttyS0,38400n8d"

 # redefine `services` here to drop cloud-init systemd unit enablements from
 # fedora-cloud-base.ks since we don't use them.
--- a/fedora-cloud-base-vagrant.ks
+++ b/fedora-cloud-base-vagrant.ks
@@ -22,6 +22,12 @@ rootpw vagrant
 bootloader --timeout=1 --location=mbr --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"

 %packages
+# The default koji Vagrantfile configuration uses rsync to sync files between
+# the vagrant host and the guest.  It uses yum to verify that rsync is present
+# and/or install it if it is not.  It will fail without adding the yum compat
+# layer for dnf
+# TODO: Teach vagrant about dnf
+dnf-yum
 # rsync gets installed when the Vagrant box is first launched on the
 # users setup. This can actually take a bit of time.  Just fold it
 # in to the base box disk image
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -31,7 +31,8 @@ rootpw --lock --iscrypted locked

 firewall --disabled

-bootloader --timeout=1 --location=mbr --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+# We pass net.ifnames=0 because we always want to use eth0 here on all the cloud images.
+bootloader --timeout=1 --location=mbr --append="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"

 services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final

--- a/fedora-container-base-minimal.ks
+++ b/fedora-container-base-minimal.ks
@@ -1,11 +1,11 @@
 # See fedora-container-common.ks for details on how to hack on container image kickstarts
-# This base is a stripped back Fedora image without python3.
+# This base is a stripped back Fedora image without python3/dnf.
 # If you need that use the standard base image.

 %include fedora-container-common.ks

 %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
-dnf5
+microdnf
 -tzdata
 %end

--- a/fedora-container-base.ks
+++ b/fedora-container-base.ks
@@ -7,8 +7,8 @@
 rootfiles
 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
 vim-minimal
-dnf5
-dnf5-plugins
+dnf
+dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 sudo
 -glibc-langpack-en
 -langpacks-en
--- a/fedora-container-toolbox.ks
+++ b/fedora-container-toolbox.ks
@@ -28,8 +28,9 @@ coreutils-common
 curl
 default-editor
 diffutils
-dnf5
-dnf5-plugins
+dnf
+dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
+dnf-plugins-core
 -dosfstools
 -e2fsprogs
 fedora-release-toolbx
@@ -67,6 +68,7 @@ openssh-clients
 openssl
 p11-kit
 pam
+passwd
 pigz
 -pinentry
 procps-ng
--- a/fedora-design-suite-common.ks
+++ b/fedora-design-suite-common.ks
@@ -6,7 +6,8 @@
 fedora-release-designsuite

 # Provides backup application
-#deja-dup
+deja-dup
+#deja-dup-nautilus

 # Add extra gnome applications
 #gnome-books
--- a/fedora-disk-minimal.ks
+++ b/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
--- a/fedora-disk-workstation.ks
+++ b/fedora-disk-workstation.ks
@@ -8,6 +8,5 @@ autopart --type=btrfs --noswap
 -initial-setup
 -initial-setup-gui
 gnome-initial-setup
-anaconda-webui

 %end
--- a/fedora-eln-container-base.ks
+++ b/fedora-eln-container-base.ks
@@ -10,10 +10,9 @@ fedora-repos-eln
 rootfiles
 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
 vim-minimal
-
-dnf5
-dnf5-plugins
-
+dnf
+dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
+python3-dnf-plugins-core # https://github.com/fedora-eln/eln/issues/166
 sudo
 -glibc-langpack-en
 -langpacks-en
--- a/fedora-eln-guest.ks
+++ b/fedora-eln-guest.ks
@@ -32,10 +32,11 @@ reboot
 # Packages
 %packages
@core
-dnf5
+dnf
 kernel
 yum
 nfs-utils
+dnf-utils

 # pull firmware packages out
 -aic94xx-firmware
--- a/fedora-iot.ks
+++ b/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/40/${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/40/${arch}/iot"
+
+# Make sure the ref we're supposedly sitting on (according
+# to the updated origin) exists.
+ostree refs "fedora-iot:fedora/40/${arch}/iot" --create "fedora-iot:fedora/40/${arch}/iot"
+
+# Remove the old ref so that the commit eventually gets cleaned up.
+ostree refs "fedora-iot:fedora/40/${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
--- a/fedora-kde-common.ks
+++ b/fedora-kde-common.ks
@@ -22,14 +22,8 @@ fedora-release-kde
 -tracker-miners
 -tracker

-# Not needed on desktops. See: https://pagure.io/fedora-kde/SIG/issue/566
-mariadb-server-utils
-
 ### The KDE-Desktop

-# fedora-specific packages
-plasma-welcome-fedora
-
 ### fixes

 # minimal localization support - allows installing the kde-l10n-* packages
--- a/fedora-live-astronomy_kde.ks
+++ b/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
@@ -35,7 +33,7 @@ part / --size 16000
 astrometry
 astrometry-tycho2
 cdsclient
-cfitsio-utils
+fpack
 psfex
 scamp
 sextractor
--- a/fedora-live-comp_neuro.ks
+++ b/fedora-live-comp_neuro.ks
@@ -9,4 +9,4 @@
 %include fedora-comp-neuro-common.ks
 %include fedora-neuro-gnome-common.ks

-part / --size 11264
+part / --size 10240
--- a/fedora-live-jam_kde.ks
+++ b/fedora-live-jam_kde.ks
@@ -12,7 +12,7 @@
 %include fedora-live-kde.ks

 # DVD size partition
-part / --size 11264 --fstype ext4
+part / --size 10240 --fstype ext4

 #enable threaded irqs
 bootloader --append="threadirqs"
--- a/fedora-live-lxde.ks
+++ b/fedora-live-lxde.ks
@@ -10,9 +10,6 @@
 %include fedora-live-minimization.ks
 %include fedora-lxde-common.ks

-# increate the disk size for compose
-part / --size 6144
-
 %post
 # LXDE and LXDM configuration

--- a/fedora-live-miraclewm.ks
+++ b/fedora-live-miraclewm.ks
@@ -1,30 +0,0 @@
-# fedora-livecd-miraclewm.ks
-#
-# Description:
-# - Fedora Live Spin with the tiling window manager Miracle
-#
-# Maintainer(s):
-# - Matthew Kosarek <mattkae@fedoraproject.org>
-# - Neal Gompa      <ngompa@fedoraproject.org>
-
-%include fedora-live-base.ks
-%include fedora-live-minimization.ks
-%include fedora-miraclewm-common.ks
-
-%packages
-# To be able to show installation instructions on background
-nwg-wrapper
-%end
-
-%post
-# create /etc/sysconfig/desktop (needed for installation)
-cat > /etc/sysconfig/desktop <<EOF
-PREFERRED=/usr/bin/miraclewm
-DISPLAYMANAGER=/bin/sddm
-EOF
-
-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="miraclewm"/' /etc/sysconfig/livesys
-
-%end
-
--- a/fedora-live-robotics.ks
+++ b/fedora-live-robotics.ks
@@ -1,6 +1,6 @@
-# Maintained by lrossett and the Fedora Robotics SIG:
-# https://docs.fedoraproject.org/en-US/robotics-sig/
-# mailto:lrossett@redhat.com
+# Maintained by x3mboy and the Fedora Robotics SIG:
+# https://fedoraproject.org/wiki/SIGs/Robotics
+# mailto:x3mboy@fedoraproject.org
 # mailto:robotics@lists.fedoraproject.org

 %include fedora-live-base.ks
--- a/fedora-live-scientific_kde.ks
+++ b/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

--- a/fedora-live-security.ks
+++ b/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
--- a/fedora-live-workstation.ks
+++ b/fedora-live-workstation.ks
@@ -10,11 +10,10 @@
 #
 #include snippets/packagekit-cached-metadata.ks

-part / --size 8576
+part / --size 8192

 %packages
 gnome-initial-setup
-anaconda-webui
 %end

 %post
--- a/fedora-minimal-common.ks
+++ b/fedora-minimal-common.ks
@@ -0,0 +1,23 @@
+%packages
+microdnf
+-@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
--- a/fedora-miraclewm-common.ks
+++ b/fedora-miraclewm-common.ks
@@ -1,15 +0,0 @@
-# fedora-livecd-miraclewm.ks
-#
-# Description:
-# - Fedora Live Spin with the tiling window manager Miracle
-#
-# Maintainer(s):
-# - Matthew Kosarek <mattkae@fedoraproject.org>
-# - Neal Gompa      <ngompa@fedoraproject.org>
-
-%packages
-fedora-release-miraclewm
-@^miraclewm-desktop-environment
-@firefox
-initial-setup-gui-wayland-miraclewm
-%end
--- a/fedora-modular-disk-minimal.ks
+++ b/fedora-modular-disk-minimal.ks
@@ -31,7 +31,7 @@ coreutils-single
 util-linux
 rpm
 shadow-utils
-dnf5
+microdnf
 glibc-minimal-langpack
 grubby
 kernel
--- a/fedora-python-classroom-common.ks
+++ b/fedora-python-classroom-common.ks
@@ -30,9 +30,7 @@ wget2-wget
 -python3.9
 -python3.10
 -python3.11
-python3.12
 -pypy
-pypy3.9

 # Remove LaTeX, see https://bugzilla.redhat.com/show_bug.cgi?id=1862450
 #               and https://bugzilla.redhat.com/show_bug.cgi?id=1902354
--- a/fedora-server-vm-full.ks
+++ b/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
--- a/fedora-workstation-common.ks
+++ b/fedora-workstation-common.ks
@@ -12,7 +12,4 @@
 -gfs2-utils
 -reiserfs-utils

-# Exclude extra unwanted packages
-python3-botocore
-
 %end
--- a/maintainers.toml
+++ b/maintainers.toml
@@ -1,9 +1,9 @@
 [spins.lxqt.x86_64]
-fas = [ "lupinix", "zsun", "farchord", "ngompa" ]
-maintainers = [ "Christian Dersch", "Zamir SUN", "Steve Cossette", "Neal Gompa" ]
+fas = [ "lupinix", "zsun" ]
+maintainers = [ "Christian Dersch", "Zamir SUN" ]
 [spins.lxqt.armhfp]
-fas = [ "lupinix", "zsun", "farchord", "ngompa" ]
-maintainers = [ "Christian Dersch", "Zamir SUN", "Steve Cossette", "Neal Gompa" ]
+fas = [ "lupinix", "zsun" ]
+maintainers = [ "Christian Dersch", "Zamir SUN" ]

 [spins.xfce.x86_64]
 fas = [ "nonamedotc", "kevin", "maxamillion" ]
@@ -35,24 +35,24 @@ fas = [ "chimosky", "aperezbios", ]
 maintainers = [ "Chihurumnaya Ibiam", "Alex Perez" ]

 [labs.astronomy_kde.x86_64]
-fas = [ "lupinix", "q5sys" ]
-maintainers = [ "Christian Dersch", "JT Pennington" ]
+fas = [ "lupinix" ]
+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" ]
-maintainers = [ "Alberto Rodriguez Sanchez", "Danny Lee", "Ankur Sinha" ]
+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" ]
-maintainers = [ "Neal Gompa", "JT Pennington" ]
+fas = [ "dagostinelli", "richardanaya" ]
+maintainers = [ "Darryl T. Agostinelli", "Richard Anaya" ]

 [labs.jam_kde.x86_64]
 fas = [ "q5sys" ]
@@ -71,16 +71,16 @@ fas = [ "scitech" ]
 maintainers = [ "SciTech SIG" ]

 [labs.robotics.x86_64]
-fas = [ "lrossett", "robotics-sig" ]
-maintainers = [ "Leonardo Rossetti", "Robotics SIG" ]
+fas = [ "x3mboy", "robotics-sig" ]
+maintainers = [ "Eduard Lucena", "Robotics SIG" ]

 [spins.i3.x86_64]
 fas = [ "jflory7", "defolos", "nasirhm", "odilhao", "x3mboy" ]
 maintainers = [ "Justin Flory", "Dan Čermák", "Nasir Hussain", "Odilon Junior", "Eduard Lucena" ]

 [eln]
-fas = [ "sgallagh", "tdawson", "asamalik", "yselkowitz" ]
-maintainers = [ "Stephen Gallagher", "Troy Dawson", "Adam Samalik", "Yaakov Selkowitz" ]
+fas = [ "sgallagh", "tdawson", "asamalik" ]
+maintainers = [ "Stephen Gallagher", "Troy Dawson", "Adam Samalik" ]

 [spins.budgie.x86_64]
 fas = [ "joshstrobl" ]
@@ -90,10 +90,6 @@ maintainers = [ "Joshua Strobl" ]
 fas = [ "alebastr", "jkonecny", "anthr76", "fale" ]
 maintainers = [ "Aleksei Bavshin", "Jiří Konečný", "Anthony Rabbito", "Fabio Alessandro Locati" ]

-[spins.miraclewm.x86_64]
-fas = [ "mattkae", "ngompa" ]
-maintainers = [ "Matthew Kosarek", "Neal Gompa" ]
-
 [silverblue.x86_64]
 fas = [ "siosm", "tpopela" ]
 maintainers = [ "Timothée Ravier", "Tomáš Popela" ]
Author	SHA1	Message	Date
Adam Williamson	a2bb6793db	Bump root sizes for lxqt and i3 lives These are both failing to build on aarch64 due to lack of space. Signed-off-by: Adam Williamson <awilliam@redhat.com>	2024-03-26 15:21:35 -07:00
Adam Williamson	f9ac9f9ddc	Remove mrpt-devel from robotics (it was retired) Signed-off-by: Adam Williamson <awilliam@redhat.com>	2024-03-21 12:25:59 -07:00
Kevin Fenzi	176a09fe80	lxqt: final size bump I hope This time I actually tested things to confirm that there was enough size. x86_64 builds fine with this size. aarch64 fails, but not due to size, it's the dbus aarch64 bug. Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2024-03-19 16:35:49 -07:00
Adam Williamson	69af25020c	Bump root partition size for scientific_kde It seems to need about 1.4G more according to recent failure logs. Let's give it a bit of a buffer. Signed-off-by: Adam Williamson <awilliam@redhat.com>	2024-03-19 15:46:25 -07:00
Kevin Fenzi	4912db2d9d	lxqt: add more space. I added a tiny bit of space, but turns out theres not quit enough for the initramfs to be generated and the compose still fails. So, lets add 100MB. That should be enough for the scriptlets to complete. I'd like to cherry pick this into f40 as well. Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2024-03-18 14:44:04 -07:00
Debarshi Ray	82222e16e8	container-toolbox: Use 'toolbx' as VARIANT_ID in os-release(5) This is meant to distinguish OCI containers and images that are designed specifically for Toolbx from others. Toolbx containers are long-lasting pet containers for interactive command line use, which makes them substantially different from short-lived containers running services. Therefore, it can be useful to be able to identify Toolbx containers and images when generating statistics about Fedora usage. https://pagure.io/Fedora-Council/tickets/issue/449 https://pagure.io/fedora-kickstarts/pull-request/1026	2024-03-17 01:31:30 +00:00
Kevin Fenzi	6e55750be4	lxqt live: bump space a slight bit to fit Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2024-03-16 15:30:31 -07:00
raveit65	0da52a87fd	Mate: drop earlyoom from livecd	2024-02-24 20:21:42 +01:00
Dennis Gilmore	ec16205216	AArch64 livemedia isos are running out of space. Increase the image slightly. In a test it is enough to build a iso. Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2024-02-22 18:52:42 -06:00
Adam Williamson	3fb39f8710	Drop anaconda-webui from Workstation: Change was deferred The anaconda webui change was deferred to F41 by FESCo: https://bugzilla.redhat.com/show_bug.cgi?id=2231339#c6 so we should drop the package. Signed-off-by: Adam Williamson <awilliam@redhat.com>	2024-02-21 11:54:37 -08:00
Samyak Jain	045ff6a282	Branch Fedora 40 from Rawhide Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>	2024-02-13 00:24:03 +05:30