From cfb6ecedfa5f923296c6ab23b7d1e8ec60f0f156 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 Jun 2011 22:01:17 +0200 Subject: Since we don't have global tasks anymore, renaming lb_chroot_local-tasklists to lb_chroot_task-lists. --- scripts/build/lb_chroot | 2 +- scripts/build/lb_chroot_local-tasklists | 148 -------------------------------- scripts/build/lb_chroot_task-lists | 148 ++++++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+), 149 deletions(-) delete mode 100755 scripts/build/lb_chroot_local-tasklists create mode 100755 scripts/build/lb_chroot_task-lists (limited to 'scripts') diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot index b7c27139e..b112b3d43 100755 --- a/scripts/build/lb_chroot +++ b/scripts/build/lb_chroot @@ -62,7 +62,7 @@ do lb chroot_local-packagelists ${_PASS} ${*} lb chroot_local-packages ${_PASS} ${*} lb chroot_install-packages ${_PASS} ${*} - lb chroot_local-tasklists ${_PASS} ${*} + lb chroot_task-lists ${_PASS} ${*} if [ "${_PASS}" = install ] then diff --git a/scripts/build/lb_chroot_local-tasklists b/scripts/build/lb_chroot_local-tasklists deleted file mode 100755 index 8291395b6..000000000 --- a/scripts/build/lb_chroot_local-tasklists +++ /dev/null @@ -1,148 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann -## -## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -## This is free software, and you are welcome to redistribute it -## under certain conditions; see COPYING for details. - - -set -e - -# Including common functions -. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh - -# Setting static variables -DESCRIPTION="$(Echo 'install local task lists into chroot')" -HELP="" -USAGE="${PROGRAM} {install|live} [--force]" - -_PASS="${1}" -shift - -Arguments "${@}" - -# Reading configuration files -Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source -Set_defaults - -Echo_message "Begin installation of local task lists (${_PASS} pass)..." - -# Requiring stage file -Require_stagefile .stage/config .stage/bootstrap - -# Checking stage file -Check_stagefile .stage/chroot_local-tasklists.${_PASS} - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -if ls config/task-lists/*.chroot.list > /dev/null 2>&1 || \ - ls config/task-lists/*.chroot_${_PASS}.list > /dev/null 2>&1 -then - for LIST in config/task-lists/*.chroot.list config/task-lists/*.chroot_${_PASS}.list - do - if [ -e "${LIST}" ] - then - # Generating local task list - Expand_packagelist "$(basename ${LIST})" "config/task-lists" \ - >> chroot/root/chroot_tasks - fi - done - - # Restoring cache - Restore_cache cache/packages_chroot - - # Checking depends - case "${LB_TASKSEL}" in - apt) - Check_package chroot/usr/bin/apt-get apt - ;; - - aptitude) - Check_package chroot/usr/bin/aptitude aptitude - ;; - - tasksel) - Check_package chroot/usr/bin/tasksel tasksel - ;; - esac - - # Installing depends - Install_package - - # Installing tasks - case "${LB_TASKSEL}" in - apt) - # This needs to be cleaned up at some point - APT_TASKS= - - case "${LB_MODE}" in - ubuntu) - TASKS="$(cat chroot/root/chroot_tasks)" - ;; - - *) - # Avoid standard tasks which appears to not exist - TASKS="$(cat chroot/root/chroot_tasks | sed -e 's|standard||')" - ;; - esac - - for TASK in ${TASKS} - do - APT_TASKS="${APT_TASKS:+$APT_TASKS }$TASK^" - done - - Chroot chroot "apt-get ${APT_OPTIONS} install ${APT_TASKS}" - ;; - - aptitude) - Chroot chroot "aptitude ${APTITUDE_OPTIONS} install $(cat chroot/root/chroot_tasks)" - ;; - - tasksel) - for TASK in $(cat chroot/root/chroot_tasks) - do - case "${TASK}" in - gnome*) - DESKTOP="${DESKTOP} gnome" - ;; - - kde*) - DESKTOP="${DESKTOP} kde" - ;; - - lxde*) - DESKTOP="${DESKTOP} lxde" - ;; - - xfce*) - DESKTOP="${DESKTOP} xfce" - ;; - esac - - echo "tasksel tasksel/desktop multiselect ${DESKTOP}" > chroot/root/preseed - Chroot chroot "debconf-set-selections /root/preseed" - rm -f chroot/root/preseed - - Chroot chroot "tasksel --debconf-apt-progress --logstderr install ${TASK}" - done - ;; - esac - - # Removing depends - Remove_package - - # Removing task list - rm -f chroot/root/chroot_tasks - - # Saving cache - Save_cache cache/packages_chroot - - # Creating stage file - Create_stagefile .stage/chroot_local-tasklists.${_PASS} -fi diff --git a/scripts/build/lb_chroot_task-lists b/scripts/build/lb_chroot_task-lists new file mode 100755 index 000000000..82aa225ea --- /dev/null +++ b/scripts/build/lb_chroot_task-lists @@ -0,0 +1,148 @@ +#!/bin/sh + +## live-build(7) - System Build Scripts +## Copyright (C) 2006-2011 Daniel Baumann +## +## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +## This is free software, and you are welcome to redistribute it +## under certain conditions; see COPYING for details. + + +set -e + +# Including common functions +. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh + +# Setting static variables +DESCRIPTION="$(Echo 'install task lists into chroot')" +HELP="" +USAGE="${PROGRAM} {install|live} [--force]" + +_PASS="${1}" +shift + +Arguments "${@}" + +# Reading configuration files +Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source +Set_defaults + +Echo_message "Begin installation of task lists (${_PASS} pass)..." + +# Requiring stage file +Require_stagefile .stage/config .stage/bootstrap + +# Checking stage file +Check_stagefile .stage/chroot_task-lists.${_PASS} + +# Checking lock file +Check_lockfile .lock + +# Creating lock file +Create_lockfile .lock + +if ls config/task-lists/*.chroot.list > /dev/null 2>&1 || \ + ls config/task-lists/*.chroot_${_PASS}.list > /dev/null 2>&1 +then + for LIST in config/task-lists/*.chroot.list config/task-lists/*.chroot_${_PASS}.list + do + if [ -e "${LIST}" ] + then + # Generating task list + Expand_packagelist "$(basename ${LIST})" "config/task-lists" \ + >> chroot/root/chroot_tasks + fi + done + + # Restoring cache + Restore_cache cache/packages_chroot + + # Checking depends + case "${LB_TASKSEL}" in + apt) + Check_package chroot/usr/bin/apt-get apt + ;; + + aptitude) + Check_package chroot/usr/bin/aptitude aptitude + ;; + + tasksel) + Check_package chroot/usr/bin/tasksel tasksel + ;; + esac + + # Installing depends + Install_package + + # Installing tasks + case "${LB_TASKSEL}" in + apt) + # This needs to be cleaned up at some point + APT_TASKS= + + case "${LB_MODE}" in + ubuntu) + TASKS="$(cat chroot/root/chroot_tasks)" + ;; + + *) + # Avoid standard tasks which appears to not exist + TASKS="$(cat chroot/root/chroot_tasks | sed -e 's|standard||')" + ;; + esac + + for TASK in ${TASKS} + do + APT_TASKS="${APT_TASKS:+$APT_TASKS }$TASK^" + done + + Chroot chroot "apt-get ${APT_OPTIONS} install ${APT_TASKS}" + ;; + + aptitude) + Chroot chroot "aptitude ${APTITUDE_OPTIONS} install $(cat chroot/root/chroot_tasks)" + ;; + + tasksel) + for TASK in $(cat chroot/root/chroot_tasks) + do + case "${TASK}" in + gnome*) + DESKTOP="${DESKTOP} gnome" + ;; + + kde*) + DESKTOP="${DESKTOP} kde" + ;; + + lxde*) + DESKTOP="${DESKTOP} lxde" + ;; + + xfce*) + DESKTOP="${DESKTOP} xfce" + ;; + esac + + echo "tasksel tasksel/desktop multiselect ${DESKTOP}" > chroot/root/preseed + Chroot chroot "debconf-set-selections /root/preseed" + rm -f chroot/root/preseed + + Chroot chroot "tasksel --debconf-apt-progress --logstderr install ${TASK}" + done + ;; + esac + + # Removing depends + Remove_package + + # Removing task list + rm -f chroot/root/chroot_tasks + + # Saving cache + Save_cache cache/packages_chroot + + # Creating stage file + Create_stagefile .stage/chroot_task-lists.${_PASS} +fi -- cgit v1.2.3