Remove Ninja IDE from Python Classroom Lab

It drags Python 2, is orphaned, FTBFS.
drop chkconfig from arm kickstart
2025-12-09 00:20:31 +08:00 · 2019-05-17 01:14:13 +02:00 · 2019-05-08 14:03:33 +01:00 · 2019-05-05 14:16:11 +02:00 · 2019-04-09 20:18:44 +02:00 · 2019-04-04 06:38:54 +01:00
8 changed files with 16 additions and 41 deletions
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -43,11 +43,6 @@ initial-setup-gui

 # make sure all the locales are available for inital0-setup and anaconda to work
 glibc-all-langpacks
-
-# this ks uses it in %post, and imgcreate also uses it in the installed
-# system root, so it needs to be there
-chkconfig
-
 %end

 %post
@@ -76,13 +71,8 @@ systemctl mask tmp.mount

 dnf -y remove dracut-config-generic

-# Disable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network off
-
 # Remove machine-id on pre generated images
 rm -f /etc/machine-id
 touch /etc/machine-id

 %end
-
--- a/fedora-container-base.ks
+++ b/fedora-container-base.ks
@@ -13,8 +13,6 @@ dnf
 dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 sssd-client
 sudo
-glibc-langpack-en
-cracklib-dicts
 %end

 %post --erroronfail --log=/root/anaconda-post.log
@@ -47,15 +45,3 @@ systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
 rm /run/nologin # https://pagure.io/atomic-wg/issue/316

 %end
-
-%post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
-set -eux
-
-# See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816
-# NOTE: run this in nochroot because "find" does not exist in chroot
-KEEPLANG=en_US
-for dir in locale i18n; do
-    find /mnt/sysimage/usr/share/${dir} -mindepth  1 -maxdepth 1 -type d -not \( -name "${KEEPLANG}" -o -name POSIX \) -exec rm -rfv {} +
-done
-
-%end
--- a/fedora-container-common.ks
+++ b/fedora-container-common.ks
@@ -61,9 +61,6 @@ set -eux
 LANG="en_US"
 echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf

-# 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 -q --qf '%{version}\n' fedora-release-container)
--- a/fedora-iot.ks
+++ b/fedora-iot.ks
@@ -24,7 +24,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/stable/${basearch}/iot
+ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/devel/${basearch}/iot

 reboot

