Compare commits

..

2 Commits

Author SHA1 Message Date
Adam Williamson
c0297b2939 Don't exclude xkeyboard-config from minimal images (#2175244)
See https://bugzilla.redhat.com/show_bug.cgi?id=2175244#c15 .
We really need libxkbcommon for initial-setup to work properly,
since an ordering change in systemd 253. This exclusion causes
it to get dropped. libxkbcommon requires xkeyboard-config; since
systemd only recommends libxkbcommon (rather than hard requiring
it), the solver decides to honor the request to exclude
xkeyboard-config by dropping both it and libxkbcommon.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2023-03-06 17:45:47 -08:00
Samyak Jain
b33a044e15 Branch Fedora 38 from rawhide
Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
2023-02-08 23:43:37 +01:00
41 changed files with 101 additions and 366 deletions

View File

@@ -85,14 +85,14 @@ gtk-recordmydesktop
gconf-editor gconf-editor
dconf-editor dconf-editor
nautilus-open-terminal nautilus-open-terminal
iotop-c iotop
htop htop
# Add favorite power-user tools # Add favorite power-user tools
mc mc
vim vim
nano nano
wget2-wget wget
# Add dependencies for the welcome screen # Add dependencies for the welcome screen
# (this makes it run also on non-GNOME systems) # (this makes it run also on non-GNOME systems)

View File

@@ -11,10 +11,6 @@ fedora-release-budgie
# recommended apps # recommended apps
@budgie-desktop-apps @budgie-desktop-apps
@libreoffice
libreoffice-draw
libreoffice-math
thunderbird
# Exclude unwanted packages from @anaconda-tools group # Exclude unwanted packages from @anaconda-tools group
-gfs2-utils -gfs2-utils

View File

@@ -18,9 +18,6 @@ services --enabled=sshd
%packages %packages
# GCP provides its own guest environment. # GCP provides its own guest environment.
google-compute-engine-guest-configs google-compute-engine-guest-configs
# BZ 2193039: Ensure additional packages are present for ssh access management
google-compute-engine-oslogin
google-guest-agent
-cloud-init -cloud-init
# Fedora Cloud Base includes the qemu guest agent. GCP prefers # Fedora Cloud Base includes the qemu guest agent. GCP prefers
# that it not be installed https://pagure.io/cloud-sig/issue/319 # that it not be installed https://pagure.io/cloud-sig/issue/319

View File

@@ -57,13 +57,6 @@ reboot
# Include packages for the cloud-server-environment group # Include packages for the cloud-server-environment group
@^cloud-server-environment @^cloud-server-environment
# Install the tracer dnf plugin to enable automatic reboots
# IF the user requests package updates
# AND requests a reboot
# AND the packages updated require a reboot.
# https://fedoraproject.org/wiki/Changes/Automatic_Cloud_Reboot_On_Updates
python3-dnf-plugin-tracer
# Don't include the kernel toplevel package since it pulls in # Don't include the kernel toplevel package since it pulls in
# kernel-modules. We're happy for now with kernel-core. # kernel-modules. We're happy for now with kernel-core.
-kernel -kernel

View File

