Compare commits

...

20 Commits
f42 ... f39

Author SHA1 Message Date
Ian Wienand
531de62a15 fedora-container-toolbox: drop systemd
Since change 48e2c3b559 this kickstart
is pulling in systemd.

This was noticed because since
b5fc5fd17d started bringing in
weak-dependencies, we started installing systemd-resolved is which
created a symlinked /etc/resolv.conf in the image.  Toolbox will not
currently reset this on container start, as it is a symlink (this
behaviour is a bit complicated; see [1]).  This leads to an
incompatability running the toolbox on *non* systemd-resolved hosts
(e.g. RHEL9); you are left with a dangling symlink and no
name-resolution in the toolbox.

We do not want systemd in the toolbox image by default it; remove it
from the list.  Exclude systemd-resolved specifically, so if something
else brings in systemd we still don't include this.

[1] https://github.com/containers/toolbox/issues/1410

https://pagure.io/fedora-kickstarts/pull-request/1027
2024-03-06 19:21:57 +01:00
Luya Tshimbalanga
465debb7c9 Drop unmaintained gnome-photos 2023-10-26 22:51:27 +00:00
Chihurumnaya Ibiam
51eec3f2c3 Add xfce-polkit to SOAS
Signed-off-by: Chihurumnaya Ibiam <ibiam@sugarlabs.org>
2023-10-26 15:35:17 -07:00
Debarshi Ray
b1e4e49696 container-toolbox: Add psmisc
It's currently being pulled in as a dependency of iproute.  However,
since it's explicitly mentioned in the list of default packages on
Fedora Silverblue and Workstation [1], it should be mentioned here too.

The same change was also made to the Container/Dockerfile equivalent of
the fedora-toolbox OCI images [2].

[1] fedora-comps commit e4ed54dfcc497fd0
    https://pagure.io/fedora-comps/c/e4ed54dfcc497fd0
    https://pagure.io/fedora-comps/pull-request/379

[2] Toolbx commit e41d920dd9a847cc
    https://github.com/containers/toolbox/commit/e41d920dd9a847cc
    https://github.com/containers/toolbox/pull/1390

https://bugzilla.redhat.com/show_bug.cgi?id=2244503
https://pagure.io/fedora-kickstarts/pull-request/1005
2023-10-25 20:32:12 +02:00
Debarshi Ray
6bb64d1c59 container-toolbox: Use vim-minimal, not vim-enhanced
Fedora Silverblue and Workstation, and hence the Container/Dockerfile
equivalent of the fedora-toolbox OCI images, contain vim-minimal by
default, not vim-enhanced.  This is because the default editor is GNU
nano, not Vim.

https://bugzilla.redhat.com/show_bug.cgi?id=2244503
https://pagure.io/fedora-kickstarts/pull-request/1005
2023-10-25 20:32:04 +02:00
Debarshi Ray
f2c6224ade container-toolbox: Install all languages (part 2)
This is a continuation from commit 9456429624, which tried to
ensure that all languages are present in the fedora-toolbox OCI image by
removing --inst-langs=en from fedora-container-toolbox.ks.  Sadly, this
wasn't enough.

The image was still missing various localization bits like translations
for programs and manuals.  All translations for all programs, such as
LC_MESSAGES and LC_TIME, were missing, except for those coming from
glibc-all-langpacks.  eg., see:
  $ LANG=cs_CZ.UTF-8 cp foo bar
  cp: cannot stat 'foo': Adresář nebo soubor neexistuje

Only the part coming from glibc is translated.  The part coming from
coreutils isn't.  There are lots and lots of such packages.  eg., bash,
coreutils, dnf, grep, rpm, sed, tar, etc..

Any package with translated manuals marked with %lang() in their %files
section were missing them.  eg., man-db, passwd, psmisc, etc..

Finally, even though the %pre section in fedora-container-toolbox.ks
removes %_install_langs from /etc/rpm/macros.image-language-conf, it was
still set to en_US in the final image.

