From 086dc763026fcc562b6312fcb8b2dff31488bf1b Mon Sep 17 00:00:00 2001 From: Frans Pop Date: Fri, 5 Dec 2008 14:12:36 +0000 Subject: [PATCH] Add suffix "generic" to default task files for naming consistency --- Makefile | 2 +- README | 4 +-- debian/changelog | 2 ++ tasks/README.tasksel | 28 +++++++++++--------- tasks/etch/{Debian => Debian-generic} | 4 +-- tasks/etch/{task.list => task.list.generic} | 0 tasks/lenny/{Debian => Debian-generic} | 4 +-- tasks/lenny/{task.list => task.list.generic} | 0 tools/update_tasks | 18 ++++++------- 9 files changed, 32 insertions(+), 30 deletions(-) rename tasks/etch/{Debian => Debian-generic} (83%) rename tasks/etch/{task.list => task.list.generic} (100%) rename tasks/lenny/{Debian => Debian-generic} (83%) rename tasks/lenny/{task.list => task.list.generic} (100%) diff --git a/Makefile b/Makefile index 79ac49da..ec763426 100755 --- a/Makefile +++ b/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) diff --git a/README b/README index e5c46fcd..2a752181 100644 --- a/README +++ b/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 diff --git a/debian/changelog b/debian/changelog index ff76db92..6776b348 100644 --- a/debian/changelog +++ b/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 Fri, 05 Dec 2008 10:04:03 +0100 diff --git a/tasks/README.tasksel b/tasks/README.tasksel index 7c17e5f0..b32d8c94 100644 --- a/tasks/README.tasksel +++ b/tasks/README.tasksel @@ -51,13 +51,14 @@ Note that -desktop tasks are always sorted before any Files involved ============== Static task files (can be found in tasks/codename): -- Debian or Debian-: +- Debian-generic or Debian-: top level task file; defines order of other task files to be used, - including task-essential[-] and task-full[-] + including task-essential-[generic|] and + task-full-[generic|] - tasksel_d-i.languages: list of languages used to add language tasks at build time (see detailed explanation below) -- task.list or task.list.: +- task.list.generic or task.list.: 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[.].essential: - contains primary tasks from task.list[.] followed by +- task.list.[generic|].essential: + contains primary tasks from task.list.[generic|] followed by corresponding language tasks -- task.list[.].full: - copy of task.list[.].essential; followed by secondary tasks - from tasks from task.list[.] and corresponding language tasks -- task-essential[-]: - list of key packages generated using task.list[.].essential; +- task.list.[generic|].full: + copy of task.list.[generic|].essential; followed by secondary + tasks from tasks from task.list.[generic|] and corresponding + language tasks +- task-essential-[generic|]: + list of key packages based on task.list.[generic|].essential; corresponds to 3a/3b from overview above -- task-full[-]: - list of packages generated using task.list[.].full; corresponds - to 3c-3f from overview above +- task-full-[generic|]: + list of packages based on task.list.[generic|].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. diff --git a/tasks/etch/Debian b/tasks/etch/Debian-generic similarity index 83% rename from tasks/etch/Debian rename to tasks/etch/Debian-generic index 5543b10c..eb02e4b0 100644 --- a/tasks/etch/Debian +++ b/tasks/etch/Debian-generic @@ -7,10 +7,10 @@ /* Packages that should really be on CD1 */ #include #include -#include +#include /* Other interesting packages */ -#include +#include #include /* The rest ordered by popularity */ diff --git a/tasks/etch/task.list b/tasks/etch/task.list.generic similarity index 100% rename from tasks/etch/task.list rename to tasks/etch/task.list.generic diff --git a/tasks/lenny/Debian b/tasks/lenny/Debian-generic similarity index 83% rename from tasks/lenny/Debian rename to tasks/lenny/Debian-generic index 6f846eeb..948e4865 100644 --- a/tasks/lenny/Debian +++ b/tasks/lenny/Debian-generic @@ -7,10 +7,10 @@ /* Packages that should really be on CD1 */ #include #include -#include +#include /* Other interesting packages */ -#include +#include #include /* The rest ordered by popularity */ diff --git a/tasks/lenny/task.list b/tasks/lenny/task.list.generic similarity index 100% rename from tasks/lenny/task.list rename to tasks/lenny/task.list.generic diff --git a/tools/update_tasks b/tools/update_tasks index 086e3e94..02819679 100755 --- a/tools/update_tasks +++ b/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 - if [ ! -e task.list${variant:+.$variant} ]; then - echo "Warning: task.list${variant:+.$variant} does not exist; skipping" +for variant in generic gnome kde lxde xfce light all; do + if [ ! -e task.list.$variant ]; then + echo "Warning: task.list.$variant does not exist; skipping" continue fi - expand_task_list \ - task.list${variant:+.$variant} \ - $TDIR/languages + expand_task_list task.list.$variant $TDIR/languages update_essential_list \ - task-essential${variant:+-$variant} \ - task.list${variant:+.$variant}.essential \ + task-essential-$variant \ + task.list.$variant.essential \ $TDIR/tasksel update_full_list \ - task-full${variant:+-$variant} \ - task.list${variant:+.$variant}.full \ + task-full-$variant \ + task.list.$variant.full \ $TMP_PKG done