@@ -6,7 +6,7 @@
%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
microdnf microdnf
-tzdata
%end %end
%post --erroronfail --log=/root/anaconda-post.log %post --erroronfail --log=/root/anaconda-post.log
@@ -33,6 +33,11 @@ rm -fv /usr/bin/pinky
# we lose presets by removing /usr/lib/systemd but we do not care # we lose presets by removing /usr/lib/systemd but we do not care
rm -rfv /usr/lib/systemd rm -rfv /usr/lib/systemd
# if you want to change the timezone, bind-mount it from the host or reinstall tzdata
rm -fv /etc/localtime
mv /usr/share/zoneinfo/UTC /etc/localtime
rm -rfv /usr/share/zoneinfo
# Final pruning # Final pruning
rm -rfv /var/cache/* /var/log/* /tmp/* rm -rfv /var/cache/* /var/log/* /tmp/*

View File

@@ -5,6 +5,8 @@
%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
rootfiles rootfiles
# https://communityblog.fedoraproject.org/modularity-dead-long-live-modularity/
fedora-repos-modular
tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
vim-minimal vim-minimal
dnf dnf

View File

@@ -35,7 +35,6 @@ fedora-release-container
bash bash
coreutils coreutils
glibc-minimal-langpack glibc-minimal-langpack
tzdata
rpm rpm
util-linux-core util-linux-core
-kernel -kernel

View File

@@ -1,227 +0,0 @@
# Kickstart file for Fedora Toolbox
# See fedora-container-common.ks for details on how to hack on container image kickstarts
text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
bootloader --disabled
timezone --isUtc Etc/UTC
timesource --ntp-disable
rootpw --lock --iscrypted locked
keyboard us
network --bootproto=dhcp --device=link --activate --onboot=on
reboot
# boot partitions are irrelevant as the final docker image is a tarball
zerombr
clearpart --all
autopart --noboot --nohome --noswap --nolvm
# Install packages
%packages --nocore
acl
bash
bash-completion
bc
bzip2
coreutils
coreutils-common
curl
default-editor
diffutils
dnf
dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29
dnf-plugins-core
-dosfstools
-e2fsprogs
fedora-release-toolbx
findutils
flatpak-spawn
fpaste
-fuse-libs
gawk
git
-glibc-minimal-langpack
glibc-all-langpacks
gnupg2
gnupg2-smime
grep
-grubby
gvfs-client
gzip
hostname
iproute
iputils
-kernel
keyutils
krb5-libs
less
libcap
-libss
lsof
man-db
man-pages
mesa-dri-drivers
mesa-vulkan-drivers
mtr
nss-mdns
openssh-clients
openssl
p11-kit
pam
passwd
pigz
-pinentry
procps-ng
psmisc
python3
rootfiles
rpm
rsync
sed
shadow-utils
-shared-mime-info
-sssd-client
sudo
# This is a weak dependency of systemd, we do not want
# this in the container; see
# https://github.com/containers/toolbox/issues/1410
-systemd-resolved
tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
tcpdump
time
traceroute
tree
-trousers
tzdata
unzip
util-linux
util-linux-core
vim-minimal
vte-profile
vulkan-loader
wget2-wget
which
whois
words
-xkeyboard-config
xorg-x11-xauth
xz
zip
%end
# Pre-installation commands
%pre
# Copy README.md
cp /README.md /mnt/sysimage/README.md
# Remove macros.image-language-conf file
rm -f /mnt/sysimage/etc/rpm/macros.image-language-conf
# Remove 'tsflags=nodocs' line from dnf.conf
sed -i '/tsflags=nodocs/d' /mnt/sysimage/etc/dnf/dnf.conf
%end
%post --erroronfail --log=/root/anaconda-post.log
set -eux
# https://bugzilla.redhat.com/show_bug.cgi?id=1727489
echo 'LANG="C.UTF-8"' > /etc/locale.conf
# https://bugzilla.redhat.com/show_bug.cgi?id=1400682
echo "Import RPM GPG key"
releasever=$(rpm --eval '%{?fedora}')
# When building ELN containers, we don't have the %{fedora} macro
if [ -z $releasever ]; then
releasever=eln
fi
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
echo "# fstab intentionally empty for containers" > /etc/fstab
# Remove machine-id on pre generated images
rm -f /etc/machine-id
touch /etc/machine-id
echo "# resolv placeholder" > /etc/resolv.conf
chmod 644 /etc/resolv.conf
# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
# Fix /run/lock breakage since it's not tmpfs in docker
# This unmounts /run (tmpfs) and then recreates the files
# in the /run directory on the root filesystem of the container
#
# We ignore the return code of the systemd-tmpfiles command because
# at this point we have already removed the /etc/machine-id and all
# tmpfiles lines with %m in them will fail and cause a bad return
# code. Example failure:
# [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
#
umount /run
rm -f /run/nologin # https://pagure.io/atomic-wg/issue/316
# Final pruning
rm -rfv /var/cache/* /var/log/* /tmp/*
# Check if specified files exist
declare -a files=(
# bash
"/usr/share/man/man1/bash.1*"
"/usr/share/man/man1/cd.1*"
"/usr/share/man/man1/export.1*"
# coreutils-common
"/usr/share/man/man1/cat.1*"
"/usr/share/man/man1/cp.1*"
"/usr/share/man/man1/ls.1*"
# gnupg2
"/usr/share/man/man1/gpg2.1*"
"/usr/share/man/man7/gnupg2.7*"
# psmisc
"/usr/share/man/fr/man1/pstree.1*"
"/usr/share/man/ko/man1/pstree.1*"
"/usr/share/man/man1/pstree.1*"
# rpm
"/usr/share/man/man8/rpm.8*"
"/usr/share/man/man8/rpm2cpio.8*"
# shadow-utils
"/usr/share/man/fr/man8/useradd.8*"
"/usr/share/man/ja/man8/useradd.8*"
"/usr/share/man/man8/useradd.8*"
# util-linux
"/usr/share/man/man1/cal.1.*"
"/usr/share/man/man1/getopt.1*"
"/usr/share/man/man1/hexdump.1*"
# util-linux-core
"/usr/share/man/man1/kill.1*"
"/usr/share/man/man8/mount.8*"
# xz
"/usr/share/man/fr/man1/xz.1*"
"/usr/share/man/ko/man1/xz.1*"
"/usr/share/man/man1/xz.1*"
)
ret_val=0
for file in "${files[@]}"; do
if ! compgen -G "$file" >/dev/null; then
echo "$file: No such file or directory" >&2
ret_val=1
break
fi
done
if [ "$ret_val" -ne 0 ]; then
false
fi
%end
# Perform any necessary post-installation configurations specific to Fedora Toolbox (nochroot environment)
# Post-installation commands
%post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
set -eux
# Clean up dnf cache
dnf clean all
%end

View File

@@ -7,11 +7,12 @@ fedora-release-designsuite
# Provides backup application # Provides backup application
deja-dup deja-dup
#deja-dup-nautilus deja-dup-nautilus
# Add extra gnome applications # Add extra gnome applications
#gnome-books #gnome-books
gnome-calendar gnome-calendar
gnome-photos
gnome-pomodoro gnome-pomodoro
gnome-todo gnome-todo
@@ -22,6 +23,7 @@ powerline-fonts
# removal of unneeded applications # removal of unneeded applications
-gnome-boxes -gnome-boxes
# temporarily removing conflicting application # temporarily removing conflicting application
-mypaint -mypaint
-sparkleshare -sparkleshare

View File

@@ -34,6 +34,8 @@ firstboot --reconfig
@hardware-support @hardware-support
kernel kernel
# on 32bit arm make sure we only install one kernel
-kernel-lpae
# remove this in %post # remove this in %post
dracut-config-generic dracut-config-generic
-dracut-config-rescue -dracut-config-rescue
@@ -57,9 +59,18 @@ glibc-all-langpacks
# Find the architecture we are on # Find the architecture we are on
arch=$(uname -m) arch=$(uname -m)
# Setup Raspberry Pi firmware # Setup Raspberry Pi firmware
if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
if [[ $arch == "aarch64" ]]; then if [[ $arch == "aarch64" ]]; then
cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
else
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 -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
fi
fi fi
releasever=$(rpm --eval '%{fedora}') releasever=$(rpm --eval '%{fedora}')
@@ -86,7 +97,7 @@ rm -f /var/lib/rpm/__db*
# when you are using fedora via serial console as you do not get any output post grub # when you are using fedora via serial console as you do not get any output post grub
# linux does a good job of knowing what consoles need to be enabled. # linux does a good job of knowing what consoles need to be enabled.
# https://bugzilla.redhat.com/show_bug.cgi?id=2022757 # https://bugzilla.redhat.com/show_bug.cgi?id=2022757
if [[ $arch == "aarch64" ]]; then if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
sed -i -e 's|console=tty0||g' /boot/loader/entries/*conf sed -i -e 's|console=tty0||g' /boot/loader/entries/*conf
fi fi

View File

@@ -26,7 +26,8 @@ fedora-release-server
# setup systemd to boot to the right runlevel # setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode" echo -n "Setting default runlevel to multiuser text mode"
systemctl set-default multi-user.target rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo . echo .
%end %end

View File

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

View File

@@ -17,6 +17,6 @@ glibc-all-langpacks
%post %post
# Explicitly set graphical.target as default as this is how initial-setup detects which version to run # Explicitly set graphical.target as default as this is how initial-setup detects which version to run
systemctl set-default graphical.target ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
%end %end

View File

@@ -12,7 +12,6 @@ tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
vim-minimal vim-minimal
dnf dnf
dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29 dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29
python3-dnf-plugins-core # https://github.com/fedora-eln/eln/issues/166
sudo sudo
-glibc-langpack-en -glibc-langpack-en
-langpacks-en -langpacks-en

View File

@@ -113,8 +113,13 @@ subscription-manager-cockpit
# rh-amazon-rhui-client # rh-amazon-rhui-client
# Transitively required by grub2-tools-extra # Exclude all langpacks for now
langpacks-core-font-en -langpacks-*
# The langpacks-en package is pulled in by Anaconda and it seems filtering
# it out using langpacks-* is not sufficient. It needs to be filtered
# directly.
-langpacks-en
# We are building Fedora-ELN # We are building Fedora-ELN
fedora-release-eln fedora-release-eln
@@ -136,7 +141,8 @@ passwd -l root
# setup systemd to boot to the right runlevel # setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode" echo -n "Setting default runlevel to multiuser text mode"
systemctl set-default multi-user.target rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo . echo .
# this is installed by default but we don't need it in virt # this is installed by default but we don't need it in virt

View File

@@ -21,11 +21,9 @@ thunar
gnome-keyring-pam gnome-keyring-pam
# Admin tools are handy to have # Admin tools are handy to have
@admin-tools @admin-tools
wget2-wget wget
# Better more popular browser # Better more popular browser
system-config-printer system-config-printer
# Install XFCE polkit
xfce-polkit
# save some space # save some space
-autofs -autofs

View File

@@ -19,29 +19,40 @@ autopart --nohome --noswap --type=plain
# Equivalent of %include fedora-repo.ks # Equivalent of %include fedora-repo.ks
# Pull from the ostree repo that was created during the compose # 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 ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/devel/${basearch}/iot
reboot reboot
%post --erroronfail %post --erroronfail
# Find the architecture we are on # Find the architecture we are on
arch=$(uname -m) arch=$(uname -m)
if [[ $arch == "armv7l" ]]; then
arch="armhfp"
fi
# Setup Raspberry Pi firmware # Setup Raspberry Pi firmware
if [[ $arch == "aarch64" ]] || [[ $arch == "armhfp" ]]; then
if [[ $arch == "aarch64" ]]; then if [[ $arch == "aarch64" ]]; then
cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
else
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 -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
fi
fi fi
# Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes. # 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. # 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" ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/devel/${arch}/iot"
# Make sure the ref we're supposedly sitting on (according # Make sure the ref we're supposedly sitting on (according
# to the updated origin) exists. # to the updated origin) exists.
ostree refs "fedora-iot:fedora/40/${arch}/iot" --create "fedora-iot:fedora/40/${arch}/iot" ostree refs "fedora-iot:fedora/devel/${arch}/iot" --create "fedora-iot:fedora/devel/${arch}/iot"
# Remove the old ref so that the commit eventually gets cleaned up. # Remove the old ref so that the commit eventually gets cleaned up.
ostree refs "fedora-iot:fedora/40/${arch}/iot" --delete ostree refs "fedora-iot:fedora/devel/${arch}/iot" --delete
# delete/add the remote with new options to enable gpg verification # delete/add the remote with new options to enable gpg verification
# and to point them at the cdn url # and to point them at the cdn url

View File

@@ -6,9 +6,6 @@
@firefox @firefox
@kde-apps @kde-apps
@kde-media @kde-media
@kde-pim
# Ensure we have Anaconda initial setup using kwin
@kde-spin-initial-setup
@libreoffice @libreoffice
# add libreoffice-draw and libreoffice-math (pagureio:fedora-kde/SIG#103) # add libreoffice-draw and libreoffice-math (pagureio:fedora-kde/SIG#103)
libreoffice-draw libreoffice-draw

View File

@@ -96,10 +96,7 @@ python3-matplotlib-tk
# Python IDE very useful for scientific use # Python IDE very useful for scientific use
# FTI with Python 3.12: python3-spyder
# https://bugzilla.redhat.com/show_bug.cgi?id=2220598
# can be restored when that is fixed
#python3-spyder
# BOINC for distributed computing # BOINC for distributed computing
boinc-client boinc-client

View File

@@ -39,7 +39,6 @@ anaconda-live
# https://fedoraproject.org/wiki/Changes/RemoveDeviceMapperMultipathFromWorkstationLiveCD # https://fedoraproject.org/wiki/Changes/RemoveDeviceMapperMultipathFromWorkstationLiveCD
-fcoe-utils -fcoe-utils
-device-mapper-multipath -device-mapper-multipath
-sdubby
# Need aajohan-comfortaa-fonts for the SVG rnotes images # Need aajohan-comfortaa-fonts for the SVG rnotes images
aajohan-comfortaa-fonts aajohan-comfortaa-fonts

View File

@@ -62,8 +62,10 @@ if [ -f `which powerline-daemon` ]; then
fi fi
FOE FOE
cat >> /var/lib/livesys/livesys-session-extra << FOE
#Override the favorite desktop application in Dash #Override the favorite desktop application in Dash
sed -i "s/favorite-apps=."'*'"/favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'darktable.desktop','krita.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'pitivi.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']/" /etc/rc.d/init.d/livesys sed -i "s/favorite-apps=."'*'"/favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'darktable.desktop','krita.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'pitivi.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']/" /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override
FOE
# rebuild schema cache with any overrides we installed # rebuild schema cache with any overrides we installed
glib-compile-schemas /usr/share/glib-2.0/schemas glib-compile-schemas /usr/share/glib-2.0/schemas

View File

@@ -57,6 +57,7 @@ freecol
freedoom freedoom
freedroidrpg freedroidrpg
frozen-bubble frozen-bubble
gl-117
# glob2 - currently broken # glob2 - currently broken
lincity-ng lincity-ng
#tmw - currently broken #tmw - currently broken

View File

@@ -13,9 +13,6 @@
%include fedora-live-minimization.ks %include fedora-live-minimization.ks
%include fedora-i3-common.ks %include fedora-i3-common.ks
# need a bigger /
part / --size 6000
%post %post
# i3 configuration # i3 configuration
@@ -26,15 +23,6 @@ PREFERRED=/usr/bin/i3
DISPLAYMANAGER=/usr/sbin/lightdm DISPLAYMANAGER=/usr/sbin/lightdm
EOF EOF
# Fix https://bugzilla.redhat.com/show_bug.cgi?id=2240823
cat > /etc/xdg/autostart/xfce-polkit.desktop <<EOF
[Desktop Entry]
Type=Application
Name=xfce-polkit
Exec=/usr/libexec/xfce-polkit
EOF
# set livesys session type # set livesys session type
sed -i 's/^livesys_session=.*/livesys_session="i3"/' /etc/sysconfig/livesys sed -i 's/^livesys_session=.*/livesys_session="i3"/' /etc/sysconfig/livesys

