From d533c7a2cc85ca6024e71aaeb299d1406beb8172 Mon Sep 17 00:00:00 2001 From: pbrobinson@fedoraproject.org Date: Jan 19 2017 02:40:20 +0000 Subject: Rename *packages.ks to *common.ks as it's not just packages that should be shared in here but also common pre/post scriptlets that should be run on all images. Using common rather than packages better reflects what should go here. Signed-off-by: Peter Robinson --- diff --git a/fedora-arm-kde.ks b/fedora-arm-kde.ks index a6e06c0..8e39df7 100644 --- a/fedora-arm-kde.ks +++ b/fedora-arm-kde.ks @@ -1,6 +1,6 @@ %include fedora-arm-base.ks %include fedora-arm-xbase.ks -%include fedora-kde-packages.ks +%include fedora-kde-common.ks part / --size=5690 --fstype ext4 diff --git a/fedora-arm-lxde.ks b/fedora-arm-lxde.ks index 28a4a74..83bd119 100644 --- a/fedora-arm-lxde.ks +++ b/fedora-arm-lxde.ks @@ -1,6 +1,6 @@ %include fedora-arm-base.ks %include fedora-arm-xbase.ks -%include fedora-lxde-packages.ks +%include fedora-lxde-common.ks %post echo -n "Enabling initial-setup gui mode on startup" diff --git a/fedora-arm-mate.ks b/fedora-arm-mate.ks index d436ac1..f781c34 100644 --- a/fedora-arm-mate.ks +++ b/fedora-arm-mate.ks @@ -1,6 +1,6 @@ %include fedora-arm-base.ks %include fedora-arm-xbase.ks -%include fedora-mate-packages.ks +%include fedora-mate-common.ks part / --size=5500 --fstype ext4 diff --git a/fedora-arm-soas.ks b/fedora-arm-soas.ks index 3d87a0b..065d5ac 100644 --- a/fedora-arm-soas.ks +++ b/fedora-arm-soas.ks @@ -1,6 +1,6 @@ %include fedora-arm-base.ks %include fedora-arm-xbase.ks -%include fedora-soas-packages.ks +%include fedora-soas-common.ks %post echo -n "Enabling initial-setup gui mode on startup" diff --git a/fedora-arm-workstation.ks b/fedora-arm-workstation.ks index 80ae822..5275e98 100644 --- a/fedora-arm-workstation.ks +++ b/fedora-arm-workstation.ks @@ -1,6 +1,6 @@ %include fedora-arm-base.ks %include fedora-arm-xbase.ks -%include fedora-workstation-packages.ks +%include fedora-workstation-common.ks part / --size=5500 --fstype ext4 diff --git a/fedora-arm-xfce.ks b/fedora-arm-xfce.ks index 281fc5e..c55e299 100644 --- a/fedora-arm-xfce.ks +++ b/fedora-arm-xfce.ks @@ -1,6 +1,6 @@ %include fedora-arm-base.ks %include fedora-arm-xbase.ks -%include fedora-xfce-packages.ks +%include fedora-xfce-common.ks part / --size=4000 --fstype ext4 diff --git a/fedora-cinnamon-common.ks b/fedora-cinnamon-common.ks new file mode 100644 index 0000000..8767a63 --- /dev/null +++ b/fedora-cinnamon-common.ks @@ -0,0 +1,32 @@ +# fedora-cinnamon-common.ks +# +# Description: +# - Fedora package set for the Cinnamon Desktop Environment +# +# Maintainer(s): +# - Dan Book + +%packages + +@networkmanager-submodules +@cinnamon-desktop +@libreoffice + +# internet and multimedia +pidgin +hexchat +transmission +parole + +# make sure we have a graphical installer +yumex-dnf + +# extra backgrounds +desktop-backgrounds-basic +f25-backgrounds-extras-gnome + +# save some space +-fedora-icon-theme +-PackageKit* # we switched to yumex, so we don't need this + +%end diff --git a/fedora-cinnamon-packages.ks b/fedora-cinnamon-packages.ks deleted file mode 100644 index d035fa1..0000000 --- a/fedora-cinnamon-packages.ks +++ /dev/null @@ -1,32 +0,0 @@ -# fedora-cinnamon-packages.ks -# -# Description: -# - Fedora package set for the Cinnamon Desktop Environment -# -# Maintainer(s): -# - Dan Book - -%packages - -@networkmanager-submodules -@cinnamon-desktop -@libreoffice - -# internet and multimedia -pidgin -hexchat -transmission -parole - -# make sure we have a graphical installer -yumex-dnf - -# extra backgrounds -desktop-backgrounds-basic -f25-backgrounds-extras-gnome - -# save some space --fedora-icon-theme --PackageKit* # we switched to yumex, so we don't need this - -%end diff --git a/fedora-kde-common.ks b/fedora-kde-common.ks new file mode 100644 index 0000000..f5591b9 --- /dev/null +++ b/fedora-kde-common.ks @@ -0,0 +1,29 @@ +%packages +@firefox +@kde-apps +@kde-desktop +@kde-media +@kde-office +@kde-telepathy +@networkmanager-submodules + +### The KDE-Desktop + +### Browser +qupzilla + +### fixes + +# use kde-print-manager instead of system-config-printer +-system-config-printer +# make sure mariadb lands instead of MySQL (hopefully a temporary hack) +mariadb-embedded +mariadb-libs +mariadb-server + +# minimal localization support - allows installing the kde-l10n-* packages +system-config-language +kde-l10n + +%end + diff --git a/fedora-kde-packages.ks b/fedora-kde-packages.ks deleted file mode 100644 index f5591b9..0000000 --- a/fedora-kde-packages.ks +++ /dev/null @@ -1,29 +0,0 @@ -%packages -@firefox -@kde-apps -@kde-desktop -@kde-media -@kde-office -@kde-telepathy -@networkmanager-submodules - -### The KDE-Desktop - -### Browser -qupzilla - -### fixes - -# use kde-print-manager instead of system-config-printer --system-config-printer -# make sure mariadb lands instead of MySQL (hopefully a temporary hack) -mariadb-embedded -mariadb-libs -mariadb-server - -# minimal localization support - allows installing the kde-l10n-* packages -system-config-language -kde-l10n - -%end - diff --git a/fedora-live-cinnamon.ks b/fedora-live-cinnamon.ks index e41f4ad..c85890c 100644 --- a/fedora-live-cinnamon.ks +++ b/fedora-live-cinnamon.ks @@ -8,7 +8,7 @@ %include fedora-live-base.ks %include fedora-live-minimization.ks -%include fedora-cinnamon-packages.ks +%include fedora-cinnamon-common.ks part / --size=6144 diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks index 4819a2f..3934d85 100644 --- a/fedora-live-kde-base.ks +++ b/fedora-live-kde-base.ks @@ -3,7 +3,7 @@ # mailto:kde@lists.fedoraproject.org %include fedora-live-base.ks -%include fedora-kde-packages.ks +%include fedora-kde-common.ks %post diff --git a/fedora-live-lxde.ks b/fedora-live-lxde.ks index 9fe8a30..da3b5f2 100644 --- a/fedora-live-lxde.ks +++ b/fedora-live-lxde.ks @@ -8,7 +8,7 @@ %include fedora-live-base.ks %include fedora-live-minimization.ks -%include fedora-lxde-packages.ks +%include fedora-lxde-common.ks %post # LXDE and LXDM configuration diff --git a/fedora-live-mate_compiz.ks b/fedora-live-mate_compiz.ks index 664ef9e..d6af944 100644 --- a/fedora-live-mate_compiz.ks +++ b/fedora-live-mate_compiz.ks @@ -4,7 +4,7 @@ # mailto:desktop@lists.fedoraproject.org %include fedora-live-base.ks -%include fedora-mate-packages.ks +%include fedora-mate-common.ks %include fedora-live-minimization.ks part / --size 6144 diff --git a/fedora-live-soas.ks b/fedora-live-soas.ks index 3830ee4..50ff1ae 100644 --- a/fedora-live-soas.ks +++ b/fedora-live-soas.ks @@ -10,7 +10,7 @@ %include fedora-live-base.ks %include fedora-live-minimization.ks -%include fedora-soas-packages.ks +%include fedora-soas-common.ks firewall --enabled --service=mdns,presence diff --git a/fedora-live-workstation.ks b/fedora-live-workstation.ks index 3d4ade2..62f6403 100644 --- a/fedora-live-workstation.ks +++ b/fedora-live-workstation.ks @@ -3,7 +3,7 @@ # mailto:desktop@lists.fedoraproject.org %include fedora-live-base.ks -%include fedora-workstation-packages.ks +%include fedora-workstation-common.ks %include snippets/packagekit-cached-metadata.ks part / --size 6656 diff --git a/fedora-live-xfce.ks b/fedora-live-xfce.ks index de13dc0..c971a22 100644 --- a/fedora-live-xfce.ks +++ b/fedora-live-xfce.ks @@ -11,7 +11,7 @@ %include fedora-live-base.ks %include fedora-live-minimization.ks -%include fedora-xfce-packages.ks +%include fedora-xfce-common.ks %post # xfce configuration diff --git a/fedora-lxde-common.ks b/fedora-lxde-common.ks new file mode 100644 index 0000000..0bfc898 --- /dev/null +++ b/fedora-lxde-common.ks @@ -0,0 +1,63 @@ +# fedora-livecd-lxde.ks +# +# Description: +# - Fedora Live Spin with the light-weight LXDE Desktop Environment +# +# Maintainer(s): +# - Christoph Wickert + +%packages +### LXDE desktop +@lxde-desktop +@lxde-apps +@lxde-media +@lxde-office +@networkmanager-submodules + +# FIXME: can be omitted once comps is updated +midori + +# pam-fprint causes a segfault in LXDM when enabled +-fprintd-pam + + +# LXDE has lxpolkit. Make sure no other authentication agents end up in the spin. +-polkit-gnome +-polkit-kde + +# make sure xfce4-notifyd is not pulled in +notification-daemon +-xfce4-notifyd + +# make sure xfwm4 is not pulled in for firstboot +# https://bugzilla.redhat.com/show_bug.cgi?id=643416 +metacity + + +# dictionaries are big +#-man-pages-* +#-words + +# save some space +-autofs +-acpid +-gimp-help +-desktop-backgrounds-basic +-PackageKit* # we switched to yumex, so we don't need this +-foomatic-db-ppds +-foomatic +-stix-fonts +-ibus-typing-booster +-xscreensaver-extras +#-wqy-zenhei-fonts # FIXME: Workaround to save space, do this in comps + +# drop some system-config things +#-system-config-language +-system-config-network +-system-config-rootpassword +#-system-config-services +-policycoreutils-gui +-gnome-disk-utility + +%end + diff --git a/fedora-lxde-packages.ks b/fedora-lxde-packages.ks deleted file mode 100644 index 0bfc898..0000000 --- a/fedora-lxde-packages.ks +++ /dev/null @@ -1,63 +0,0 @@ -# fedora-livecd-lxde.ks -# -# Description: -# - Fedora Live Spin with the light-weight LXDE Desktop Environment -# -# Maintainer(s): -# - Christoph Wickert - -%packages -### LXDE desktop -@lxde-desktop -@lxde-apps -@lxde-media -@lxde-office -@networkmanager-submodules - -# FIXME: can be omitted once comps is updated -midori - -# pam-fprint causes a segfault in LXDM when enabled --fprintd-pam - - -# LXDE has lxpolkit. Make sure no other authentication agents end up in the spin. --polkit-gnome --polkit-kde - -# make sure xfce4-notifyd is not pulled in -notification-daemon --xfce4-notifyd - -# make sure xfwm4 is not pulled in for firstboot -# https://bugzilla.redhat.com/show_bug.cgi?id=643416 -metacity - - -# dictionaries are big -#-man-pages-* -#-words - -# save some space --autofs --acpid --gimp-help --desktop-backgrounds-basic --PackageKit* # we switched to yumex, so we don't need this --foomatic-db-ppds --foomatic --stix-fonts --ibus-typing-booster --xscreensaver-extras -#-wqy-zenhei-fonts # FIXME: Workaround to save space, do this in comps - -# drop some system-config things -#-system-config-language --system-config-network --system-config-rootpassword -#-system-config-services --policycoreutils-gui --gnome-disk-utility - -%end - diff --git a/fedora-mate-common.ks b/fedora-mate-common.ks new file mode 100644 index 0000000..5d4bdf5 --- /dev/null +++ b/fedora-mate-common.ks @@ -0,0 +1,56 @@ +%packages +-PackageKit* # we switched to yumex, so we don't need this +firefox +@mate +compiz +compiz-plugins-main +compiz-plugins-extra +compiz-manager +compizconfig-python +compiz-plugins-experimental +libcompizconfig +compiz-plugins-main +ccsm +simple-ccsm +emerald-themes +emerald +fusion-icon +@networkmanager-submodules +blueman + +# some apps from mate-applications +caja-actions +mate-disk-usage-analyzer + +# more backgrounds +f25-backgrounds-base +f25-backgrounds-mate +f25-backgrounds-extras-base + +# system tools +system-config-printer +system-config-printer-applet +lightdm-gtk-greeter-settings + +# audio video +parole +exaile + +# blacklist applications which breaks mate-desktop +-audacious + +# office +@libreoffice + +# dsl tools +rp-pppoe + +# some tools +p7zip +p7zip-plugins + +# FIXME; apparently the glibc maintainers dislike this, but it got put into the +# desktop image at some point. We won't touch this one for now. +nss-mdns + +%end diff --git a/fedora-mate-packages.ks b/fedora-mate-packages.ks deleted file mode 100644 index 5d4bdf5..0000000 --- a/fedora-mate-packages.ks +++ /dev/null @@ -1,56 +0,0 @@ -%packages --PackageKit* # we switched to yumex, so we don't need this -firefox -@mate -compiz -compiz-plugins-main -compiz-plugins-extra -compiz-manager -compizconfig-python -compiz-plugins-experimental -libcompizconfig -compiz-plugins-main -ccsm -simple-ccsm -emerald-themes -emerald -fusion-icon -@networkmanager-submodules -blueman - -# some apps from mate-applications -caja-actions -mate-disk-usage-analyzer - -# more backgrounds -f25-backgrounds-base -f25-backgrounds-mate -f25-backgrounds-extras-base - -# system tools -system-config-printer -system-config-printer-applet -lightdm-gtk-greeter-settings - -# audio video -parole -exaile - -# blacklist applications which breaks mate-desktop --audacious - -# office -@libreoffice - -# dsl tools -rp-pppoe - -# some tools -p7zip -p7zip-plugins - -# FIXME; apparently the glibc maintainers dislike this, but it got put into the -# desktop image at some point. We won't touch this one for now. -nss-mdns - -%end diff --git a/fedora-soas-common.ks b/fedora-soas-common.ks new file mode 100644 index 0000000..78b795e --- /dev/null +++ b/fedora-soas-common.ks @@ -0,0 +1,85 @@ +# fedora-livecd-soas.ks +# +# Description: +# - A Sugar environment that you can carry in your pocket +# +# Maintainers: +# - Peter Robinson +# - Sebastian Dziallas +# - Mel Chua + +%packages +-@fonts +-@dial-up +-@multimedia +-@printing +-foomatic +-@gnome-desktop +-yp-tools +-ypbind +-rdate +-rdist +-icedtea-web +-firefox +-glx-utils +-nmap-ncat +-PackageKit +-eekboard-libs +-open-vm-tools* +-gfs2-utils +-abrt-cli +-ibus* +-hyperv-daemons +-webkitgtk4-plugin-process-gtk2 +webkitgtk3 + +# Add some extra fonts +dejavu-sans-fonts +dejavu-sans-mono-fonts +madan-fonts +aajohan-comfortaa-fonts +sil-abyssinica-fonts +vlgothic-fonts + +# == Core Sugar Platform == +@sugar-desktop +-sugar-ruler +sugar-cp-updater +lightdm +lightdm-gtk + +# Write breaks unless we do this (we don't need it anyway) +# enable for testing in the F17 dev cycle +@input-methods + +# Needed for wifi, bluetooth and WWAN connection support +@networkmanager-submodules + +# == Platform Components == +# from http://wiki.sugarlabs.org/go/0.94/Platform_Components +alsa-plugins-pulseaudio +alsa-utils +gstreamer1-plugins-base +gstreamer1-plugins-good +gstreamer1-plugins-bad-free +gstreamer-plugins-espeak +pulseaudio +pulseaudio-utils + +# explicitly remove openbox and hopefully deal with what firstboot wants +-openbox + +# remove deps that come from god knows where +-sane-backends +-sane-backends-drivers-scanners + +# Usefulness for DSL connections as per: +# http://bugs.sugarlabs.org/ticket/1951 +rp-pppoe + +# Get the Sugar boot screen +-plymouth-system-theme +-plymouth-theme-charge +sugar-logos + +%end diff --git a/fedora-soas-packages.ks b/fedora-soas-packages.ks deleted file mode 100644 index 78b795e..0000000 --- a/fedora-soas-packages.ks +++ /dev/null @@ -1,85 +0,0 @@ -# fedora-livecd-soas.ks -# -# Description: -# - A Sugar environment that you can carry in your pocket -# -# Maintainers: -# - Peter Robinson -# - Sebastian Dziallas -# - Mel Chua - -%packages --@fonts --@dial-up --@multimedia --@printing --foomatic --@gnome-desktop --yp-tools --ypbind --rdate --rdist --icedtea-web --firefox --glx-utils --nmap-ncat --PackageKit --eekboard-libs --open-vm-tools* --gfs2-utils --abrt-cli --ibus* --hyperv-daemons --webkitgtk4-plugin-process-gtk2 -webkitgtk3 - -# Add some extra fonts -dejavu-sans-fonts -dejavu-sans-mono-fonts -madan-fonts -aajohan-comfortaa-fonts -sil-abyssinica-fonts -vlgothic-fonts - -# == Core Sugar Platform == -@sugar-desktop --sugar-ruler -sugar-cp-updater -lightdm -lightdm-gtk - -# Write breaks unless we do this (we don't need it anyway) -# enable for testing in the F17 dev cycle -@input-methods - -# Needed for wifi, bluetooth and WWAN connection support -@networkmanager-submodules - -# == Platform Components == -# from http://wiki.sugarlabs.org/go/0.94/Platform_Components -alsa-plugins-pulseaudio -alsa-utils -gstreamer1-plugins-base -gstreamer1-plugins-good -gstreamer1-plugins-bad-free -gstreamer-plugins-espeak -pulseaudio -pulseaudio-utils - -# explicitly remove openbox and hopefully deal with what firstboot wants --openbox - -# remove deps that come from god knows where --sane-backends --sane-backends-drivers-scanners - -# Usefulness for DSL connections as per: -# http://bugs.sugarlabs.org/ticket/1951 -rp-pppoe - -# Get the Sugar boot screen --plymouth-system-theme --plymouth-theme-charge -sugar-logos - -%end diff --git a/fedora-workstation-common.ks b/fedora-workstation-common.ks new file mode 100644 index 0000000..f593821 --- /dev/null +++ b/fedora-workstation-common.ks @@ -0,0 +1,30 @@ +%packages + +# Exclude unwanted groups that fedora-live-base.ks pulls in +-@dial-up +-@input-methods +-@standard + +# Make sure to sync any additions / removals done here with +# workstation-product-environment in comps +@base-x +@core +@firefox +@fonts +@gnome-desktop +@guest-desktop-agents +@hardware-support +@libreoffice +@multimedia +@networkmanager-submodules +@printing +@workstation-product + +# Branding for the installer +fedora-productimg-workstation + +# Exclude unwanted packages from @anaconda-tools group +-gfs2-utils +-reiserfs-utils + +%end diff --git a/fedora-workstation-packages.ks b/fedora-workstation-packages.ks deleted file mode 100644 index f593821..0000000 --- a/fedora-workstation-packages.ks +++ /dev/null @@ -1,30 +0,0 @@ -%packages - -# Exclude unwanted groups that fedora-live-base.ks pulls in --@dial-up --@input-methods --@standard - -# Make sure to sync any additions / removals done here with -# workstation-product-environment in comps -@base-x -@core -@firefox -@fonts -@gnome-desktop -@guest-desktop-agents -@hardware-support -@libreoffice -@multimedia -@networkmanager-submodules -@printing -@workstation-product - -# Branding for the installer -fedora-productimg-workstation - -# Exclude unwanted packages from @anaconda-tools group --gfs2-utils --reiserfs-utils - -%end diff --git a/fedora-xfce-common.ks b/fedora-xfce-common.ks new file mode 100644 index 0000000..4455501 --- /dev/null +++ b/fedora-xfce-common.ks @@ -0,0 +1,45 @@ +# fedora-livecd-xfce.ks +# +# Description: +# - Fedora Live Spin with the light-weight XFCE Desktop Environment +# +# Maintainer(s): +# - Rahul Sundaram +# - Christoph Wickert +# - Kevin Fenzi +# - Adam Miller + + +%packages + +@networkmanager-submodules +@xfce-desktop +@xfce-apps +@xfce-extra-plugins +@xfce-media +@xfce-office + +# unlock default keyring. FIXME: Should probably be done in comps +gnome-keyring-pam +# Admin tools are handy to have +@admin-tools +# Add some screensavers, people seem to like them +# Note that blank is still default. +xscreensaver-extras +wget +# Handy for debugging +rfkill +# Better more popular browser +firefox +system-config-printer + +# save some space +-autofs +-acpid +-gimp-help +-desktop-backgrounds-basic +-PackageKit* # we switched to yumex, so we don't need this +-aspell-* # dictionaries are big +-xfce4-sensors-plugin + +%end diff --git a/fedora-xfce-packages.ks b/fedora-xfce-packages.ks deleted file mode 100644 index 4455501..0000000 --- a/fedora-xfce-packages.ks +++ /dev/null @@ -1,45 +0,0 @@ -# fedora-livecd-xfce.ks -# -# Description: -# - Fedora Live Spin with the light-weight XFCE Desktop Environment -# -# Maintainer(s): -# - Rahul Sundaram -# - Christoph Wickert -# - Kevin Fenzi -# - Adam Miller - - -%packages - -@networkmanager-submodules -@xfce-desktop -@xfce-apps -@xfce-extra-plugins -@xfce-media -@xfce-office - -# unlock default keyring. FIXME: Should probably be done in comps -gnome-keyring-pam -# Admin tools are handy to have -@admin-tools -# Add some screensavers, people seem to like them -# Note that blank is still default. -xscreensaver-extras -wget -# Handy for debugging -rfkill -# Better more popular browser -firefox -system-config-printer - -# save some space --autofs --acpid --gimp-help --desktop-backgrounds-basic --PackageKit* # we switched to yumex, so we don't need this --aspell-* # dictionaries are big --xfce4-sensors-plugin - -%end