@@ -44,19 +44,19 @@ 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/stable/${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
 # to the updated origin) exists.
-ostree refs "fedora-iot:fedora/stable/${arch}/iot" --create "fedora-iot:fedora/stable/${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.
-ostree refs "fedora-iot:fedora/stable/${arch}/iot" --delete
+ostree refs "fedora-iot:fedora/devel/${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'
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-iot-2019 --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist  fedora-iot 'https://ostree.fedoraproject.org/iot'

 # We're gettin a stray console= from somewhere, work around it
 rpm-ostree kargs --delete=console=tty0
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -6,6 +6,7 @@
 # Maintainer:
 # - Luya Tshimbalanga <luya AT fedoraproject DOT org>
 # - Credit to Sebastian Dziallas for initiating the project
+
 %include fedora-live-workstation.ks

 # Size partition
@@ -16,10 +17,11 @@ part / --size 14336
@design-suite

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

 # Add extra gnome applications
+gnome-books
 gnome-calendar
 gnome-photos
 gnome-shell-extension-pomodoro
@@ -30,7 +32,8 @@ powerline
 powerline-fonts

 # Extra wallpapers
-f30-backgrounds-extras-gnome
+f28-backgrounds-extras-base
+f28-backgrounds-extras-gnome

 # removal of unneeded applications
 -gnome-boxes
@@ -38,7 +41,7 @@ f30-backgrounds-extras-gnome
 -rdesktop

 # temporarily removing conflicting application
-synfigstudio
+-LuxRender-blender
 -mypaint

 %end
--- a/fedora-python-classroom-gnome-common.ks
+++ b/fedora-python-classroom-gnome-common.ks
@@ -7,7 +7,6 @@
 %include fedora-python-classroom-common.ks

 %packages
-ninja-ide
 emacs
 python3-matplotlib-tk
 python3-pillow-tk
--- a/fedora-repo.ks
+++ b/fedora-repo.ks
@@ -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
--- a/fedora-scientific-common.ks
+++ b/fedora-scientific-common.ks
@@ -57,7 +57,7 @@ gcc-gfortran
 rkward

 # GUI for Octave
-#qtoctave
+qtoctave

 # julia
 # Comment out till build failure is sorted
@@ -70,7 +70,7 @@ rkward
 # Workaround for https://pagure.io/releng/issue/7814
 -eclipse-linuxtools-vagrant

-#spyder
+spyder

 #writing & publishing
 emacs
Author	SHA1	Message	Date
Miro Hrončok	5ee03735d6	Remove Ninja IDE from Python Classroom Lab It drags Python 2, is orphaned, FTBFS.	2019-05-17 01:14:13 +02:00
Peter Robinson	4f004227f3	drop chkconfig from arm kickstart The livecd-tools/imgcreate issue where it still used chkconfig to enable services was resolved with release 27.0-1 so the chkconfig requirement can now be dropped. Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>	2019-05-08 14:03:33 +01:00
Clement Verna	d1d9de9a97	Add sudo to the fedora container base image. sudo is needed in the base image for it to be used in Azure services Signed-off-by: Clement Verna <cverna@tutanota.com>	2019-05-05 14:16:11 +02:00
Miro Hrončok	fa5c8ccf35	Add more space for the Python Classroom lab See https://bugzilla.redhat.com/show_bug.cgi?id=1695796	2019-04-09 20:18:44 +02:00
Peter Robinson	06ce4be308	Remove obsolete network service disable We don't ship traditional network scripts in any of the arm images anymore so this is a no-op. Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>	2019-04-04 06:38:54 +01:00
Adam Williamson	9b0b39f7d6	Add chkconfig package to fedora-arm-base.ks Both the kickstart itself and imgcreate expect chkconfig to be available in the installed system, so we'd better make sure it is. Up till Fedora 30 Beta it was getting pulled in somehow; since Fedora-30-20190330.n.3 it seems it is not (probably not in Rawhide either). In any case, it's clearly correct to list it explicitly. See https://bugzilla.redhat.com/show_bug.cgi?id=1695637 Signed-off-by: Adam Williamson <awilliam@redhat.com>	2019-04-03 11:56:06 -07:00
Peter Robinson	24b73a6270	Merge #507 `Scientific: Remove python2 packages`	2019-03-29 02:14:35 +00:00
Miro Hrončok	174b5721ec	Stop dragging Python 3.6 and 3.8 to Python Classroom	2019-03-27 00:23:39 +01:00
Amit Saha	ab1363a4bc	Scientific: Remove python2 packages	2019-03-22 07:27:49 +11:00
raveit65	f84b197d1e	MATE-arm: increase part size	2019-03-21 09:52:53 +01:00
Adam Williamson	2611d60fd0	Explicitly pull chkconfig into live images As livesys and livesys-late are still SysV services, they need systemd-sysv-install to work, which is part of chkconfig. Until now chkconfig was getting pulled into live images via packages that require update-alternatives, which was previously part of chkconfig - but it just got split into its own package, so now those packages don't pull in chkconfig any more. This broke the KDE live image and probably several others in recent Rawhide, livesys and livesys-late don't run so there's no 'liveuser' and root isn't accessible. Workstation didn't break because a java package still pulls chkconfig into it. Signed-off-by: Adam Williamson <awilliam@redhat.com>	2019-03-20 08:46:09 -07:00
Paul Whalen	200f6930a6	Add epiphany browser to arm disk images.	2019-03-19 13:16:01 -04:00
Stephen Gallagher	ab7ee6e6db	Sync Fedora Server with comps Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>	2019-03-04 21:06:25 +00:00
Dan Book	6527f89bde	switch to f30 background extras	2019-03-04 13:05:45 -05:00
Zbigniew Jędrzejewski-Szmek	86e0dc18cf	Use dnf instead of yum I left the instructions for yum-langpacks around, because I'm not sure how the dnf replacement looks. But all references to yum-the-executable are gone. https://fedoraproject.org/wiki/Changes/Retire_YUM_3 https://bugzilla.redhat.com/show_bug.cgi?id=1682910	2019-02-26 11:38:44 +01:00
Kevin Fenzi	d64a181fa3	l10n: Correct Xfce include for l10n files. Bug 1669894 Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2019-02-23 16:26:37 -08:00