View File

@@ -11,7 +11,7 @@
%include fedora-live-minimization.ks %include fedora-live-minimization.ks
# DVD payload # DVD payload
part / --size=9000 part / --size=8000
%post %post
%end %end

View File

@@ -11,9 +11,6 @@
%include fedora-live-minimization.ks %include fedora-live-minimization.ks
%include fedora-lxqt-common.ks %include fedora-lxqt-common.ks
# need a bigger /
part / --size 6000
%packages %packages
dracut-config-generic dracut-config-generic
%end %end

View File

@@ -19,6 +19,7 @@ part / --size 10752
pcl-devel pcl-devel
player-devel player-devel
stage-devel stage-devel
mrpt-devel
# Add version control packages # Add version control packages
git git

View File

@@ -12,7 +12,8 @@
%include fedora-live-minimization.ks %include fedora-live-minimization.ks
%include fedora-scientific-common.ks %include fedora-scientific-common.ks
part / --size 17000 # The recommended part size for DVDs is too close to use for the scientific spin
part / --size 15000
%post %post

View File

@@ -45,7 +45,6 @@ gnome-keyring-pam
-foomatic-db-ppds -foomatic-db-ppds
-foomatic -foomatic
-stix-fonts -stix-fonts
-default-fonts-core-math
-ibus-typing-booster -ibus-typing-booster
-xfce4-sensors-plugin -xfce4-sensors-plugin
-man-pages-* -man-pages-*