This was happening because fedora-container-toolbox.ks includes
fedora-container-common.ks, and some unintended bits from the latter
were leaking into the fedora-toolbox OCI image's build.

The image was still being built with '%packages --inst-langs=en',
possibly since fedora-container-common.ks has '%package --instLangs=en'.
That option wasn't just being applied to the packages being installed by
fedora-container-common.ks, but also to those being installed by
fedora-container-toolbox.ks [1].

Secondly, fedora-container-common.ks sets %_install_langs to en_US in
its %post section.  This will strip out all non-English languages from
future RPM transactions in containers created from the image.

To address this, fedora-container-toolbox.ks has now been decoupled from
fedora-container-common.ks, by copying over the relevant bits.

[1] https://koji.fedoraproject.org/koji/buildinfo?buildID=2311452
    https://kojipkgs.fedoraproject.org//packages/Fedora-Container-Toolbox/Rawhide/20231025.n.0/images/fedora-container-toolbox.ks
    https://kojipkgs.fedoraproject.org//packages/Fedora-Container-Toolbox/Rawhide/20231025.n.0/images/koji-f40-build-108073454-base.ks
    https://kojipkgs.fedoraproject.org//packages/Fedora-Container-Toolbox/Rawhide/20231025.n.0/data/logs/image/oz-aarch64.log

https://bugzilla.redhat.com/show_bug.cgi?id=2244503
https://pagure.io/fedora-kickstarts/pull-request/1004
2023-10-25 20:19:51 +02:00
Debarshi Ray
9456429624 container-toolbox: Install all languages
The Container/Dockerfile equivalent of the fedora-toolbox OCI images
installed all languages by removing %_install_langs (set to en_US by the
fedora base image) from /etc/rpm/macros.image-language-conf [1].  The
Kickstart does the same in the %pre section.

Therefore, it's self-contradictory to have '%packages --inst-langs=en'.

The fedora-toolbox OCI image is meant for interactive command line
environments, not for deploying server applications.  Therefore, they
need a fully featured CLI user experience at par with what's offered on
Fedora Silverblue and Workstation.  Among the Kickstart files defined
here, other than fedora-container-toolbox.ks, only these ones don't
install all languages:
  * fedora-cloud-base.ks
  * fedora-container-base-minimal.ks
  * fedora-container-base.ks
  * fedora-container-common.ks
  * fedora-eln-container-base.ks
  * fedora-server-vm-full.ks

All the other Kickstarts, and definitely those for Fedora Workstation,
install all languages.

[1] https://src.fedoraproject.org/container/fedora-toolbox
    https://github.com/containers/toolbox/tree/main/images/fedora

https://bugzilla.redhat.com/show_bug.cgi?id=2244503
https://pagure.io/fedora-kickstarts/pull-request/998
2023-10-16 19:24:43 +02:00
Debarshi Ray
b5fc5fd17d container-toolbox: Include weak dependencies
The Container/Dockerfile equivalent of the fedora-toolbox OCI images
didn't exclude weak dependencies [1] so the Kickstart shouldn't either.

The fedora-toolbox OCI image is meant for interactive command line
environments, not for deploying server applications.  Therefore, they
need a fully featured CLI user experience at par with what's offered on
Fedora Silverblue and Workstation.  Among the Kickstart files defined
here, other than fedora-container-toolbox.ks, only these ones exclude
weak dependencies:
  * fedora-container-base-minimal.ks
  * fedora-container-base.ks
  * fedora-container-common.ks
  * fedora-eln-container-base.ks
  * fedora-modular-disk-minimal.ks

None of the other Kickstarts, and definitely not those for Fedora
Workstation, exclude weak dependencies.

[1] https://src.fedoraproject.org/container/fedora-toolbox
    https://github.com/containers/toolbox/tree/main/images/fedora

