Compare commits

..

11 Commits
f43 ... f41

Author SHA1 Message Date
Adam Williamson
5dee07da68 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>
2024-10-19 15:17:51 -07:00
Timothée Ravier
633fcc5fd2 fedora-kde-common: Remove mariadb-server-utils
This package depends on Perl and is not needed for desktop use cases.

See: https://pagure.io/fedora-kde/SIG/issue/566
2024-10-11 17:07:02 +02:00
Mamoru TASAKA
eac1c05fec lxde: increase disk size for compose
Installed file size is already near limit, and
on rawhide (F42), now compose began to fail at
kernel posttrans scriptlet due to disk size shortage.

So now let's increase size by 20%.
2024-10-03 00:22:11 +09:00
Miro Hrončok
fba0552b3b Do not pull in pypy3.9 to the Python Classroom Lab, 3.10 is already there 2024-09-17 17:23:55 +02:00
Adam Williamson
bedb225129 Bump workstation root size a bit more
ppc64le live compose for the F41 Beta candidate failed with
"needs 110MB more space on the / filesystem". Here's 384M for a
little bit of headroom.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2024-09-11 17:44:24 -07:00
Luya Tshimbalanga
e0a404e380 Design Suite: drop unused deja-dup-nautilus and temporarily drop deja-dup 2024-09-04 17:22:47 -07:00
Mamoru TASAKA
f719964831 astronomy: change fpack deps
fpack (which was subpackage of cfitsio.src) was renamed to
cfitsio-utils per:
712e385e26

Change fpack deps accordingly.
2024-08-29 23:43:50 +09:00
Neal Gompa
189421d913 Workstation: Drop botocore to shrink the image 2024-08-28 14:19:16 -04:00
Neal Gompa
fe0d1b6aa8 Add initial configuration for MiracleWM spin
Reference: https://fedoraproject.org/wiki/Changes/FedoraMiracle
2024-08-22 12:06:41 -04:00
Adam Williamson
6fa254e43d Disable anaconda-webui for Fedora 41
As per the plan:
https://fedoraproject.org/wiki/Changes/AnacondaWebUIforFedoraWorkstation
is targeted for F42, and we always intended to disable it on F41
right after branching.
2024-08-18 07:47:43 -07:00
Samyak Jain
da0e8fc819 Branch Fedora 41 from Rawhide
Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
2024-08-11 21:58:27 +05:30
20 changed files with 253 additions and 57 deletions

View File

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

View File

@@ -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

6
fedora-disk-minimal.ks Normal file
View File

@@ -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

View File

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

88
fedora-iot.ks Normal file
View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

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

12
fedora-live-comp_neuro.ks Normal file
View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

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

View File

@@ -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

View File

@@ -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

View File

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

23
fedora-minimal-common.ks Normal file
View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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" ]
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", "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" ]
@@ -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" ]

View File

@@ -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,40 +11,38 @@
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("List packages installed by KICKSTART.")
print "Usage: %s [--version=VERSION] COMPS.xml KICKSTART.ks" % (sys.argv[0], )
print "List packages installed by KICKSTART."
sys.exit(ecode)
def main():
try:
opts, args = getopt.getopt(sys.argv[1:], 'h', ['help', 'version=', 'debug'])
except getopt.GetoptError as e:
opts,args = getopt.getopt(sys.argv[1:], 'h', ['help', 'version=', 'debug'])
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:
usage(1)
comps_filename = args[0]
kickstart_filename = args[1]
if version:
version_cls = pykickstart.version.stringToVersion(version)
else:
@@ -57,10 +55,10 @@ def main():
working_directory = os.path.dirname(kickstart_filename)
if working_directory:
os.chdir(working_directory)
parser = pykickstart.parser.KickstartParser(version_cls)
parser.readKickstart(kickstart_filename)
comps_groups = comps.findall('group')
packages_for_group = {}
for group in comps_groups:
@@ -76,29 +74,27 @@ def main():
packages_for_group[group_id.text] = pkglist
pkg_list = set()
for group in parser.handler.packages.groupList:
if debug:
print("# Including {} packages from group '{}'".format(len(packages_for_group.get(group.name, [])),
group.name), file=sys.stderr)
for pkg in packages_for_group.get(group.name, []):
print >>sys.stderr, "# Including %d packages from group %r" % (len(packages_for_group[group.name]), group.name)
for pkg in packages_for_group[group.name]:
pkg_list.add(pkg)
if debug:
print("# Adding {} explicitly specified packages".format(len(parser.handler.packages.packageList)),
file=sys.stderr)
print >>sys.stderr, "# Adding %d explicitly specified packages" % (len(parser.handler.packages.packageList), )
for pkg in parser.handler.packages.packageList:
pkg_list.add(pkg)
if debug:
print("# Processing {} explicitly excluded packages".format(len(parser.handler.packages.excludedList)),
file=sys.stderr)
print >>sys.stderr, "# Processing %d explicitly excluded packages" % (len(parser.handler.packages.excludedList), )
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()