View File

@@ -4,7 +4,7 @@
# - A Sugar environment that you can carry in your pocket # - A Sugar environment that you can carry in your pocket
# #
# Maintainers: # Maintainers:
# - Chihurumnaya Ibiam <ibiam AT sugarlabs DOT org> # - Chihurumnaya Ibiam <ibiamchihurumnaya AT gmail DOT com>
# - Alex Perez <aperez AT alexperez DOT com> # - Alex Perez <aperez AT alexperez DOT com>
%include fedora-live-base.ks %include fedora-live-base.ks
@@ -13,14 +13,6 @@
%post %post
# Fix https://bugzilla.redhat.com/show_bug.cgi?id=2239137
cat > /etc/xdg/autostart/xfce-polkit.desktop <<EOF
[Desktop Entry]
Type=Application
Name=xfce-polkit
Exec=/usr/libexec/xfce-polkit
EOF
# set livesys session type # set livesys session type
sed -i 's/^livesys_session=.*/livesys_session="soas"/' /etc/sysconfig/livesys sed -i 's/^livesys_session=.*/livesys_session="soas"/' /etc/sysconfig/livesys

View File

@@ -10,11 +10,7 @@
# #
#include snippets/packagekit-cached-metadata.ks #include snippets/packagekit-cached-metadata.ks
part / --size 8192 part / --size 7750
%packages
gnome-initial-setup
%end
%post %post