https://bugzilla.redhat.com/show_bug.cgi?id=2244503
https://pagure.io/fedora-kickstarts/pull-request/996
2023-10-16 19:20:49 +02:00
Debarshi Ray
bbd9f3c0e8 container-toolbox: Fix typo between %pre and %post
The snippet to fix the /run/lock breakage and the lines following it
were copied from the first %post section in fedora-container-base.ks.
However, the %end marker to terminate the previous %pre section, and the
starting %post marker went missing in fedora-container-toolbox.ks

https://bugzilla.redhat.com/show_bug.cgi?id=2244503
https://pagure.io/fedora-kickstarts/pull-request/994
2023-10-16 19:19:08 +02:00
Odilon Sousa
331ab0d31f Add xfce-polkit to i3-Spin
This fix https://bugzilla.redhat.com/show_bug.cgi?id=2240823 and https://pagure.io/i3-sig/Fedora-i3-Spin/issue/68
2023-09-26 17:00:54 -03:00
Jeremy Linton
4b2e10da5b fedora-live-base: Exclude sdubby from live installs
systemd-boot is not yet supported on live media. Yet we
want it to appear on images where anaconda is installing
a system from RPMs (ex: the server dvd image).
The fix for this problem at the moment is to exclude anaconda
packages during the live media creation.

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
2023-09-20 16:49:54 -05:00
Adam Williamson
75ad9f7fdb Revert "Revert "Revert "Turn on anaconda-webui for workstation"""
This reverts commit 3fe657c2fe.
It's the rare triple reversion! FESCo has decided to invoke the
contingency plan for
https://fedoraproject.org/wiki/Changes/AnacondaWebUIforFedoraWorkstation
and push the webUI out to Fedora 40, so we need to turn it off
again for Fedora 39.
2023-09-12 11:03:52 -07:00
Adam Williamson
f02c61e527 Security: exclude default-fonts-core-math
See a90d590e00 - this is the same
fix, for the security image. As with LXDE, since
https://fedoraproject.org/wiki/Changes/ImproveDefaultFontHandling
we need to also drop default-fonts-core-math if we want to drop
stix-fonts, or the image build fails.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2023-08-30 19:48:36 +00:00
Adam Williamson
b2324c3bd9 Drop python3-spyder from astronomy_kde and scientific
It is FTI with Python 3.12, and fixing it requires handling two
rather complex dependency chains:
https://bugzilla.redhat.com/show_bug.cgi?id=2220598
so it's not going to be fixed overnight. Let's drop it from the
spins for now to get them building again.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2023-08-29 22:19:56 +00:00
Adam Williamson
ad422e753f Bump root partition size for KDE live
The aarch64 KDE live image build is failing due to lack of space:
https://kojipkgs.fedoraproject.org//work/tasks/6017/105476017/livemedia-out.log
so let's bump it.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2023-08-29 13:17:18 -07:00
Kevin Fenzi
3fe657c2fe Revert "Revert "Turn on anaconda-webui for workstation""
This reverts commit 53584f236d.

Now we have things working again we want to give this another go in
rawhide. So, revert the revert you revert.
2023-08-23 14:05:50 -07:00
Adam Williamson
e4fa723598 Revert "Turn on anaconda-webui for workstation"
This reverts commit ce5b31416f.
The anaconda update with the webUI changes is failing tests,
and we do not have time to resolve this right away. We can't
leave this in place without also pushing the anaconda update
stable and adjusting the openQA tests, so let's revert it for
now so tests pass on other updates, until we can come back and
clean up the webUI stuff tomorrow.
2023-08-21 17:38:14 -07:00
Ray Strode
899d623a4e Turn on anaconda-webui for workstation 2023-08-21 14:00:33 -04:00
Mamoru TASAKA
7ec71ebb88 F39 LXDE: exclude default-fonts-core-math
LXDE already excluded math related stix-fonts to save space.

Now with https://fedoraproject.org/wiki/Changes/ImproveDefaultFontHandling ,
fonts entry on comps now includes default-fonts-core-math as default
package, so exclude this also.
2023-08-10 22:15:02 +09:00
Kevin Fenzi
f2812c2e27 add f39 branched config
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2023-08-08 17:22:01 -07:00
14 changed files with 100 additions and 15 deletions

