Add suffix "generic" to default task files for naming consistency

Makefile

@@ -18,7 +18,7 @@ ifndef VERBOSE_MAKE
 Q=@
 endif
 ifndef TASK
-TASK=Debian
+TASK=Debian-generic
 endif
 ifndef MKISOFS
 export MKISOFS=$(shell which genisoimage mkisofs | head -1)

README

@@ -115,11 +115,11 @@ The process of building a CD is composed of the following steps:
 
   Examples:
 
-    $ make packagelists TASK=Debian COMPLETE=1
+    $ make packagelists TASK=Debian-generic COMPLETE=1
 
   or
 
-    $ make packagelists TASK=gnome COMPLETE=0
+    $ make packagelists TASK=Debian-kde COMPLETE=0
 
   or
 

debian/changelog

@@ -83,6 +83,8 @@ debian-cd (3.1.0) UNRELEASED; urgency=low
   * Add support for a separate 'GNOME desktop environment' CD.
     This new task is mostly added for completeness. Main difference with the
     default task file is that no server tasks are included.
+  * Add a suffix "generic" to the default task files to make the overall naming
+    scheme more consistent. It also allows to make update_tasks more generic.
 
  -- Frans Pop <fjp@debian.org>  Fri, 05 Dec 2008 10:04:03 +0100
 

tasks/README.tasksel

@@ -51,13 +51,14 @@ Note that <language>-desktop tasks are always sorted before any
 Files involved
 ==============
 Static task files (can be found in tasks/codename):
-- Debian or Debian-<desktop>:
+- Debian-generic or Debian-<desktop>:
   top level task file; defines order of other task files to be used,
-  including task-essential[-<desktop>] and task-full[-<desktop>]
+  including task-essential-[generic|<desktop>] and
+  task-full-[generic|<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>:
+- task.list.generic or task.list.<desktop>:
   tasksel tasks to be included
 
 Dynamically generated task files created at build time (can be found in
@@ -65,18 +66,19 @@ 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:
+- task.list.[generic|<desktop>].essential:
-  contains primary tasks from task.list[.<desktop>] followed by
+  contains primary tasks from task.list.[generic|<desktop>] followed by
   corresponding language tasks
-- task.list[.<desktop>].full:
+- task.list.[generic|<desktop>].full:
-  copy of task.list[.<desktop>].essential; followed by secondary tasks
+  copy of task.list.[generic|<desktop>].essential; followed by secondary
-  from tasks from task.list[.<desktop>] and corresponding language tasks
+  tasks from tasks from task.list.[generic|<desktop>] and corresponding
-- task-essential[-<desktop>]:
+  language tasks
-  list of key packages generated using task.list[.<desktop>].essential;
+- task-essential-[generic|<desktop>]:
+  list of key packages based on task.list.[generic|<desktop>].essential;
   corresponds to 3a/3b from overview above
-- task-full[-<desktop>]:
+- task-full-[generic|<desktop>]:
-  list of packages generated using task.list[.<desktop>].full; corresponds
+  list of packages based on task.list.[generic|<desktop>].full;
-  to 3c-3f from overview above
+  corresponds to 3c-3f from overview above
 
 The generation of these files is done early in a build by the script
 tools/update_tasks.

tasks/etch/Debian-generic

@@ -7,10 +7,10 @@
 /* Packages that should really be on CD1 */
 #include <debian-installer+kernel>
 #include <forcd1>
-#include <task-essential>
+#include <task-essential-generic>
 
 /* Other interesting packages */
-#include <task-full>
+#include <task-full-generic>
 #include <interesting-fromcd23>
 
 /* The rest ordered by popularity */

tasks/lenny/Debian-generic

@@ -7,10 +7,10 @@
 /* Packages that should really be on CD1 */
 #include <debian-installer+kernel>
 #include <forcd1>
-#include <task-essential>
+#include <task-essential-generic>
 
 /* Other interesting packages */
-#include <task-full>
+#include <task-full-generic>
 #include <interesting-fromcd23>
 
 /* The rest ordered by popularity */

tools/update_tasks

@@ -165,24 +165,22 @@ dpkg -x $TASKSEL_DEB $TDIR/tasksel
 [ -e task.languages ] || exit 1
 grep -Ev "^(#.*)?[[:space:]]*$" task.languages > $TDIR/languages
 
-for variant in "" gnome kde lxde xfce light all; do
+for variant in generic gnome kde lxde xfce light all; do
-    if [ ! -e task.list${variant:+.$variant} ]; then
+    if [ ! -e task.list.$variant ]; then
-        echo "Warning: task.list${variant:+.$variant} does not exist; skipping"
+	echo "Warning: task.list.$variant does not exist; skipping"
 	continue
     fi
 
-    expand_task_list \
+    expand_task_list task.list.$variant $TDIR/languages
-        task.list${variant:+.$variant} \
-        $TDIR/languages
 
     update_essential_list \
-        task-essential${variant:+-$variant} \
+        task-essential-$variant \
-        task.list${variant:+.$variant}.essential \
+        task.list.$variant.essential \
         $TDIR/tasksel
 
     update_full_list \
-        task-full${variant:+-$variant} \
+        task-full-$variant \
-        task.list${variant:+.$variant}.full \
+        task.list.$variant.full \
         $TMP_PKG
 done