View File

@@ -15,6 +15,9 @@
@lxde-media @lxde-media
@lxde-office @lxde-office
# FIXME: can be omitted once comps is updated
midori
# pam-fprint causes a segfault in LXDM when enabled # pam-fprint causes a segfault in LXDM when enabled
-fprintd-pam -fprintd-pam
@@ -46,7 +49,6 @@ metacity
-foomatic-db-ppds -foomatic-db-ppds
-foomatic -foomatic
-stix-fonts -stix-fonts
-default-fonts-core-math
-ibus-typing-booster -ibus-typing-booster
-xscreensaver-extras -xscreensaver-extras
#-wqy-zenhei-fonts # FIXME: Workaround to save space, do this in comps #-wqy-zenhei-fonts # FIXME: Workaround to save space, do this in comps

View File

@@ -20,6 +20,12 @@ fusion-icon
# blacklist applications which breaks mate-desktop # blacklist applications which breaks mate-desktop
-audacious -audacious
# see https://bugzilla.redhat.com/show_bug.cgi?id=2068699
# and https://bugzilla.redhat.com/show_bug.cgi?id=1933494
# use earlyoom instead of systemd-oomd-defaults
earlyoom
-systemd-oomd-defaults
# office # office
@libreoffice @libreoffice

View File

@@ -17,7 +17,8 @@ NetworkManager-wifi
# setup systemd to boot to the right runlevel # setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode" echo -n "Setting default runlevel to multiuser text mode"
systemctl set-default multi-user.target rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo . echo .
%end %end

