diff options
| -rw-r--r-- | Fedora.kiwi | 1 | ||||
| -rwxr-xr-x | config.sh | 37 | ||||
| -rw-r--r-- | maintainers.toml | 6 | ||||
| -rwxr-xr-x | scripts/fedora-live-iso-label-generator | 1 | ||||
| -rw-r--r-- | teams/robotics.xml | 82 |
5 files changed, 1 insertions, 126 deletions
diff --git a/Fedora.kiwi b/Fedora.kiwi index 14ae803..3090899 100644 --- a/Fedora.kiwi +++ b/Fedora.kiwi @@ -62,7 +62,6 @@ <include from="this://./teams/games.xml"/> <include from="this://./teams/security.xml"/> <include from="this://./teams/jam.xml"/> - <include from="this://./teams/robotics.xml"/> <packages type="bootstrap"> <package name="filesystem"/> </packages> @@ -341,43 +341,6 @@ FOE EOF fi -if [[ "$kiwi_profiles" == *"Robotics"* ]]; then - -# Extend the post-configuration from the live-desktop, set default shortcuts to IDEs -cat >> /var/lib/livesys/livesys-session-extra << EOF -# disable screensaver locking -cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE -[org.gnome.desktop.screensaver] -lock-enabled=false -FOE - -# and hide the lock screen option -cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override << FOE -[org.gnome.desktop.lockdown] -disable-lock-screen=true -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['org.mozilla.firefox.desktop', 'org.qt-project.qtcreator.desktop', 'arduino.desktop', 'gnome-terminal.desktop','nautilus.desktop', 'anaconda.desktop'] -FOE - -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -EOF - -fi - if [[ "$kiwi_profiles" == *"Design_suite"* ]]; then # Add link to lists of tutorials cat >> /usr/share/applications/list-design-tutorials.desktop << FOE diff --git a/maintainers.toml b/maintainers.toml index 0ca48ff..ea497e5 100644 --- a/maintainers.toml +++ b/maintainers.toml @@ -82,11 +82,7 @@ maintainers = [ "JT Pennington", "Cristian Le", "SciTech SIG" ] [labs.scientific.x86_64] fas = [ "q5sys", "lecris", "scitech" ] -maintainers = [ "JT Pennington", "Cristian Le", "SciTech SIG" ] - -[labs.robotics.x86_64] -fas = [ "lrossett", "robotics-sig" ] -maintainers = [ "Leonardo Rossetti", "Robotics SIG" ] +maintainers = [ "JT Pennington", "Cristian Le", "SciTech SIG" ] [spins.i3.x86_64] fas = [ "jflory7", "defolos", "nasirhm", "odilhao", "x3mboy" ] diff --git a/scripts/fedora-live-iso-label-generator b/scripts/fedora-live-iso-label-generator index 00f457e..fc5cef6 100755 --- a/scripts/fedora-live-iso-label-generator +++ b/scripts/fedora-live-iso-label-generator @@ -49,7 +49,6 @@ volume_id_substitutions = { # Note https://pagure.io/pungi-fedora/issue/533 "Python-Classroom": "Clss", "Python_Classroom": "Clss", - "Robotics": "Robo", "Scientific_KDE": "SciK", "Security": "Sec", "Sericea": "Src", diff --git a/teams/robotics.xml b/teams/robotics.xml deleted file mode 100644 index 5c84c79..0000000 --- a/teams/robotics.xml +++ /dev/null @@ -1,82 +0,0 @@ -<image> - <profiles> - <profile name="RoboticsCore" description="Core packages for Robotics"> - </profile> - <profile name="RoboticsGNOMEDesktop" description="Desktop packages for Robotics"> - <requires profile="RoboticsCore"/> - <requires profile="DesktopCommon"/> - </profile> - <profile name="Robotics-Live" description="Robotics Lab Live DVD"> - <requires profile="RoboticsGNOMEDesktop"/> - <requires profile="LiveInstall"/> - </profile> - <profile name="Robotics-Disk" description="Robotics Lab Install Disk"> - <requires profile="RoboticsGNOMEDesktop"/> - <requires profile="BootDiskCore"/> - </profile> - </profiles> - <packages type="bootstrap" patternType="plusRecommended" profiles="RoboticsGNOMEDesktop"> - <package name="fedora-release-workstation"/> - </packages> - <packages type="image" patternType="plusRecommended" profiles="RoboticsCore"> - <namedCollection name="core"/> - <namedCollection name="standard"/> - <!-- Add robotics suite development packages --> - <namedCollection name="robotics-suite"/> - <package name="langpacks-en"/> - <package name="nano"/> - <package name="openssh-clients"/> - <package name="vim-enhanced"/> - <package name="wget2-wget"/> - <!-- Add version control packages --> - <package name="git"/> - <package name="mercurial"/> - <!-- No abrt --> - <ignore name="abrt*"/> - <!-- No legacy crontab --> - <ignore name="cron*"/> - <!-- Remove LaTeX stack (rhbz#1862450, rhbz#1902354) --> - <ignore name="texlive-base"/> - <ignore name="texlive-latex"/> - <!-- Dictionaries are big --> - <ignore name="aspell-*"/> - <ignore name="man-pages*"/> - <ignore name="words"/> - </packages> - <packages type="image" patternType="plusRecommended" profiles="RoboticsGNOMEDesktop"> - <namedCollection name="base-graphical"/> - <namedCollection name="desktop-accessibility"/> - <namedCollection name="firefox"/> - <namedCollection name="gnome-desktop"/> - <namedCollection name="guest-desktop-agents"/> - <namedCollection name="networkmanager-submodules"/> - <package name="emacs"/> - <!-- Drop some system-config things --> - <ignore name="system-config-language"/> - <ignore name="system-config-network"/> - <ignore name="system-config-rootpassword"/> - <ignore name="system-config-services"/> - <ignore name="system-config-printer*"/> - <ignore name="policycoreutils-gui"/> - <!-- No user docs --> - <ignore name="gnome-user-docs"/> - <!-- No inkscape --> - <ignore name="inkscape*"/> - <ignore name="GraphicsMagick*"/> - <ignore name="ImageMagick*"/> - <!-- Block extra GNOME applications --> - <ignore name="gnome-boxes"/> - <ignore name="gnome-calendar"/> - <ignore name="gnome-clocks"/> - <ignore name="gnome-contacts"/> - <ignore name="gnome-disk-utility"/> - <ignore name="gnome-documents"/> - <ignore name="gnome-font-viewer"/> - <ignore name="gnome-maps"/> - <ignore name="gnome-photos"/> - <ignore name="gnome-weather"/> - <ignore name="grilo-plugins"/> - <ignore name="totem"/> - <ignore name="totem-nautilus"/> - </packages> -</image> |