davidlt/fedora-comps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

workstation: Explode a few groups into workstation-product

Browse Source 
Workstation's package selection is currently not very well structured.
It's loosely based on comps groups, but on top of that comes a large
number of package removals and additions in the kickstart files. This
makes the current setup difficult to understand and maintain.

This commit paves the way to moving package selection back into comps
and getting rid of additions/removals in spin-kickstarts.

A large number of cuts are currently done from the dial-up, firefox,
gnome-desktop, input-methods and standard groups. This commit explodes
the packages in those groups into the workstation-product group in order
to make it possible to do Workstation package selection (cuts) here in
comps.

The main motivation behind this change is to make Workstation netinstall
work. To get there, package selection has to be done wholly in comps.

https://bugzilla.redhat.com/show_bug.cgi?id=1134524
This commit is contained in:
Kalev Lember 2014-08-28 18:23:16 +02:00
parent aa1a82d0ce
commit 9556e79795
2 changed files with 444 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

227
comps-f21.xml.in
View File

@ -6341,6 +6341,228 @@
<uservisible>false</uservisible>
<packagelist>
<packagereq type="mandatory">fedora-release-workstation</packagereq>
<packagereq>abrt-cli</packagereq>
<packagereq>abrt-desktop</packagereq>
<packagereq>abrt-java-connector</packagereq>
<packagereq>acl</packagereq>
<packagereq>aisleriot</packagereq>
<packagereq>at</packagereq>
<packagereq>at-spi2-atk</packagereq>
<packagereq>at-spi2-core</packagereq>
<packagereq>attr</packagereq>
<packagereq>avahi</packagereq>
<packagereq>baobab</packagereq>
<packagereq>bash-completion</packagereq>
<packagereq>bc</packagereq>
<packagereq>bijiben</packagereq>
<packagereq>bind-utils</packagereq>
<packagereq>brasero-nautilus</packagereq>
<packagereq>brasero</packagereq>
<packagereq>bridge-utils</packagereq>
<packagereq>btrfs-progs</packagereq>
<packagereq>bzip2</packagereq>
<packagereq>caribou-gtk2-module</packagereq>
<packagereq>caribou-gtk3-module</packagereq>
<packagereq>caribou</packagereq>
<packagereq>cheese</packagereq>
<packagereq>chrony</packagereq>
<packagereq>cifs-utils</packagereq>
<packagereq>control-center</packagereq>
<packagereq>coolkey</packagereq>
<packagereq>cpio</packagereq>
<packagereq>crontabs</packagereq>
<packagereq>cryptsetup</packagereq>
<packagereq>cyrus-sasl-plain</packagereq>
<packagereq>dbus</packagereq>
<packagereq>dconf</packagereq>
<packagereq>deja-dup</packagereq>
<packagereq>deltarpm</packagereq>
<packagereq>desktop-backgrounds-basic</packagereq>
<packagereq>dos2unix</packagereq>
<packagereq>dosfstools</packagereq>
<packagereq>dump</packagereq>
<packagereq>ed</packagereq>
<packagereq>empathy</packagereq>
<packagereq>eog</packagereq>
<packagereq>ethtool</packagereq>
<packagereq>evince-nautilus</packagereq>
<packagereq>evince</packagereq>
<packagereq>evolution-ews</packagereq>
<packagereq>evolution-help</packagereq>
<packagereq>evolution</packagereq>
<packagereq>fedora-release-notes</packagereq>
<packagereq>file</packagereq>
<packagereq>file-roller-nautilus</packagereq>
<packagereq>file-roller</packagereq>
<packagereq>finger</packagereq>
<packagereq>firefox</packagereq>
<packagereq>firewall-config</packagereq>
<packagereq>fpaste</packagereq>
<packagereq>fprintd-pam</packagereq>
<packagereq>ftp</packagereq>
<packagereq>gdm</packagereq>
<packagereq>gedit</packagereq>
<packagereq>glib-networking</packagereq>
<packagereq>gnome-backgrounds</packagereq>
<packagereq>gnome-bluetooth</packagereq>
<packagereq>gnome-boxes</packagereq>
<packagereq>gnome-calculator</packagereq>
<packagereq>gnome-classic-session</packagereq>
<packagereq>gnome-clocks</packagereq>
<packagereq>gnome-color-manager</packagereq>
<packagereq>gnome-contacts</packagereq>
<packagereq>gnome-dictionary</packagereq>
<packagereq>gnome-disk-utility</packagereq>
<packagereq>gnome-documents</packagereq>
<packagereq>gnome-font-viewer</packagereq>
<packagereq>gnome-getting-started-docs</packagereq>
<packagereq>gnome-initial-setup</packagereq>
<packagereq>gnome-logs</packagereq>
<packagereq>gnome-maps</packagereq>
<packagereq>gnome-packagekit</packagereq>
<packagereq>gnome-screenshot</packagereq>
<packagereq>gnome-session-xsession</packagereq>
<packagereq>gnome-settings-daemon</packagereq>
<packagereq>gnome-shell</packagereq>
<packagereq>gnome-software</packagereq>
<packagereq>gnome-sound-recorder</packagereq>
<packagereq>gnome-system-monitor</packagereq>
<packagereq>gnome-terminal</packagereq>
<packagereq>gnome-themes-standard</packagereq>
<packagereq>gnome-user-docs</packagereq>
<packagereq>gnome-user-share</packagereq>
<packagereq>gnome-weather</packagereq>
<packagereq>gnupg2</packagereq>
<packagereq>gtk2-immodule-xim</packagereq>
<packagereq>gtk3-immodule-xim</packagereq>
<packagereq>gucharmap</packagereq>
<packagereq>gvfs-afc</packagereq>
<packagereq>gvfs-afp</packagereq>
<packagereq>gvfs-archive</packagereq>
<packagereq>gvfs-fuse</packagereq>
<packagereq>gvfs-goa</packagereq>
<packagereq>gvfs-gphoto2</packagereq>
<packagereq>gvfs-mtp</packagereq>
<packagereq>gvfs-smb</packagereq>
<packagereq>hunspell</packagereq>
<packagereq>ibus-chewing</packagereq>
<packagereq>ibus-gtk2</packagereq>
<packagereq>ibus-gtk3</packagereq>
<packagereq>ibus-hangul</packagereq>
<packagereq>ibus-kkc</packagereq>
<packagereq>ibus-libpinyin</packagereq>
<packagereq>ibus-m17n</packagereq>
<packagereq>ibus-rawcode</packagereq>
<packagereq>ibus-typing-booster</packagereq>
<packagereq>icedtea-web</packagereq>
<packagereq>im-chooser</packagereq>
<packagereq>imsettings-gsettings</packagereq>
<packagereq>imsettings</packagereq>
<packagereq>iptstate</packagereq>
<packagereq>irda-utils</packagereq>
<packagereq>irqbalance</packagereq>
<packagereq>isdn4k-utils</packagereq>
<packagereq>jwhois</packagereq>
<packagereq>lftp</packagereq>
<packagereq>libcanberra-gtk2</packagereq>
<packagereq>libcanberra-gtk3</packagereq>
<packagereq>libproxy-mozjs</packagereq>
<packagereq>librsvg2</packagereq>
<packagereq>libsane-hpaio</packagereq>
<packagereq>linux-atm</packagereq>
<packagereq>logrotate</packagereq>
<packagereq>lrzsz</packagereq>
<packagereq>lsof</packagereq>
<packagereq>mailcap</packagereq>
<packagereq>man-pages</packagereq>
<packagereq>mcelog</packagereq>
<packagereq>mdadm</packagereq>
<packagereq>microcode_ctl</packagereq>
<packagereq>minicom</packagereq>
<packagereq>mlocate</packagereq>
<packagereq>ModemManager</packagereq>
<packagereq>mousetweaks</packagereq>
<packagereq>mtr</packagereq>
<packagereq>nano</packagereq>
<packagereq>nautilus</packagereq>
<packagereq>nautilus-sendto</packagereq>
<packagereq>net-tools</packagereq>
<packagereq>NetworkManager-adsl</packagereq>
<packagereq>NetworkManager-l2tp</packagereq>
<packagereq>NetworkManager-openconnect</packagereq>
<packagereq>NetworkManager-openvpn-gnome</packagereq>
<packagereq>NetworkManager-pptp-gnome</packagereq>
<packagereq>NetworkManager-vpnc-gnome</packagereq>
<packagereq>nfs-utils</packagereq>
<packagereq>nmap-ncat</packagereq>
<packagereq>nm-connection-editor</packagereq>
<packagereq>ntfs-3g</packagereq>
<packagereq>ntfsprogs</packagereq>
<packagereq>ntsysv</packagereq>
<packagereq>numactl</packagereq>
<packagereq>orca</packagereq>
<packagereq>PackageKit-command-not-found</packagereq>
<packagereq>PackageKit-gtk3-module</packagereq>
<packagereq>PackageKit-yum-plugin</packagereq>
<packagereq>pam_krb5</packagereq>
<packagereq>pam_pkcs11</packagereq>
<packagereq>passwdqc</packagereq>
<packagereq>pciutils</packagereq>
<packagereq>pcmciautils</packagereq>
<packagereq>pinfo</packagereq>
<packagereq>plymouth</packagereq>
<packagereq>pm-utils</packagereq>
<packagereq>polkit-js-engine</packagereq>
<packagereq>ppp</packagereq>
<packagereq>psacct</packagereq>
<packagereq>quota</packagereq>
<packagereq>rdist</packagereq>
<packagereq>realmd</packagereq>
<packagereq>rhythmbox</packagereq>
<packagereq>rng-tools</packagereq>
<packagereq>rp-pppoe</packagereq>
<packagereq>rsh</packagereq>
<packagereq>rsync</packagereq>
<packagereq>rsyslog</packagereq>
<packagereq>rygel</packagereq>
<packagereq>sane-backends-drivers-scanners</packagereq>
<packagereq>seahorse</packagereq>
<packagereq>setroubleshoot</packagereq>
<packagereq>setuptool</packagereq>
<packagereq>shotwell</packagereq>
<packagereq>simple-scan</packagereq>
<packagereq>smartmontools</packagereq>
<packagereq>sos</packagereq>
<packagereq>sssd</packagereq>
<packagereq>stunnel</packagereq>
<packagereq>sudo</packagereq>
<packagereq>sushi</packagereq>
<packagereq>symlinks</packagereq>
<packagereq>talk</packagereq>
<packagereq>tar</packagereq>
<packagereq>tcpdump</packagereq>
<packagereq>tcp_wrappers</packagereq>
<packagereq>telnet</packagereq>
<packagereq>time</packagereq>
<packagereq>totem-nautilus</packagereq>
<packagereq>totem</packagereq>
<packagereq>traceroute</packagereq>
<packagereq>transmission-gtk</packagereq>
<packagereq>tree</packagereq>
<packagereq>unzip</packagereq>
<packagereq>usbutils</packagereq>
<packagereq>vconfig</packagereq>
<packagereq>vinagre</packagereq>
<packagereq>wget</packagereq>
<packagereq>which</packagereq>
<packagereq>wireless-tools</packagereq>
<packagereq>words</packagereq>
<packagereq>wvdial</packagereq>
<packagereq>xdg-user-dirs-gtk</packagereq>
<packagereq>yelp</packagereq>
<packagereq>yum-langpacks</packagereq>
<packagereq>yum-utils</packagereq>
<packagereq>zip</packagereq>
</packagelist>
</group>
<group>
@ -6811,18 +7033,13 @@
<grouplist>
<groupid>workstation-product</groupid>
<groupid>base-x</groupid>
<groupid>standard</groupid>
<groupid>core</groupid>
<groupid>dial-up</groupid>
<groupid>fonts</groupid>
<groupid>input-methods</groupid>
<groupid>multimedia</groupid>
<groupid>networkmanager-submodules</groupid>
<groupid>hardware-support</groupid>
<groupid>printing</groupid>
<groupid>firefox</groupid>
<groupid>guest-desktop-agents</groupid>
<groupid>gnome-desktop</groupid>
</grouplist>
<optionlist>
<groupid default="true">libreoffice</groupid>

