From 0a32c8b6c06be399164fe25fe60c11c905d3df1b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 7 Sep 2011 16:00:52 +0200 Subject: Renaming lb_chroot_packagelists to lb_chroot_package-lists so that helper matches directory. --- scripts/build/lb_chroot | 2 +- scripts/build/lb_chroot_package-lists | 76 +++++++++++++++++++++++++++++++++++ scripts/build/lb_chroot_packagelists | 76 ----------------------------------- 3 files changed, 77 insertions(+), 77 deletions(-) create mode 100755 scripts/build/lb_chroot_package-lists delete mode 100755 scripts/build/lb_chroot_packagelists diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot index 5677a68a0..57112443b 100755 --- a/scripts/build/lb_chroot +++ b/scripts/build/lb_chroot @@ -58,7 +58,7 @@ lb chroot_local-preseed ${*} for _PASS in install live do - lb chroot_packagelists ${_PASS} ${*} + lb chroot_package-lists ${_PASS} ${*} lb chroot_install-packages ${_PASS} ${*} lb chroot_task-lists ${_PASS} ${*} diff --git a/scripts/build/lb_chroot_package-lists b/scripts/build/lb_chroot_package-lists new file mode 100755 index 000000000..ff990d51e --- /dev/null +++ b/scripts/build/lb_chroot_package-lists @@ -0,0 +1,76 @@ +#!/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 'queue install of package 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 queueing installation of package lists (${_PASS} pass)..." + +# Requiring stage file +Require_stagefile .stage/config .stage/bootstrap + +# Checking stage file +Check_stagefile .stage/chroot_package-lists.${_PASS} + +# Checking lock file +Check_lockfile .lock + +# Creating lock file +Create_lockfile .lock + +# Handling global package lists +if [ -n "${LB_PACKAGE_LISTS}" ] && [ "${LB_PACKAGE_LISTS}" != "none" ] +then + for LIST in ${LB_PACKAGE_LISTS} + do + # Generating package list + Expand_packagelist "${LIST}" >> chroot/root/packages.chroot + done + + # Creating stage file + Create_stagefile .stage/chroot_package-lists.${_PASS} +fi + +# Handling local package lists +if ls config/package-lists/*.list > /dev/null 2>&1 || \ + ls config/package-lists/*.list.chroot > /dev/null 2>&1 || \ + ls config/package-lists/*.list.chroot_${_PASS} > /dev/null 2>&1 +then + for LIST in config/package-lists/*.list \ + config/package-lists/*.list.chroot \ + config/package-lists/*.list.chroot_${_PASS} + do + if [ -e "${LIST}" ] + then + # Generating package list + Expand_packagelist "$(basename ${LIST})" "config/package-lists" \ + >> chroot/root/packages.chroot + fi + done + + # Creating stage file + Create_stagefile .stage/chroot_package-lists.${_PASS} +fi diff --git a/scripts/build/lb_chroot_packagelists b/scripts/build/lb_chroot_packagelists deleted file mode 100755 index 615b4d79a..000000000 --- a/scripts/build/lb_chroot_packagelists +++ /dev/null @@ -1,76 +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 'queue install of package 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 queueing installation of package lists (${_PASS} pass)..." - -# Requiring stage file -Require_stagefile .stage/config .stage/bootstrap - -# Checking stage file -Check_stagefile .stage/chroot_packagelists.${_PASS} - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -# Handling global package lists -if [ -n "${LB_PACKAGE_LISTS}" ] && [ "${LB_PACKAGE_LISTS}" != "none" ] -then - for LIST in ${LB_PACKAGE_LISTS} - do - # Generating package list - Expand_packagelist "${LIST}" >> chroot/root/packages.chroot - done - - # Creating stage file - Create_stagefile .stage/chroot_packagelists.${_PASS} -fi - -# Handling local package lists -if ls config/package-lists/*.list > /dev/null 2>&1 || \ - ls config/package-lists/*.list.chroot > /dev/null 2>&1 || \ - ls config/package-lists/*.list.chroot_${_PASS} > /dev/null 2>&1 -then - for LIST in config/package-lists/*.list \ - config/package-lists/*.list.chroot \ - config/package-lists/*.list.chroot_${_PASS} - do - if [ -e "${LIST}" ] - then - # Generating package list - Expand_packagelist "$(basename ${LIST})" "config/package-lists" \ - >> chroot/root/packages.chroot - fi - done - - # Creating stage file - Create_stagefile .stage/chroot_packagelists.${_PASS} -fi -- cgit v1.2.3