diff options
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/chroot | 2 | ||||
| -rwxr-xr-x | scripts/build/chroot_includes | 50 |
2 files changed, 1 insertions, 51 deletions
diff --git a/scripts/build/chroot b/scripts/build/chroot index ef4db8744..a91118ce9 100755 --- a/scripts/build/chroot +++ b/scripts/build/chroot @@ -68,7 +68,7 @@ do done lb chroot_live-packages ${@} -lb chroot_includes ${@} +lb chroot-includes ${@} lb chroot-hooks ${@} lb chroot_hacks ${@} lb chroot_interactive ${@} diff --git a/scripts/build/chroot_includes b/scripts/build/chroot_includes deleted file mode 100755 index c0dd75d6f..000000000 --- a/scripts/build/chroot_includes +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch> -## -## This program 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 -[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh - -# Setting static variables -DESCRIPTION="$(Echo 'copy files into chroot')" -HELP="" -USAGE="${PROGRAM} [--force]" - -Arguments "${@}" - -# Reading configuration files -Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source -Set_defaults - -Echo_message "Begin copying chroot includes..." - -# Requiring stage file -Require_stagefile .build/config .build/bootstrap - -# Checking stage file -Check_stagefile .build/includes.chroot - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -if Find_files config/includes.chroot/ -then - # Copying includes - cd config/includes.chroot - find . | cpio -dmpu --no-preserve-owner "${OLDPWD}"/chroot - cd "${OLDPWD}" - - # Creating stage file - Create_stagefile .build/chroot_includes -fi |