[spin-kickstarts] Fix fedora-install-fedora for new anaconda package selection.
by Bill Nottingham
commit bdd2e5cd074f6ad81deafc44ce373efc450d16a6
Author: Bill Nottingham <notting(a)redhat.com>
Date: Mon Aug 27 17:20:18 2012 -0400
Fix fedora-install-fedora for new anaconda package selection.
Anaconda package selection is determined by environments in the comps
file which define environments to install, and groups that are options.
Use those group lists, and drop individual packages since you can't
select them anyway (outside of dracut/kernel).
A few groups that are options for the workstation/development environment
are commented out for space concerns. Test compose was ~4.0G without them,
within range for the Fedora DVD.
fedora-install-fedora.ks | 225 +++++++++++++++++-----------------------------
1 files changed, 84 insertions(+), 141 deletions(-)
---
diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks
index 85cfcf7..cbc5bbc 100644
--- a/fedora-install-fedora.ks
+++ b/fedora-install-fedora.ks
@@ -19,172 +19,115 @@ repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorl
# (default groups for the configured repos are added by --default)
%packages --default
# core
-tcsh
kernel*
dracut-*
-# Desktop Packages
-@kde-desktop
-@xfce-desktop
-@lxde-desktop
-@sugar-desktop
-echo-icon-theme
-tracker
-swfdec
-nspluginwrapper
-liferea
-esc
-thunderbird
+
+# Desktops
+
+## common stuff
+@x-server
+@base
+@core
@dial-up
-# apps
+@fonts
+@input-methods
+@multimedia
+@hardware-support
+@printing
+
+## GNOME
+@firefox
+@gnome
+@gnome-apps
+@gnome-media
+@epiphany
+@libreoffice
+
+## KDE
+@kde
+@kde-apps
+@kde-education
+@kde-media
+@kde-office
+
+## XFCE
+@xfce
+@xfce-apps
+@xfce-extra-plugins
+@xfce-media
+@xfce-office
+
+## LXDE
+@lxde
+@lxde-apps
+@lxde-media
+@lxde-office
+
+## SUGAR
+@sugar-desktop
+@sugar-apps
+
+# Web server
+@web-server
+@haproxy
+@jbossas
+@mongodb
+@perl-web
+@python-web
+@php
+@rubyonrails
+@mysql
+@sql-server
+
+# Infrastructure server
+@dns-server
+@ftp-server
+@mail-server
+@network-server
+@smb-server
+
+# Workstation
@eclipse
-joe
-emacs
-k3b
-@system-tools
-mc
-wireshark-gnome
-# Devel packages
@development-libs
@development-tools
@fedora-packager
@gnome-software-development
@kde-software-development
-@web-development
@x-software-development
-# Server packages
-@dns-server
-@ftp-server
-@mail-server
+@virtualization
+@web-server
+@jbossas
+@mongodb
+@perl-web
+@php
+@rubyonrails
@mysql
-@network-server
-@server-cfg
-@smb-server
@sql-server
-@web-server
-# Keep dap off the install media, makes Eng & Sci show up
--dap-server-cgi
-# Virt group
-@virtualization --optional
+@design-suite
+## Not included yet due to space concerns
+#@milkymist
+#@mingw32
+#@ocaml
+#@robotics-suite
+#@electronic-lab
+
# Things needed for installation
@anaconda-tools
-# Languages
-@afrikaans-support
-@albanian-support
-@arabic-support
-@armenian-support
-@assamese-support
-@basque-support
-@belarusian-support
-@bengali-support
-@bhutanese-support
-@bosnian-support
-@brazilian-support
-@breton-support
-@british-support
-@bulgarian-support
-@burmese-support
-@catalan-support
-@croatian-support
-@czech-support
-@danish-support
-@dutch-support
-@esperanto-support
-@estonian-support
-@ethiopic-support
-@faroese-support
-@filipino-support
-@finnish-support
-@french-support
-@gaelic-support
-@galician-support
-@georgian-support
-@german-support
-@greek-support
-@gujarati-support
-@hebrew-support
-@hindi-support
-@hungarian-support
-@icelandic-support
-@indonesian-support
-@inuktitut-support
-@irish-support
-@italian-support
-@japanese-support
-@kannada-support
-@kashmiri-support
-@kashubian-support
-@khmer-support
-@konkani-support
-@korean-support
-@lao-support
-@latvian-support
-@lithuanian-support
-@low-saxon-support
-@macedonian-support
-@malay-support
-@malayalam-support
-@maori-support
-@marathi-support
-@mongolian-support
-@nepali-support
-@northern-sotho-support
-@norwegian-support
-@oriya-support
-@persian-support
-@polish-support
-@portuguese-support
-@punjabi-support
-@romanian-support
-@russian-support
-@samoan-support
-@serbian-support
-@simplified-chinese-support
-@sindhi-support
-@sinhala-support
-@slovak-support
-@slovenian-support
-@somali-support
-@southern-ndebele-support
-@southern-sotho-support
-@spanish-support
-@swati-support
-@swedish-support
-@tagalog-support
-@tamil-support
-@telugu-support
-@thai-support
-@tibetan-support
-@tonga-support
-@traditional-chinese-support
-@tsonga-support
-@tswana-support
-@turkish-support
-@ukrainian-support
-@urdu-support
-@venda-support
-@vietnamese-support
-@walloon-support
-@welsh-support
-@xhosa-support
-@zulu-support
+
# Langpacks
aspell-*
autocorr-*
eclipse-nls-*
hunspell-*
hyphen-*
+calligra-l10n-*
kde-l10n-*
kde-i18n-*
libreoffice-langpack-*
man-pages-*
mythes-*
-# Size removals
--gimp-help
--xorg-x11-docs
--kernel-doc
--libgcj-src
--frysk
--*gcj*
+
+# Removals
-PackageKit-zif
-zif
%end
10 years, 9 months
[spin-kickstarts/f18] Fix fedora-install-fedora for new anaconda package selection.
by Bill Nottingham
commit 06b065ee0d9a6ae8760ebc0ee0cc762f26881b61
Author: Bill Nottingham <notting(a)redhat.com>
Date: Mon Aug 27 17:20:18 2012 -0400
Fix fedora-install-fedora for new anaconda package selection.
Anaconda package selection is determined by environments in the comps
file which define environments to install, and groups that are options.
Use those group lists, and drop individual packages since you can't
select them anyway (outside of dracut/kernel).
A few groups that are options for the workstation/development environment
are commented out for space concerns. Test compose was ~4.0G without them,
within range for the Fedora DVD.
fedora-install-fedora.ks | 225 +++++++++++++++++-----------------------------
1 files changed, 84 insertions(+), 141 deletions(-)
---
diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks
index 85cfcf7..cbc5bbc 100644
--- a/fedora-install-fedora.ks
+++ b/fedora-install-fedora.ks
@@ -19,172 +19,115 @@ repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorl
# (default groups for the configured repos are added by --default)
%packages --default
# core
-tcsh
kernel*
dracut-*
-# Desktop Packages
-@kde-desktop
-@xfce-desktop
-@lxde-desktop
-@sugar-desktop
-echo-icon-theme
-tracker
-swfdec
-nspluginwrapper
-liferea
-esc
-thunderbird
+
+# Desktops
+
+## common stuff
+@x-server
+@base
+@core
@dial-up
-# apps
+@fonts
+@input-methods
+@multimedia
+@hardware-support
+@printing
+
+## GNOME
+@firefox
+@gnome
+@gnome-apps
+@gnome-media
+@epiphany
+@libreoffice
+
+## KDE
+@kde
+@kde-apps
+@kde-education
+@kde-media
+@kde-office
+
+## XFCE
+@xfce
+@xfce-apps
+@xfce-extra-plugins
+@xfce-media
+@xfce-office
+
+## LXDE
+@lxde
+@lxde-apps
+@lxde-media
+@lxde-office
+
+## SUGAR
+@sugar-desktop
+@sugar-apps
+
+# Web server
+@web-server
+@haproxy
+@jbossas
+@mongodb
+@perl-web
+@python-web
+@php
+@rubyonrails
+@mysql
+@sql-server
+
+# Infrastructure server
+@dns-server
+@ftp-server
+@mail-server
+@network-server
+@smb-server
+
+# Workstation
@eclipse
-joe
-emacs
-k3b
-@system-tools
-mc
-wireshark-gnome
-# Devel packages
@development-libs
@development-tools
@fedora-packager
@gnome-software-development
@kde-software-development
-@web-development
@x-software-development
-# Server packages
-@dns-server
-@ftp-server
-@mail-server
+@virtualization
+@web-server
+@jbossas
+@mongodb
+@perl-web
+@php
+@rubyonrails
@mysql
-@network-server
-@server-cfg
-@smb-server
@sql-server
-@web-server
-# Keep dap off the install media, makes Eng & Sci show up
--dap-server-cgi
-# Virt group
-@virtualization --optional
+@design-suite
+## Not included yet due to space concerns
+#@milkymist
+#@mingw32
+#@ocaml
+#@robotics-suite
+#@electronic-lab
+
# Things needed for installation
@anaconda-tools
-# Languages
-@afrikaans-support
-@albanian-support
-@arabic-support
-@armenian-support
-@assamese-support
-@basque-support
-@belarusian-support
-@bengali-support
-@bhutanese-support
-@bosnian-support
-@brazilian-support
-@breton-support
-@british-support
-@bulgarian-support
-@burmese-support
-@catalan-support
-@croatian-support
-@czech-support
-@danish-support
-@dutch-support
-@esperanto-support
-@estonian-support
-@ethiopic-support
-@faroese-support
-@filipino-support
-@finnish-support
-@french-support
-@gaelic-support
-@galician-support
-@georgian-support
-@german-support
-@greek-support
-@gujarati-support
-@hebrew-support
-@hindi-support
-@hungarian-support
-@icelandic-support
-@indonesian-support
-@inuktitut-support
-@irish-support
-@italian-support
-@japanese-support
-@kannada-support
-@kashmiri-support
-@kashubian-support
-@khmer-support
-@konkani-support
-@korean-support
-@lao-support
-@latvian-support
-@lithuanian-support
-@low-saxon-support
-@macedonian-support
-@malay-support
-@malayalam-support
-@maori-support
-@marathi-support
-@mongolian-support
-@nepali-support
-@northern-sotho-support
-@norwegian-support
-@oriya-support
-@persian-support
-@polish-support
-@portuguese-support
-@punjabi-support
-@romanian-support
-@russian-support
-@samoan-support
-@serbian-support
-@simplified-chinese-support
-@sindhi-support
-@sinhala-support
-@slovak-support
-@slovenian-support
-@somali-support
-@southern-ndebele-support
-@southern-sotho-support
-@spanish-support
-@swati-support
-@swedish-support
-@tagalog-support
-@tamil-support
-@telugu-support
-@thai-support
-@tibetan-support
-@tonga-support
-@traditional-chinese-support
-@tsonga-support
-@tswana-support
-@turkish-support
-@ukrainian-support
-@urdu-support
-@venda-support
-@vietnamese-support
-@walloon-support
-@welsh-support
-@xhosa-support
-@zulu-support
+
# Langpacks
aspell-*
autocorr-*
eclipse-nls-*
hunspell-*
hyphen-*
+calligra-l10n-*
kde-l10n-*
kde-i18n-*
libreoffice-langpack-*
man-pages-*
mythes-*
-# Size removals
--gimp-help
--xorg-x11-docs
--kernel-doc
--libgcj-src
--frysk
--*gcj*
+
+# Removals
-PackageKit-zif
-zif
%end
10 years, 9 months
spin-kickstarts branching?
by Bruno Wolff III
In the past we used to wait to branch spin-kickstarts until almost the next
release. This was because it avoided having to do commits to two branches
(in most cases) and with very little work being done specifically for the
release past the next one.
For F17 we did the branch close to when the release branched. It was
anticipated that some F18 work would be going on before F17 was released.
There didn't appear to be many issues as a result of this change. People
seemed to remember to commit to both branches. Git makes this easier than
perhaps it would have been under CVS. We did have one case where a merge
of master back into F17 was done instead of cherry picking, but that wasn't
too hard to fix.
Given that background, what would people like to see happen for F18?
I am slightly in favor of branching now, but if most want to wait until
some F19 specific changes are needed, that would be OK with me.
10 years, 9 months
Comps additions/changes for https://fedoraproject.org/wiki/Features/ReworkPackageGroups
by Bill Nottingham
This is an annoucement/description for what's going to change in comps for:
https://fedoraproject.org/wiki/Features/ReworkPackageGroups
As you've noticed, the package selection screen has changed in anaconda -
there is a list of choices to install on the left pane, and a list of
options in the right pane. We want to describe these choices in comps. Here
is how.
The choices on the left side are called 'environments'. They are defined
in comps like so:
<environment>
<id>gnome-desktop</id>
<name>GNOME Desktop</name>
<description>GNOME is a desktop.</description>
<display_order>10</display_order>
<grouplist>
<groupid>base-x</groupid>
<groupid>base</groupid>
<groupid>core</groupid>
<groupid>fonts</groupid>
<groupid>input-methods</groupid>
<groupid>admin-tools</groupid>
<groupid>dial-up</groupid>
<groupid>hardware-support</groupid>
<groupid>printing</groupid>
<groupid>graphical-internet</groupid>
<groupid>gnome-desktop</groupid>
</grouplist>
<optionlist>
<groupid>sound-and-video</groupid>
<groupid>office</groupid>
<groupid>eclipse</groupid>
<groupid>games</groupid>
<groupid>design-suite</groupid>
<groupid>electronic-lab</groupid>
</optionlist>
</environment>
Each environment has a grouplist that lists the groups that make up this
enviroment - these are the required groups that will be installed if you
select this environment. It also has a list of options for that environment,
which are also groups in comps. Note that these groups do not need to have
optional packages; there is no individual package selection in anaconda.
Whenever an environment is selected in anaconda in the left pane, the right
pane will be populated with:
- the list of options for that environment in comps
- any other user-visible groups in comps
The latter is for compatibility with add-on repoitoriess that exist now.
All the component groups of environments, and groups available as options,
will be able to be installed with kickstart and/or yum post-install via @<name>
syntax. Future work may be done in yum/kickstart to allow specifying
environments directly.
Patches are available for yum and anaconda for handling this; they should be
built in the near future.
What's left to change:
- Addition/modification of groups in comps for enviroments/options
- Addition of environment metadata in comps
- (Potentially) removal of obsolete groups
- (Potentially) changes of spin-kickstarts to refer to the new groups
An example of the comps additions, with a few environments defined, is
attached. These environments were based off of the live kickstarts.
Bill
10 years, 9 months
JBoss Spin
by Gerard Ryan
Hi Spins SIG,
I'm doing a Fedora JBoss Spin as my GSOC project at the moment. Most of
my efforts so far have been in packaging stuff to put into the spin, and
only recently has there started to be enough stuff to really call it a
spin. I'm still waiting for a few packages to come through the review
process before I will submit the spin for review/wrangling(?).
If you want to have a look at what I've got so far, you can see the
kickstart at [1]. Any comments or questions welcome, even flames: I've
got pretty fire retardant skin!
Once the spin is submitted for review, can stuff still be added to it,
or what's the process for that?
thanks
Gerard.
[1] https://gitorious.org/fedora-jboss-spin/kickstart
--
Gerard Ryan :: gerard(a)ryan.lt :: http://blog.grdryn.me :: @grdryn
GPG Fingerprint: AA11 A666 C98E B6D8 231C 11ED 6EDC 7E4A 62BC 4A15
10 years, 9 months
[spin-kickstarts] Revert "xfce: enable lightdm.service"
by Rex Dieter
commit 00ac2f99b2d889d80d5183ce88f42ec3653e6647
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Sat Aug 11 15:43:30 2012 -0500
Revert "xfce: enable lightdm.service"
This reverts commit 60749a38a72da360006c3fc5818e30d4bed6cc97.
fedora-livecd-xfce.ks | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks
index ecaad01..3c5cbc6 100644
--- a/fedora-livecd-xfce.ks
+++ b/fedora-livecd-xfce.ks
@@ -178,9 +178,6 @@ PREFERRED=/usr/bin/startxfce4
DISPLAYMANAGER=/usr/sbin/lightdm
EOF
-# enable lightdm for https://fedoraproject.org/wiki/Features/DisplayManagerRework
-systemctl enable --force lightdm.service
-
cat >> /etc/rc.d/init.d/livesys << EOF
mkdir -p /home/liveuser/.config/xfce4
10 years, 9 months
[spin-kickstarts] Revert "enable kdm.service, DisplayManagerRework feature"
by Rex Dieter
commit bf1ebe2def93b933b0062024cccf2c1b4e295bb9
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Sat Aug 11 15:43:22 2012 -0500
Revert "enable kdm.service, DisplayManagerRework feature"
This reverts commit 0e4d9dfc4f859ab928d55100405e3a276145d96d.
fedora-live-kde-base.ks | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks
index d7468d0..be93197 100644
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -30,11 +30,9 @@ alsa-utils
# create /etc/sysconfig/desktop (needed for installation)
cat > /etc/sysconfig/desktop <<EOF
DESKTOP="KDE"
+DISPLAYMANAGER="KDE"
EOF
-# enable kdm for https://fedoraproject.org/wiki/Features/DisplayManagerRework
-systemctl enable --force kdm.service
-
# make oxygen-gtk the default GTK+ theme for root (see #683855, #689070, #808062)
cat > /root/.gtkrc-2.0 << EOF
include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc"
10 years, 9 months