227
comps-f22.xml.in
View File

@ -6327,6 +6327,228 @@
<uservisible>false</uservisible>
<packagelist>
<packagereq type="mandatory">fedora-release-workstation</packagereq>
<packagereq>abrt-cli</packagereq>
<packagereq>abrt-desktop</packagereq>
<packagereq>abrt-java-connector</packagereq>
<packagereq>acl</packagereq>
<packagereq>aisleriot</packagereq>
<packagereq>at</packagereq>
<packagereq>at-spi2-atk</packagereq>
<packagereq>at-spi2-core</packagereq>
<packagereq>attr</packagereq>
<packagereq>avahi</packagereq>
<packagereq>baobab</packagereq>
<packagereq>bash-completion</packagereq>
<packagereq>bc</packagereq>
<packagereq>bijiben</packagereq>
<packagereq>bind-utils</packagereq>
<packagereq>brasero-nautilus</packagereq>
<packagereq>brasero</packagereq>
<packagereq>bridge-utils</packagereq>
<packagereq>btrfs-progs</packagereq>
<packagereq>bzip2</packagereq>
<packagereq>caribou-gtk2-module</packagereq>
<packagereq>caribou-gtk3-module</packagereq>
<packagereq>caribou</packagereq>
<packagereq>cheese</packagereq>
<packagereq>chrony</packagereq>
<packagereq>cifs-utils</packagereq>
<packagereq>control-center</packagereq>
<packagereq>coolkey</packagereq>
<packagereq>cpio</packagereq>
<packagereq>crontabs</packagereq>
<packagereq>cryptsetup</packagereq>
<packagereq>cyrus-sasl-plain</packagereq>
<packagereq>dbus</packagereq>
<packagereq>dconf</packagereq>
<packagereq>deja-dup</packagereq>
<packagereq>deltarpm</packagereq>
<packagereq>desktop-backgrounds-basic</packagereq>
<packagereq>dos2unix</packagereq>
<packagereq>dosfstools</packagereq>
<packagereq>dump</packagereq>
<packagereq>ed</packagereq>
<packagereq>empathy</packagereq>
<packagereq>eog</packagereq>
<packagereq>ethtool</packagereq>
<packagereq>evince-nautilus</packagereq>
<packagereq>evince</packagereq>
<packagereq>evolution-ews</packagereq>
<packagereq>evolution-help</packagereq>
<packagereq>evolution</packagereq>
<packagereq>fedora-release-notes</packagereq>
<packagereq>file</packagereq>
<packagereq>file-roller-nautilus</packagereq>
<packagereq>file-roller</packagereq>
<packagereq>finger</packagereq>
<packagereq>firefox</packagereq>
<packagereq>firewall-config</packagereq>
<packagereq>fpaste</packagereq>
<packagereq>fprintd-pam</packagereq>
<packagereq>ftp</packagereq>
<packagereq>gdm</packagereq>
<packagereq>gedit</packagereq>
<packagereq>glib-networking</packagereq>
<packagereq>gnome-backgrounds</packagereq>
<packagereq>gnome-bluetooth</packagereq>
<packagereq>gnome-boxes</packagereq>
<packagereq>gnome-calculator</packagereq>
<packagereq>gnome-classic-session</packagereq>
<packagereq>gnome-clocks</packagereq>
<packagereq>gnome-color-manager</packagereq>
<packagereq>gnome-contacts</packagereq>
<packagereq>gnome-dictionary</packagereq>
<packagereq>gnome-disk-utility</packagereq>
<packagereq>gnome-documents</packagereq>
<packagereq>gnome-font-viewer</packagereq>
<packagereq>gnome-getting-started-docs</packagereq>
<packagereq>gnome-initial-setup</packagereq>
<packagereq>gnome-logs</packagereq>
<packagereq>gnome-maps</packagereq>
<packagereq>gnome-packagekit</packagereq>
<packagereq>gnome-screenshot</packagereq>
<packagereq>gnome-session-xsession</packagereq>
<packagereq>gnome-settings-daemon</packagereq>
<packagereq>gnome-shell</packagereq>
<packagereq>gnome-software</packagereq>
<packagereq>gnome-sound-recorder</packagereq>
<packagereq>gnome-system-monitor</packagereq>
<packagereq>gnome-terminal</packagereq>
<packagereq>gnome-themes-standard</packagereq>
<packagereq>gnome-user-docs</packagereq>
<packagereq>gnome-user-share</packagereq>
<packagereq>gnome-weather</packagereq>
<packagereq>gnupg2</packagereq>
<packagereq>gtk2-immodule-xim</packagereq>
<packagereq>gtk3-immodule-xim</packagereq>
<packagereq>gucharmap</packagereq>
<packagereq>gvfs-afc</packagereq>
<packagereq>gvfs-afp</packagereq>
<packagereq>gvfs-archive</packagereq>
<packagereq>gvfs-fuse</packagereq>
<packagereq>gvfs-goa</packagereq>
<packagereq>gvfs-gphoto2</packagereq>
<packagereq>gvfs-mtp</packagereq>
<packagereq>gvfs-smb</packagereq>
<packagereq>hunspell</packagereq>
<packagereq>ibus-chewing</packagereq>
<packagereq>ibus-gtk2</packagereq>
<packagereq>ibus-gtk3</packagereq>
<packagereq>ibus-hangul</packagereq>
<packagereq>ibus-kkc</packagereq>
<packagereq>ibus-libpinyin</packagereq>
<packagereq>ibus-m17n</packagereq>
<packagereq>ibus-rawcode</packagereq>
<packagereq>ibus-typing-booster</packagereq>
<packagereq>icedtea-web</packagereq>
<packagereq>im-chooser</packagereq>
<packagereq>imsettings-gsettings</packagereq>
<packagereq>imsettings</packagereq>
<packagereq>iptstate</packagereq>
<packagereq>irda-utils</packagereq>
<packagereq>irqbalance</packagereq>
<packagereq>isdn4k-utils</packagereq>
<packagereq>jwhois</packagereq>
<packagereq>lftp</packagereq>
<packagereq>libcanberra-gtk2</packagereq>
<packagereq>libcanberra-gtk3</packagereq>
<packagereq>libproxy-mozjs</packagereq>
<packagereq>librsvg2</packagereq>
<packagereq>libsane-hpaio</packagereq>
<packagereq>linux-atm</packagereq>
<packagereq>logrotate</packagereq>
<packagereq>lrzsz</packagereq>
<packagereq>lsof</packagereq>
<packagereq>mailcap</packagereq>
<packagereq>man-pages</packagereq>
<packagereq>mcelog</packagereq>
<packagereq>mdadm</packagereq>
<packagereq>microcode_ctl</packagereq>
<packagereq>minicom</packagereq>
<packagereq>mlocate</packagereq>
<packagereq>ModemManager</packagereq>
<packagereq>mousetweaks</packagereq>
<packagereq>mtr</packagereq>
<packagereq>nano</packagereq>
<packagereq>nautilus</packagereq>
<packagereq>nautilus-sendto</packagereq>
<packagereq>net-tools</packagereq>
<packagereq>NetworkManager-adsl</packagereq>
<packagereq>NetworkManager-l2tp</packagereq>
<packagereq>NetworkManager-openconnect</packagereq>
<packagereq>NetworkManager-openvpn-gnome</packagereq>
<packagereq>NetworkManager-pptp-gnome</packagereq>
<packagereq>NetworkManager-vpnc-gnome</packagereq>
<packagereq>nfs-utils</packagereq>
<packagereq>nmap-ncat</packagereq>
<packagereq>nm-connection-editor</packagereq>
<packagereq>ntfs-3g</packagereq>
<packagereq>ntfsprogs</packagereq>
<packagereq>ntsysv</packagereq>
<packagereq>numactl</packagereq>
<packagereq>orca</packagereq>
<packagereq>PackageKit-command-not-found</packagereq>
<packagereq>PackageKit-gtk3-module</packagereq>
<packagereq>PackageKit-yum-plugin</packagereq>
<packagereq>pam_krb5</packagereq>
<packagereq>pam_pkcs11</packagereq>
<packagereq>passwdqc</packagereq>
<packagereq>pciutils</packagereq>
<packagereq>pcmciautils</packagereq>
<packagereq>pinfo</packagereq>
<packagereq>plymouth</packagereq>
<packagereq>pm-utils</packagereq>
<packagereq>polkit-js-engine</packagereq>
<packagereq>ppp</packagereq>
<packagereq>psacct</packagereq>
<packagereq>quota</packagereq>
<packagereq>rdist</packagereq>
<packagereq>realmd</packagereq>
<packagereq>rhythmbox</packagereq>
<packagereq>rng-tools</packagereq>
<packagereq>rp-pppoe</packagereq>
<packagereq>rsh</packagereq>
<packagereq>rsync</packagereq>
<packagereq>rsyslog</packagereq>
<packagereq>rygel</packagereq>
<packagereq>sane-backends-drivers-scanners</packagereq>
<packagereq>seahorse</packagereq>
<packagereq>setroubleshoot</packagereq>
<packagereq>setuptool</packagereq>
<packagereq>shotwell</packagereq>
<packagereq>simple-scan</packagereq>
<packagereq>smartmontools</packagereq>
<packagereq>sos</packagereq>
<packagereq>sssd</packagereq>
<packagereq>stunnel</packagereq>
<packagereq>sudo</packagereq>
<packagereq>sushi</packagereq>
<packagereq>symlinks</packagereq>
<packagereq>talk</packagereq>
<packagereq>tar</packagereq>
<packagereq>tcpdump</packagereq>
<packagereq>tcp_wrappers</packagereq>
<packagereq>telnet</packagereq>
<packagereq>time</packagereq>
<packagereq>totem-nautilus</packagereq>
<packagereq>totem</packagereq>
<packagereq>traceroute</packagereq>
<packagereq>transmission-gtk</packagereq>
<packagereq>tree</packagereq>
<packagereq>unzip</packagereq>
<packagereq>usbutils</packagereq>
<packagereq>vconfig</packagereq>
<packagereq>vinagre</packagereq>
<packagereq>wget</packagereq>
<packagereq>which</packagereq>
<packagereq>wireless-tools</packagereq>
<packagereq>words</packagereq>
<packagereq>wvdial</packagereq>
<packagereq>xdg-user-dirs-gtk</packagereq>
<packagereq>yelp</packagereq>
<packagereq>yum-langpacks</packagereq>
<packagereq>yum-utils</packagereq>
<packagereq>zip</packagereq>
</packagelist>
</group>
<group>
@ -6796,18 +7018,13 @@
<grouplist>
<groupid>workstation-product</groupid>
<groupid>base-x</groupid>
<groupid>standard</groupid>
<groupid>core</groupid>
<groupid>dial-up</groupid>
<groupid>fonts</groupid>
<groupid>input-methods</groupid>
<groupid>multimedia</groupid>
<groupid>networkmanager-submodules</groupid>
<groupid>hardware-support</groupid>
<groupid>printing</groupid>
<groupid>firefox</groupid>
<groupid>guest-desktop-agents</groupid>
<groupid>gnome-desktop</groupid>
</grouplist>
<optionlist>
<groupid default="true">libreoffice</groupid>