View File

@@ -56,9 +56,18 @@ sssd-client
# Find the architecture we are on # Find the architecture we are on
arch=$(uname -m) arch=$(uname -m)
# Setup Raspberry Pi firmware # Setup Raspberry Pi firmware
if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
if [[ $arch == "aarch64" ]]; then if [[ $arch == "aarch64" ]]; then
cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
else
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 -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
fi
fi fi
releasever=$(rpm --eval '%{fedora}') releasever=$(rpm --eval '%{fedora}')

View File

@@ -10,7 +10,7 @@
nano nano
openssh-clients openssh-clients
vim-enhanced vim-enhanced
wget2-wget wget
# Remove Pythons possibly recommended by tox # Remove Pythons possibly recommended by tox
-python2 -python2
@@ -29,7 +29,6 @@ wget2-wget
-python3.8 -python3.8
-python3.9 -python3.9
-python3.10 -python3.10
-python3.11
-pypy -pypy
# Remove LaTeX, see https://bugzilla.redhat.com/show_bug.cgi?id=1862450 # Remove LaTeX, see https://bugzilla.redhat.com/show_bug.cgi?id=1862450

View File

@@ -61,10 +61,7 @@ julia
julia-doc julia-doc
julia-devel julia-devel
# FTI with Python 3.12: python3-spyder
# https://bugzilla.redhat.com/show_bug.cgi?id=2220598
# can be restored when that is fixed
#python3-spyder
python3-spyder-kernels python3-spyder-kernels
@@ -136,6 +133,7 @@ tmux
rlwrap rlwrap
hexchat hexchat
fig2ps fig2ps
bibtex2html
hevea hevea
#Include Mozilla Firefox #Include Mozilla Firefox

View File

