Split out languages supported by D-I and tasksel from task.list files

* Instead of duplicating what language tasks should be included in each
    task.list.* file, let update_tasks add them dynamically at runtime from a
    single list of languages supported by tasksel and D-I. This also makes
    maintaining the lists a lot less painful.
  * Indicate which tasks are "secondary" by adding a "-" suffix in task.list.*
    files instead of hardcoding it in update_tasks.
This commit is contained in:
Frans Pop 2008-12-05 14:12:10 +00:00
parent 36ce2d9f1e
commit c1c4988efa
14 changed files with 328 additions and 1049 deletions

View File

@ -185,6 +185,10 @@ export DISKTYPE=CD
#export DISKTYPE=CUSTOM
#export CUSTOMSIZE=XXXX
# List of languages for which language tasks from tasksel should be
# included. See tasks/README.tasksel for further info.
export TASK_LANGLIST=tasksel_d-i.languages
# We don't want certain packages to take up space on CD1...
#export EXCLUDE1=exclude
# ...but they are okay for other CDs (UNEXCLUDEx == may be included

View File

@ -118,12 +118,16 @@ $(BDIR):
$(ADIR):
$(Q)mkdir -p $(ADIR)
$(TASKDIR):
$(Q)echo "Updating task files..."
$(Q)mkdir -p $(TASKDIR)
$(Q)cp -r $(BASEDIR)/tasks/$(CODENAME)/* $(TASKDIR)
$(Q)set -e; cd $(TASKDIR); \
$(BASEDIR)/tools/update_tasks; \
$(BASEDIR)/tools/generate_di_list; \
$(BASEDIR)/tools/generate_di+k_list
$(Q)echo "- task.languages: using 'tasks/$(DI_CODENAME)/$(TASK_LANGLIST)'"
$(Q)cp $(BASEDIR)/tasks/$(DI_CODENAME)/$(TASK_LANGLIST) \
$(TASKDIR)/task.languages
$(BDIR)/DATE:
$(Q)date '+%Y%m%d' > $(BDIR)/DATE

4
debian/CONF.sh vendored
View File

@ -185,6 +185,10 @@ export DISKTYPE=CD
#export DISKTYPE=CUSTOM
#export CUSTOMSIZE=XXXX
# List of languages for which language tasks from tasksel should be
# included. See tasks/README.tasksel for further info.
export TASK_LANGLIST=tasksel_d-i.languages
# We don't want certain packages to take up space on CD1...
#export EXCLUDE1=exclude
# ...but they are okay for other CDs (UNEXCLUDEx == may be included

7
debian/changelog vendored
View File

@ -63,6 +63,13 @@ debian-cd (3.1.0) UNRELEASED; urgency=low
Closes: #507300.
* boot-hppa: support KERNEL_PARAMS (so desktop= can be passed).
* boot-hppa: stop passing redundant boot parameters root and ramdisk_size.
* Split out languages supported by D-I and tasksel from task.list files.
Instead of duplicating what language tasks should be included in each
task.list.* file, let update_tasks add them dynamically at runtime from a
single list of languages supported by tasksel and D-I. This also makes
maintaining the lists a lot less painful. Closes: #506616.
* Indicate which tasks are "secondary" by adding a "-" suffix in task.list.*
files instead of hardcoding it in update_tasks. Closes: #506668.
-- Frans Pop <fjp@debian.org> Fri, 05 Dec 2008 10:04:03 +0100

137
tasks/README.tasksel Normal file
View File

@ -0,0 +1,137 @@
This README explains how packages are added to full CDs and DVDs based
on tasks defined in tasksel.
Note that this document describes the default configuration for debian-cd.
Overview
========
One of the main factors deciding in what order packages are added,
especially for the first DVD and earlier CDs, is the definition of which
tasksel tasks should be used.
The list of packages to be added is generated dynamically at build time.
The procedure is somewhat complex and involves a number of (intermediate)
files.
The general sequence in which packages are added for "complete" images is:
1) Packages required by Debian Installer
2) Packages required to install the base system (debootstrap)
3) Any packages with priority "standard" or higher
4) Packages from tasksel tasks
a) Packages defined as "key" packages for primary tasksel tasks
b) Packages defined as "key" packages for language tasks (in the order:
'<language>', '<language>-desktop', '<language>-<desktop>-desktop');
only language desktop tasks that correspond to a primary task are
included
c) Regular packages from primary tasksel tasks
d) Regular packages from language tasks (as in 4)
e) Any packages from secondary tasksel tasks
f) Any packages from language tasks corresponding to secondary tasksel
tasks
5) Other packages in the order of their popularity (popcon score)
A tasksel task is defined as "secondary" by adding a '-' after its name
in a task.list file; other tasksel tasks are "primary".
Language tasks are added grouped per type, not per language. So with three
languages (A, B, C) and 'desktop' and 'gnome-desktop' as tasks you'll get:
A
B
C
A-desktop
B-desktop
C-desktop
A-gnome-desktop
B-gnome-desktop
C-gnome-desktop
Note that <language>-desktop tasks are always sorted before any
<language>-<desktop>-desktop tasks.
Files involved
==============
Static task files (can be found in tasks/codename):
- Debian or Debian-<desktop>:
top level task file; defines order of other task files to be used,
including task-essential[-<desktop>] and task-full[-<desktop>]
- tasksel_d-i.languages:
list of languages used to add language tasks at build time (see detailed
explanation below)
- task.list or task.list.<desktop>:
tasksel tasks to be included
Dynamically generated task files created at build time (can be found in
the subdirectory tasks under the working directory for the build):
- task.languages
copy of the actual language list to be used to add language tasks
(see "Language list used at build time" below)
- task.list[.<desktop>].essential:
contains primary tasks from task.list[.<desktop>] followed by
corresponding language tasks
- task.list[.<desktop>].full:
copy of task.list[.<desktop>].essential; followed by secondary tasks
from tasks from task.list[.<desktop>] and corresponding language tasks
- task-essential[-<desktop>]:
list of key packages generated using task.list[.<desktop>].essential;
corresponds to 3a/3b from overview above
- task-full[-<desktop>]:
list of packages generated using task.list[.<desktop>].full; corresponds
to 3c-3f from overview above
The generation of these files is done early in a build by the script
tools/update_tasks.
The file <codename>/tasksel_d-i.languages
=========================================
This file contains the superset of all languages that have language tasks
in the <codename> version of tasksel. The list should contain the language
names as used in tasksel.
Any languages that are not supported in the <codename> version of Debian
Installer should be commented out. Reason is that it makes no sense to
include them on early CDs as they will never be used during installations
and thus the space can be better used for other packages.
The following procedure can be used to update the language list:
- delete the current list of languages (leaving leading comments) from
<codename>/tasksel_d-i.languages
- get the current source for tasksel and do:
$ cd tasks
$ grep -l "Test-lang" * | sed "s/-desktop//" | sort -u
- add the resulting list to <codename>/tasksel_d-i.languages
- check what languages are supported in the version of localechooser for
<codename> by checking the file 'languagelist' in its source
- comment out any languages not supported by localechooser (either not
present or commented out in 'languagelist')
- check the diff between the old and new version and double check any
changes
Language list used at build time
================================
The language list that is used to add languages tasks is a copy of
tasks/$DI_CODENAME/$TASKSEL_LANGLIST. By default TASKSEL_LANGLIST is set
to 'tasksel_d-i.languages' (see CONF.sh).
Note that the file is taken based on DI_CODENAME and not CODENAME! Reason
is that if those differ DI_CODENAME will almost always be the "newer"
release and it is better to have a list that reflects the languages
supported by the version of Debian Installer that is used, especially
since any languages not supported by the CODENAME version of tasksel will
be filtered out automatically by the tools/update_tasks script.
Using a custom language list
----------------------------
In some cases it may be desirable to only include a subset of the language
tasks available in tasksel. For example if you're building images for a
derived distribution targeted at a specific language or set of languages
and would prefer to not waste space on language-specific packages that
would never be used but instead include as many "regular" package as
possible.
In that case you should create a custom language list file. We'd suggest
to create it in one tasks/<codename> directory and add symlinks in other
tasks/<codename> directories.
Then change TASKSEL_LANGLIST in CONF.sh to use your custom list.
Another option is to set 'TASKSEL_LANGLIST=empty' and add the desired
language tasks (note: the full task names, not just the language names!)
to all relevant task.list* files.

View File

@ -9,175 +9,6 @@ database-server
dns-server
file-server
# Language tasks
# Commented out means the language is currently not supported in D-I
arabic
arabic-desktop
arabic-gnome-desktop
basque-desktop
basque-gnome-desktop
belarusian
belarusian-desktop
belarusian-gnome-desktop
bengali
bengali-desktop
bengali-gnome-desktop
bosnian
bosnian-desktop
bosnian-gnome-desktop
brazilian-portuguese
brazilian-portuguese-desktop
brazilian-portuguese-gnome-desktop
bulgarian
bulgarian-desktop
bulgarian-gnome-desktop
catalan
catalan-desktop
catalan-gnome-desktop
chinese-s
chinese-s-desktop
chinese-s-gnome-desktop
chinese-t
chinese-t-desktop
chinese-t-gnome-desktop
croatian
croatian-desktop
croatian-gnome-desktop
cyrillic
cyrillic-desktop
cyrillic-gnome-desktop
czech
czech-desktop
czech-gnome-desktop
danish
danish-desktop
danish-gnome-desktop
dutch
dutch-desktop
dutch-gnome-desktop
dzongkha-desktop
dzongkha-gnome-desktop
esperanto-desktop
esperanto-gnome-desktop
estonian-desktop
estonian-gnome-desktop
finnish
finnish-desktop
finnish-gnome-desktop
french
french-desktop
french-gnome-desktop
galician
galician-desktop
galician-gnome-desktop
georgian-desktop
georgian-gnome-desktop
german
german-desktop
german-gnome-desktop
greek
greek-desktop
greek-gnome-desktop
gujarati-desktop
gujarati-gnome-desktop
hebrew
hebrew-desktop
hebrew-gnome-desktop
hindi
hindi-desktop
hindi-gnome-desktop
hungarian
hungarian-desktop
hungarian-gnome-desktop
#icelandic
#icelandic-desktop
#icelandic-gnome-desktop
#irish
#irish-desktop
#irish-gnome-desktop
italian
italian-desktop
italian-gnome-desktop
japanese
japanese-desktop
japanese-gnome-desktop
khmer
khmer-desktop
khmer-gnome-desktop
korean
korean-desktop
korean-gnome-desktop
latvian-desktop
latvian-gnome-desktop
lithuanian
lithuanian-desktop
lithuanian-gnome-desktop
macedonian
macedonian-desktop
macedonian-gnome-desktop
malayalam-desktop
malayalam-gnome-desktop
nepali-desktop
nepali-gnome-desktop
northern-sami-desktop
northern-sami-gnome-desktop
norwegian
norwegian-desktop
norwegian-gnome-desktop
persian
persian-desktop
persian-gnome-desktop
polish
polish-desktop
polish-gnome-desktop
portuguese
portuguese-desktop
portuguese-gnome-desktop
punjabi
punjabi-desktop
punjabi-gnome-desktop
romanian
romanian-desktop
romanian-gnome-desktop
russian
russian-desktop
russian-gnome-desktop
#serbian
#serbian-desktop
#serbian-gnome-desktop
slovak
slovak-desktop
slovak-gnome-desktop
slovenian
slovenian-desktop
slovenian-gnome-desktop
spanish
spanish-desktop
spanish-gnome-desktop
swedish
swedish-desktop
swedish-gnome-desktop
tagalog
tamil
tamil-desktop
tamil-gnome-desktop
thai
thai-desktop
thai-gnome-desktop
turkish
turkish-desktop
turkish-gnome-desktop
ukrainian
ukrainian-desktop
ukrainian-gnome-desktop
vietnamese-desktop
vietnamese-gnome-desktop
#welsh
#welsh-desktop
#welsh-gnome-desktop
#xhosa-desktop
#xhosa-gnome-desktop
# Alternative desktop environments
kde-desktop
xfce-desktop
kde-desktop -
xfce-desktop -

View File

@ -1,173 +1,3 @@
# Main tasks
kde-desktop
desktop
laptop
# Language tasks
# Commented out means the language is currently not supported in D-I
arabic
arabic-desktop
arabic-kde-desktop
basque-desktop
basque-kde-desktop
belarusian
belarusian-desktop
belarusian-kde-desktop
bengali
bengali-desktop
bengali-kde-desktop
bosnian
bosnian-desktop
bosnian-kde-desktop
brazilian-portuguese
brazilian-portuguese-desktop
brazilian-portuguese-kde-desktop
bulgarian
bulgarian-desktop
bulgarian-kde-desktop
catalan
catalan-desktop
catalan-kde-desktop
chinese-s
chinese-s-desktop
chinese-s-kde-desktop
chinese-t
chinese-t-desktop
chinese-t-kde-desktop
croatian
croatian-desktop
croatian-kde-desktop
cyrillic
cyrillic-desktop
cyrillic-kde-desktop
czech
czech-desktop
czech-kde-desktop
danish
danish-desktop
danish-kde-desktop
dutch
dutch-desktop
dutch-kde-desktop
dzongkha-desktop
dzongkha-kde-desktop
esperanto-desktop
esperanto-kde-desktop
estonian-desktop
estonian-kde-desktop
finnish
finnish-desktop
finnish-kde-desktop
french
french-desktop
french-kde-desktop
galician
galician-desktop
galician-kde-desktop
georgian-desktop
georgian-kde-desktop
german
german-desktop
german-kde-desktop
greek
greek-desktop
greek-kde-desktop
gujarati-desktop
gujarati-kde-desktop
hebrew
hebrew-desktop
hebrew-kde-desktop
hindi
hindi-desktop
hindi-kde-desktop
hungarian
hungarian-desktop
hungarian-kde-desktop
#icelandic
#icelandic-desktop
#icelandic-kde-desktop
#irish
#irish-desktop
#irish-kde-desktop
italian
italian-desktop
italian-kde-desktop
japanese
japanese-desktop
japanese-kde-desktop
khmer
khmer-desktop
khmer-kde-desktop
korean
korean-desktop
korean-kde-desktop
latvian-desktop
latvian-kde-desktop
lithuanian
lithuanian-desktop
lithuanian-kde-desktop
macedonian
macedonian-desktop
macedonian-kde-desktop
malayalam-desktop
malayalam-kde-desktop
nepali-desktop
nepali-kde-desktop
northern-sami-desktop
northern-sami-kde-desktop
norwegian
norwegian-desktop
norwegian-kde-desktop
persian
persian-desktop
persian-kde-desktop
polish
polish-desktop
polish-kde-desktop
portuguese
portuguese-desktop
portuguese-kde-desktop
punjabi
punjabi-desktop
punjabi-kde-desktop
romanian
romanian-desktop
romanian-kde-desktop
russian
russian-desktop
russian-kde-desktop
#serbian
#serbian-desktop
#serbian-kde-desktop
slovak
slovak-desktop
slovak-kde-desktop
slovenian
slovenian-desktop
slovenian-kde-desktop
spanish
spanish-desktop
spanish-kde-desktop
swedish
swedish-desktop
swedish-kde-desktop
tagalog
tamil
tamil-desktop
tamil-kde-desktop
thai
thai-desktop
thai-kde-desktop
turkish
turkish-desktop
turkish-kde-desktop
ukrainian
ukrainian-desktop
ukrainian-kde-desktop
vietnamese-desktop
vietnamese-kde-desktop
#welsh
#welsh-desktop
#welsh-kde-desktop
#xhosa-desktop
#xhosa-kde-desktop

View File

@ -1,173 +1,3 @@
# Main tasks
xfce-desktop
desktop
laptop
# Language tasks
# Commented out means the language is currently not supported in D-I
arabic
arabic-desktop
arabic-xfce-desktop
basque-desktop
basque-xfce-desktop
belarusian
belarusian-desktop
belarusian-xfce-desktop
bengali
bengali-desktop
bengali-xfce-desktop
bosnian
bosnian-desktop
bosnian-xfce-desktop
brazilian-portuguese
brazilian-portuguese-desktop
brazilian-portuguese-xfce-desktop
bulgarian
bulgarian-desktop
bulgarian-xfce-desktop
catalan
catalan-desktop
catalan-xfce-desktop
chinese-s
chinese-s-desktop
chinese-s-xfce-desktop
chinese-t
chinese-t-desktop
chinese-t-xfce-desktop
croatian
croatian-desktop
croatian-xfce-desktop
cyrillic
cyrillic-desktop
cyrillic-xfce-desktop
czech
czech-desktop
czech-xfce-desktop
danish
danish-desktop
danish-xfce-desktop
dutch
dutch-desktop
dutch-xfce-desktop
dzongkha-desktop
dzongkha-xfce-desktop
esperanto-desktop
esperanto-xfce-desktop
estonian-desktop
estonian-xfce-desktop
finnish
finnish-desktop
finnish-xfce-desktop
french
french-desktop
french-xfce-desktop
galician
galician-desktop
galician-xfce-desktop
georgian-desktop
georgian-xfce-desktop
german
german-desktop
german-xfce-desktop
greek
greek-desktop
greek-xfce-desktop
gujarati-desktop
gujarati-xfce-desktop
hebrew
hebrew-desktop
hebrew-xfce-desktop
hindi
hindi-desktop
hindi-xfce-desktop
hungarian
hungarian-desktop
hungarian-xfce-desktop
#icelandic
#icelandic-desktop
#icelandic-xfce-desktop
#irish
#irish-desktop
#irish-xfce-desktop
italian
italian-desktop
italian-xfce-desktop
japanese
japanese-desktop
japanese-xfce-desktop
khmer
khmer-desktop
khmer-xfce-desktop
korean
korean-desktop
korean-xfce-desktop
latvian-desktop
latvian-xfce-desktop
lithuanian
lithuanian-desktop
lithuanian-xfce-desktop
macedonian
macedonian-desktop
macedonian-xfce-desktop
malayalam-desktop
malayalam-xfce-desktop
nepali-desktop
nepali-xfce-desktop
northern-sami-desktop
northern-sami-xfce-desktop
norwegian
norwegian-desktop
norwegian-xfce-desktop
persian
persian-desktop
persian-xfce-desktop
polish
polish-desktop
polish-xfce-desktop
portuguese
portuguese-desktop
portuguese-xfce-desktop
punjabi
punjabi-desktop
punjabi-xfce-desktop
romanian
romanian-desktop
romanian-xfce-desktop
russian
russian-desktop
russian-xfce-desktop
#serbian
#serbian-desktop
#serbian-xfce-desktop
slovak
slovak-desktop
slovak-xfce-desktop
slovenian
slovenian-desktop
slovenian-xfce-desktop
spanish
spanish-desktop
spanish-xfce-desktop
swedish
swedish-desktop
swedish-xfce-desktop
tagalog
tamil
tamil-desktop
tamil-xfce-desktop
thai
thai-desktop
thai-xfce-desktop
turkish
turkish-desktop
turkish-xfce-desktop
ukrainian
ukrainian-desktop
ukrainian-xfce-desktop
vietnamese-desktop
vietnamese-xfce-desktop
#welsh
#welsh-desktop
#welsh-xfce-desktop
#xhosa-desktop
#xhosa-xfce-desktop

View File

@ -0,0 +1,52 @@
# See tasks/README.tasksel for information about contents and usage
# of this file.
# Languages that are commented are not supported in debian-installer
arabic
belarusian
bengali
bosnian
brazilian-portuguese
bulgarian
catalan
chinese-s
chinese-t
croatian
cyrillic
czech
danish
dutch
finnish
french
galician
german
greek
hebrew
hindi
hungarian
#icelandic
#irish
italian
japanese
khmer
korean
lithuanian
macedonian
norwegian
persian
polish
portuguese
punjabi
romanian
russian
#serbian
slovak
slovenian
spanish
swedish
tagalog
tamil
thai
turkish
ukrainian
#welsh

View File

@ -9,175 +9,6 @@ database-server
dns-server
file-server
# Language tasks
# Commented out means the language is currently not supported in D-I
arabic
arabic-desktop
arabic-gnome-desktop
basque-desktop
basque-gnome-desktop
belarusian
belarusian-desktop
belarusian-gnome-desktop
bengali
bengali-desktop
bengali-gnome-desktop
bosnian
bosnian-desktop
bosnian-gnome-desktop
brazilian-portuguese
brazilian-portuguese-desktop
brazilian-portuguese-gnome-desktop
bulgarian
bulgarian-desktop
bulgarian-gnome-desktop
catalan
catalan-desktop
catalan-gnome-desktop
chinese-s
chinese-s-desktop
chinese-s-gnome-desktop
chinese-t
chinese-t-desktop
chinese-t-gnome-desktop
croatian
croatian-desktop
croatian-gnome-desktop
cyrillic
cyrillic-desktop
cyrillic-gnome-desktop
czech
czech-desktop
czech-gnome-desktop
danish
danish-desktop
danish-gnome-desktop
dutch
dutch-desktop
dutch-gnome-desktop
dzongkha-desktop
dzongkha-gnome-desktop
esperanto-desktop
esperanto-gnome-desktop
estonian-desktop
estonian-gnome-desktop
finnish
finnish-desktop
finnish-gnome-desktop
french
french-desktop
french-gnome-desktop
galician
galician-desktop
galician-gnome-desktop
georgian-desktop
georgian-gnome-desktop
german
german-desktop
german-gnome-desktop
greek
greek-desktop
greek-gnome-desktop
gujarati-desktop
gujarati-gnome-desktop
hebrew
hebrew-desktop
hebrew-gnome-desktop
hindi
hindi-desktop
hindi-gnome-desktop
hungarian
hungarian-desktop
hungarian-gnome-desktop
#icelandic
#icelandic-desktop
#icelandic-gnome-desktop
#irish
#irish-desktop
#irish-gnome-desktop
italian
italian-desktop
italian-gnome-desktop
japanese
japanese-desktop
japanese-gnome-desktop
khmer
khmer-desktop
khmer-gnome-desktop
korean
korean-desktop
korean-gnome-desktop
latvian-desktop
latvian-gnome-desktop
lithuanian
lithuanian-desktop
lithuanian-gnome-desktop
macedonian
macedonian-desktop
macedonian-gnome-desktop
malayalam-desktop
malayalam-gnome-desktop
nepali-desktop
nepali-gnome-desktop
northern-sami-desktop
northern-sami-gnome-desktop
norwegian
norwegian-desktop
norwegian-gnome-desktop
persian
persian-desktop
persian-gnome-desktop
polish
polish-desktop
polish-gnome-desktop
portuguese
portuguese-desktop
portuguese-gnome-desktop
punjabi
punjabi-desktop
punjabi-gnome-desktop
romanian
romanian-desktop
romanian-gnome-desktop
russian
russian-desktop
russian-gnome-desktop
#serbian
#serbian-desktop
#serbian-gnome-desktop
slovak
slovak-desktop
slovak-gnome-desktop
slovenian
slovenian-desktop
slovenian-gnome-desktop
spanish
spanish-desktop
spanish-gnome-desktop
swedish
swedish-desktop
swedish-gnome-desktop
tagalog
tamil
tamil-desktop
tamil-gnome-desktop
thai
thai-desktop
thai-gnome-desktop
turkish
turkish-desktop
turkish-gnome-desktop
ukrainian
ukrainian-desktop
ukrainian-gnome-desktop
vietnamese-desktop
vietnamese-gnome-desktop
#welsh
#welsh-desktop
#welsh-gnome-desktop
#xhosa-desktop
#xhosa-gnome-desktop
# Alternative desktop environments
kde-desktop
xfce-desktop
kde-desktop -
xfce-desktop -

View File

@ -1,173 +1,3 @@
# Main tasks
kde-desktop
desktop
laptop
# Language tasks
# Commented out means the language is currently not supported in D-I
arabic
arabic-desktop
arabic-kde-desktop
basque-desktop
basque-kde-desktop
belarusian
belarusian-desktop
belarusian-kde-desktop
bengali
bengali-desktop
bengali-kde-desktop
bosnian
bosnian-desktop
bosnian-kde-desktop
brazilian-portuguese
brazilian-portuguese-desktop
brazilian-portuguese-kde-desktop
bulgarian
bulgarian-desktop
bulgarian-kde-desktop
catalan
catalan-desktop
catalan-kde-desktop
chinese-s
chinese-s-desktop
chinese-s-kde-desktop
chinese-t
chinese-t-desktop
chinese-t-kde-desktop
croatian
croatian-desktop
croatian-kde-desktop
cyrillic
cyrillic-desktop
cyrillic-kde-desktop
czech
czech-desktop
czech-kde-desktop
danish
danish-desktop
danish-kde-desktop
dutch
dutch-desktop
dutch-kde-desktop
dzongkha-desktop
dzongkha-kde-desktop
esperanto-desktop
esperanto-kde-desktop
estonian-desktop
estonian-kde-desktop
finnish
finnish-desktop
finnish-kde-desktop
french
french-desktop
french-kde-desktop
galician
galician-desktop
galician-kde-desktop
georgian-desktop
georgian-kde-desktop
german
german-desktop
german-kde-desktop
greek
greek-desktop
greek-kde-desktop
gujarati-desktop
gujarati-kde-desktop
hebrew
hebrew-desktop
hebrew-kde-desktop
hindi
hindi-desktop
hindi-kde-desktop
hungarian
hungarian-desktop
hungarian-kde-desktop
#icelandic
#icelandic-desktop
#icelandic-kde-desktop
#irish
#irish-desktop
#irish-kde-desktop
italian
italian-desktop
italian-kde-desktop
japanese
japanese-desktop
japanese-kde-desktop
khmer
khmer-desktop
khmer-kde-desktop
korean
korean-desktop
korean-kde-desktop
latvian-desktop
latvian-kde-desktop
lithuanian
lithuanian-desktop
lithuanian-kde-desktop
macedonian
macedonian-desktop
macedonian-kde-desktop
malayalam-desktop
malayalam-kde-desktop
nepali-desktop
nepali-kde-desktop
northern-sami-desktop
northern-sami-kde-desktop
norwegian
norwegian-desktop
norwegian-kde-desktop
persian
persian-desktop
persian-kde-desktop
polish
polish-desktop
polish-kde-desktop
portuguese
portuguese-desktop
portuguese-kde-desktop
punjabi
punjabi-desktop
punjabi-kde-desktop
romanian
romanian-desktop
romanian-kde-desktop
russian
russian-desktop
russian-kde-desktop
#serbian
#serbian-desktop
#serbian-kde-desktop
slovak
slovak-desktop
slovak-kde-desktop
slovenian
slovenian-desktop
slovenian-kde-desktop
spanish
spanish-desktop
spanish-kde-desktop
swedish
swedish-desktop
swedish-kde-desktop
tagalog
tamil
tamil-desktop
tamil-kde-desktop
thai
thai-desktop
thai-kde-desktop
turkish
turkish-desktop
turkish-kde-desktop
ukrainian
ukrainian-desktop
ukrainian-kde-desktop
vietnamese-desktop
vietnamese-kde-desktop
#welsh
#welsh-desktop
#welsh-kde-desktop
#xhosa-desktop
#xhosa-kde-desktop

View File

@ -1,173 +1,3 @@
# Main tasks
xfce-desktop
desktop
laptop
# Language tasks
# Commented out means the language is currently not supported in D-I
arabic
arabic-desktop
arabic-xfce-desktop
basque-desktop
basque-xfce-desktop
belarusian
belarusian-desktop
belarusian-xfce-desktop
bengali
bengali-desktop
bengali-xfce-desktop
bosnian
bosnian-desktop
bosnian-xfce-desktop
brazilian-portuguese
brazilian-portuguese-desktop
brazilian-portuguese-xfce-desktop
bulgarian
bulgarian-desktop
bulgarian-xfce-desktop
catalan
catalan-desktop
catalan-xfce-desktop
chinese-s
chinese-s-desktop
chinese-s-xfce-desktop
chinese-t
chinese-t-desktop
chinese-t-xfce-desktop
croatian
croatian-desktop
croatian-xfce-desktop
cyrillic
cyrillic-desktop
cyrillic-xfce-desktop
czech
czech-desktop
czech-xfce-desktop
danish
danish-desktop
danish-xfce-desktop
dutch
dutch-desktop
dutch-xfce-desktop
dzongkha-desktop
dzongkha-xfce-desktop
esperanto-desktop
esperanto-xfce-desktop
estonian-desktop
estonian-xfce-desktop
finnish
finnish-desktop
finnish-xfce-desktop
french
french-desktop
french-xfce-desktop
galician
galician-desktop
galician-xfce-desktop
georgian-desktop
georgian-xfce-desktop
german
german-desktop
german-xfce-desktop
greek
greek-desktop
greek-xfce-desktop
gujarati-desktop
gujarati-xfce-desktop
hebrew
hebrew-desktop
hebrew-xfce-desktop
hindi
hindi-desktop
hindi-xfce-desktop
hungarian
hungarian-desktop
hungarian-xfce-desktop
#icelandic
#icelandic-desktop
#icelandic-xfce-desktop
#irish
#irish-desktop
#irish-xfce-desktop
italian
italian-desktop
italian-xfce-desktop
japanese
japanese-desktop
japanese-xfce-desktop
khmer
khmer-desktop
khmer-xfce-desktop
korean
korean-desktop
korean-xfce-desktop
latvian-desktop
latvian-xfce-desktop
lithuanian
lithuanian-desktop
lithuanian-xfce-desktop
macedonian
macedonian-desktop
macedonian-xfce-desktop
malayalam-desktop
malayalam-xfce-desktop
nepali-desktop
nepali-xfce-desktop
northern-sami-desktop
northern-sami-xfce-desktop
norwegian
norwegian-desktop
norwegian-xfce-desktop
persian
persian-desktop
persian-xfce-desktop
polish
polish-desktop
polish-xfce-desktop
portuguese
portuguese-desktop
portuguese-xfce-desktop
punjabi
punjabi-desktop
punjabi-xfce-desktop
romanian
romanian-desktop
romanian-xfce-desktop
russian
russian-desktop
russian-xfce-desktop
#serbian
#serbian-desktop
#serbian-xfce-desktop
slovak
slovak-desktop
slovak-xfce-desktop
slovenian
slovenian-desktop
slovenian-xfce-desktop
spanish
spanish-desktop
spanish-xfce-desktop
swedish
swedish-desktop
swedish-xfce-desktop
tagalog
tamil
tamil-desktop
tamil-xfce-desktop
thai
thai-desktop
thai-xfce-desktop
turkish
turkish-desktop
turkish-xfce-desktop
ukrainian
ukrainian-desktop
ukrainian-xfce-desktop
vietnamese-desktop
vietnamese-xfce-desktop
#welsh
#welsh-desktop
#welsh-xfce-desktop
#xhosa-desktop
#xhosa-xfce-desktop

View File

@ -0,0 +1,52 @@
# See tasks/README.tasksel for information about contents and usage
# of this file.
# Languages that are commented are not supported in debian-installer
arabic
belarusian
bengali
bosnian
brazilian-portuguese
bulgarian
catalan
chinese-s
chinese-t
croatian
cyrillic
czech
danish
dutch
finnish
french
galician
german
greek
hebrew
hindi
hungarian
#icelandic
#irish
italian
japanese
khmer
korean
lithuanian
macedonian
norwegian
persian
polish
portuguese
punjabi
romanian
russian
#serbian
slovak
slovenian
spanish
swedish
tagalog
tamil
thai
turkish
ukrainian
#welsh

View File

@ -18,6 +18,48 @@ fi
TDIR=$BDIR/update_tasks
mkdir -p $TDIR
# Sort primary and secondary tasks and add language tasks for both
# Secondary tasks are indicated by a "-" suffix in the task.list file
# When adding language tasks, 'desktop' is sorted before '*-desktop'
expand_task_list () {
tasklist=$1
langlist=$2
# Filter out comments, empty lines and secondary tasks
task_essential="$(grep -Ev "^(#.*)?(.*-)?[[:space:]]*$" $tasklist)"
# Select only secondary tasks
task_extra="$(grep -Ev "^(#.*)?[[:space:]]*$" $tasklist | \
grep -E "(.*-)[[:space:]]*$" | sed "s/[[:space:]]*-.*$//")"
echo "# Main tasks" >$tasklist.essential
echo "$task_essential" >>$tasklist.essential
echo >>$tasklist.essential
echo "# Main language tasks" >>$tasklist.essential
for task in "" $(echo "$task_essential" | grep "^desktop" || true) \
$(echo "$task_essential" | grep -- "-desktop" || true); do
for language in $(cat $langlist); do
echo $language${task:+-$task}
done
done >>$tasklist.essential
cp $tasklist.essential $tasklist.full
if [ "$task_extra" ]; then
echo >>$tasklist.full
echo "# Extra tasks" >>$tasklist.full
echo "$task_extra" >>$tasklist.full
echo >>$tasklist.full
echo "# Extra language tasks" >>$tasklist.full
for task in $(echo "$task_extra" | grep "^desktop" || true) \
$(echo "$task_extra" | grep -- "-desktop" || true); do
for language in $(cat $langlist); do
echo $language${task:+-$task}
done
done >>$tasklist.full
fi
}
update_full_list () {
file=$1
@ -65,16 +107,11 @@ update_full_list () {
update_essential_list () {
file=$1
tasklist=$2
desktoptasks=$3
tasksel=$4
tasksel=$3
(grep -Ev "^(#.*)?[[:space:]]*$" $tasklist ;
echo DONE ;
cat $tasksel/usr/share/tasksel/debian-tasks.desc) | mawk -v DT=$desktoptasks '
BEGIN {
split(DT, d_tasks, ",")
}
cat $tasksel/usr/share/tasksel/debian-tasks.desc) | mawk '
/DONE/ {
in_tasks = 1
@ -105,16 +142,7 @@ update_essential_list () {
if (in_tasks) {
for (taskname in tasklist) {
if (taskname == cur_task) {
if ((cur_task != "gnome-desktop") &&
(cur_task != "kde-desktop") &&
(cur_task != "xfce-desktop")) {
in_key = 1
}
for (dt_num in d_tasks) {
if (cur_task == d_tasks[dt_num]) {
in_key = 1
}
}
in_key = 1
}
}
}
@ -134,19 +162,28 @@ TASKSEL_DEB=$MIRROR/`mawk '
dpkg -x $TASKSEL_DEB $TDIR/tasksel
update_essential_list task-essential task.list gnome-desktop \
$TDIR/tasksel
[ -e task.languages ] || exit 1
grep -Ev "^(#.*)?[[:space:]]*$" task.languages > $TDIR/languages
update_essential_list task-essential-kde task.list.kde kde-desktop \
$TDIR/tasksel
for variant in "" kde xfce; do
if [ ! -e task.list${variant:+.$variant} ]; then
echo "Warning: task.list${variant:+.$variant} does not exist; skipping"
continue
fi
update_essential_list task-essential-xfce task.list.xfce xfce-desktop \
$TDIR/tasksel
expand_task_list \
task.list${variant:+.$variant} \
$TDIR/languages
update_full_list task-full task.list $TMP_PKG
update_essential_list \
task-essential${variant:+-$variant} \
task.list${variant:+.$variant}.essential \
$TDIR/tasksel
update_full_list task-full-kde task.list.kde $TMP_PKG
update_full_list task-full-xfce task.list.xfce $TMP_PKG
update_full_list \
task-full${variant:+-$variant} \
task.list${variant:+.$variant}.full \
$TMP_PKG
done
rm -rf $TDIR