View File

@@ -1,26 +1,42 @@
# Kickstart file for Fedora Toolbox
# See fedora-container-common.ks for details on how to hack on container image kickstarts
# This base is a standard Fedora image with python3 and dnf
%include fedora-container-common.ks
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 --inst-langs=en --nocore --exclude-weakdeps
%packages --nocore
acl
bash
bash-completion
bc
bzip2
coreutils
coreutils-common
curl
diffutils
dnf
dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29
dnf-plugins-core
-dosfstools
-e2fsprogs
fedora-release-container
findutils
flatpak-spawn
fpaste
-fuse-libs
gawk
git
-glibc-minimal-langpack
@@ -28,15 +44,18 @@ 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
@@ -51,30 +70,39 @@ p11-kit
pam
passwd
pigz
-pinentry
procps-ng
psmisc
python3
rootfiles
rpm
rsync
sed
shadow-utils
-shared-mime-info
-sssd-client
sudo
systemd
# 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
unzip
util-linux
util-linux-core
vim-enhanced
vim-minimal
vte-profile
vulkan-loader
wget
which
whois
words
-xkeyboard-config
xorg-x11-xauth
xz
zip
@@ -90,6 +118,33 @@ 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

View File

@@ -12,7 +12,6 @@ deja-dup
# Add extra gnome applications
#gnome-books
gnome-calendar
gnome-photos
gnome-pomodoro
gnome-todo

View File

@@ -24,6 +24,8 @@ gnome-keyring-pam
wget
# Better more popular browser
system-config-printer
# Install XFCE polkit
xfce-polkit
# save some space
-autofs

View File

@@ -19,7 +19,7 @@ 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/rawhide/${basearch}/iot
ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/39/${basearch}/iot
reboot
@@ -34,14 +34,14 @@ 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/rawhide/${arch}/iot"
ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/39/${arch}/iot"
# Make sure the ref we're supposedly sitting on (according
# to the updated origin) exists.
ostree refs "fedora-iot:fedora/rawhide/${arch}/iot" --create "fedora-iot:fedora/rawhide/${arch}/iot"
ostree refs "fedora-iot:fedora/39/${arch}/iot" --create "fedora-iot:fedora/39/${arch}/iot"
# Remove the old ref so that the commit eventually gets cleaned up.
ostree refs "fedora-iot:fedora/rawhide/${arch}/iot" --delete
ostree refs "fedora-iot:fedora/39/${arch}/iot" --delete
# delete/add the remote with new options to enable gpg verification
# and to point them at the cdn url

View File

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

View File

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

View File

@@ -23,6 +23,15 @@ PREFERRED=/usr/bin/i3
DISPLAYMANAGER=/usr/sbin/lightdm
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
sed -i 's/^livesys_session=.*/livesys_session="i3"/' /etc/sysconfig/livesys

View File

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

View File

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

View File

@@ -13,6 +13,14 @@
%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
sed -i 's/^livesys_session=.*/livesys_session="soas"/' /etc/sysconfig/livesys

View File

@@ -49,6 +49,7 @@ metacity
-foomatic-db-ppds
-foomatic
-stix-fonts
-default-fonts-core-math
-ibus-typing-booster
-xscreensaver-extras
#-wqy-zenhei-fonts # FIXME: Workaround to save space, do this in comps

View File

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

View File

@@ -61,7 +61,10 @@ julia
julia-doc
julia-devel
python3-spyder
# FTI with Python 3.12:
# https://bugzilla.redhat.com/show_bug.cgi?id=2220598
# can be restored when that is fixed
#python3-spyder
python3-spyder-kernels

View File

@@ -65,6 +65,9 @@ livecd-tools
-plymouth-system-theme
-plymouth-theme-charge
# Install XFCE polkit
xfce-polkit
%end
%post