@@ -1,4 +1,4 @@
# fedora-server-vm-full.ks (rel. 1.02) # fedora-server-vm-full.ks (rel. 1.01)
# Kickstart file to build a Fedora Server Edition VM disk image. # Kickstart file to build a Fedora Server Edition VM disk image.
# The image aims to resemble as close as technically possible the # The image aims to resemble as close as technically possible the
# full features of a Fedora Server Edition in a virtual machine. # full features of a Fedora Server Edition in a virtual machine.
@@ -174,11 +174,6 @@ touch /etc/machine-id
##### begin custom post script (after base) ######################### ##### begin custom post script (after base) #########################
%post %post
# When we build the image /var/log gets populated.
# Let's clean it up.
echo "Cleanup leftover in /var/log"
cd /var/log && find . -name \* -type f -delete
echo "Zeroing out empty space." echo "Zeroing out empty space."
# Create zeros file with nodatacow and no compression # Create zeros file with nodatacow and no compression
touch /var/tmp/zeros touch /var/tmp/zeros
@@ -193,8 +188,14 @@ sync /
# setup systemd to boot to the right runlevel # setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode" echo -n "Setting default runlevel to multiuser text mode"
systemctl set-default multi-user.target rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo . echo .
# When we build the image /var/log gets populated.
# Let's clean it up.
echo "Cleanup leftover in /var/log"
rm -rf /var/log/*
%end %end
##### end custom post script ######################################## ##### end custom post script ########################################

View File

@@ -4,7 +4,7 @@
# - A Sugar environment that you can carry in your pocket # - A Sugar environment that you can carry in your pocket
# #
# Maintainers: # Maintainers:
# - Chihurumnaya Ibiam <ibiam AT sugarlabs DOT org> # - Chihurumnaya Ibiam <ibiamchihurumnaya AT gmail DOT com>
# - Alex Perez <aperez AT alexperez DOT com> # - Alex Perez <aperez AT alexperez DOT com>
firewall --enabled --service=mdns,presence firewall --enabled --service=mdns,presence
@@ -65,9 +65,6 @@ livecd-tools
-plymouth-system-theme -plymouth-system-theme
-plymouth-theme-charge -plymouth-theme-charge
# Install XFCE polkit
xfce-polkit
%end %end
%post %post

View File

@@ -19,7 +19,7 @@ fedora-release-xfce
@xfce-media @xfce-media
@xfce-office @xfce-office
wget2-wget wget
system-config-printer system-config-printer
# save some space # save some space

View File

@@ -13,8 +13,8 @@ fas = [ "nonamedotc", "kevin", "maxamillion" ]
maintainers = [ "Mukundan Ragavan", "Kevin Fenzi", "Adam Miller" ] maintainers = [ "Mukundan Ragavan", "Kevin Fenzi", "Adam Miller" ]
[spins.kde.x86_64] [spins.kde.x86_64]
fas = [ "rdieter", "marcdeop", "ngompa" ] fas = [ "rdieter", "svahl" ]
maintainers = [ "Rex Dieter", "Marc Deop", "Neal Gompa" ] maintainers = [ "Rex Dieter", "Sebastian Vahl" ]
[spins.cinnamon.x86_64] [spins.cinnamon.x86_64]
fas = [ "grinnz" ] fas = [ "grinnz" ]
@@ -89,43 +89,3 @@ maintainers = [ "Joshua Strobl" ]
[spins.sway.x86_64] [spins.sway.x86_64]
fas = [ "alebastr", "jkonecny", "anthr76", "fale" ] fas = [ "alebastr", "jkonecny", "anthr76", "fale" ]
maintainers = [ "Aleksei Bavshin", "Jiří Konečný", "Anthony Rabbito", "Fabio Alessandro Locati" ] maintainers = [ "Aleksei Bavshin", "Jiří Konečný", "Anthony Rabbito", "Fabio Alessandro Locati" ]
[silverblue.x86_64]
fas = [ "siosm", "tpopela" ]
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" ]
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" ]
maintainers = [ "Aleksei Bavshin", "Jiří Konečný", "Anthony Rabbito", "Fabio Alessandro Locati" ]
[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" ]
maintainers = [ "Joshua Strobl" ]
[onyx.aarch64]
fas = [ "joshstrobl" ]
maintainers = [ "Joshua Strobl" ]
[onyx.ppc64le]
fas = [ "joshstrobl" ]
maintainers = [ "Joshua Strobl" ]