Dropping lb prefix from live-build scripts, not needed anymore.

Previously, we needed to keep the lb_* prefix as the scripts
could also be executed standalone. Since the lb wrapper is
mandatory since squeeze, we can drop this now.

1 files changed, 335 insertions, 0 deletions

diff --git a/scripts/build/chroot_apt b/scripts/build/chroot_apt
new file mode 100755
index 000000000..2e1bce289
--- /dev/null
+++ b/scripts/build/chroot_apt
@@ -0,0 +1,335 @@
+#!/bin/sh
+
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+##
+## 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 'manage /etc/apt/apt.conf')"
+HELP=""
+USAGE="${PROGRAM} {install|install-binary|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Requiring stage file
+Require_stagefile .build/config .build/bootstrap
+
+case "${1}" in
+	install|install-binary)
+		Echo_message "Configuring file /etc/apt/apt.conf"
+
+		# Checking stage file
+		Check_stagefile .build/chroot_apt
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		mkdir -p chroot/etc/apt/apt.conf.d
+
+		# Configuring apt ftp proxy
+		if [ -n "${LB_APT_FTP_PROXY}" ]
+		then
+			echo "Acquire::ftp::Proxy \"${LB_APT_FTP_PROXY}\";" > chroot/etc/apt/apt.conf.d/00ftp-proxy
+		fi
+
+		# Configuring apt http proxy
+		if [ -n "${LB_APT_HTTP_PROXY}" ]
+		then
+			echo "Acquire::http::Proxy \"${LB_APT_HTTP_PROXY}\";" > chroot/etc/apt/apt.conf.d/00http-proxy
+		fi
+
+		# Configuring apt pipeline
+		if [ -n "${LB_APT_PIPELINE}" ]
+		then
+			echo "Acquire::http::Pipeline-Depth \"${LB_APT_PIPELINE}\";" > chroot/etc/apt/apt.conf.d/00pipeline
+		fi
+
+		# Configuring apt recommends
+		case "${LB_APT_RECOMMENDS}" in
+			true)
+				echo "APT::Install-Recommends \"true\";" > chroot/etc/apt/apt.conf.d/00recommends
+				echo "Aptitude::Recommends-Important \"true\";" >> chroot/etc/apt/apt.conf.d/00recommends
+				;;
+
+			false)
+				echo "APT::Install-Recommends \"false\";" > chroot/etc/apt/apt.conf.d/00recommends
+				echo "Aptitude::Recommends-Important \"false\";" >> chroot/etc/apt/apt.conf.d/00recommends
+				;;
+		esac
+
+		# Configuring apt secure
+		case "${LB_APT_SECURE}" in
+			true)
+				echo "APT::Get::AllowUnauthenticated \"false\";" > chroot/etc/apt/apt.conf.d/00secure
+				echo "Aptitude::CmdLine::Ignore-Trust-Violations \"false\";" >> chroot/etc/apt/apt.conf.d/00secure
+				;;
+
+			false)
+				echo "APT::Get::AllowUnauthenticated \"true\";" > chroot/etc/apt/apt.conf.d/00secure
+				echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> chroot/etc/apt/apt.conf.d/00secure
+				;;
+		esac
+
+		# Configuring apt config
+		if [ -f config/chroot_apt/apt.conf ]
+		then
+			if [ -f chroot/etc/apt/apt.conf ]
+			then
+				mv chroot/etc/apt/apt.conf chroot/etc/apt/apt.conf.orig
+			fi
+
+			cp config/chroot_apt/apt.conf chroot/etc/apt/apt.conf
+		fi
+
+		# Configuring apt preferences
+		if [ -f config/chroot_apt/preferences ]
+		then
+			if [ -f chroot/etc/apt/preferences ]
+			then
+				mv chroot/etc/apt/preferences chroot/etc/apt/preferences.orig
+			fi
+
+			cp config/chroot_apt/preferences chroot/etc/apt/preferences
+		fi
+
+		if Find_files config/chroot_apt/*.pref
+		then
+			for _FILE in config/chroot_apt/*.pref
+			do
+				if [ -f chroot/etc/apt/preferences.d/$(basename ${_FILE}) ]
+				then
+					mv chroot/etc/apt/preferences.d/$(basename ${_FILE}) chroot/etc/apt/preferences.d/$(basename ${_FILE}).orig
+				fi
+
+				cp -aL ${_FILE} chroot/etc/apt/preferences.d
+			done
+		fi
+
+		if Find_files config/packages.chroot/*.deb || Find_files config/packages/*.deb
+		then
+			echo >> chroot/etc/apt/preferences
+			echo "# Added by lb_chroot_apt ${@}" >> chroot/etc/apt/preferences
+			echo "Package: *" >> chroot/etc/apt/preferences
+			echo "Pin: release o=config/packages.chroot" >> chroot/etc/apt/preferences
+
+			case "${1}" in
+				install)
+					# Ensure local packages have priority
+					echo "Pin-Priority: 1001" >> chroot/etc/apt/preferences
+					;;
+
+				install-binary)
+					# Ensure local packages are not re-installed during lb_binary
+					echo "Pin-Priority: 99" >> chroot/etc/apt/preferences
+
+					echo >> chroot/etc/apt/preferences
+					echo "Package: *" >> chroot/etc/apt/preferences
+					echo "Pin: release o=debian" >> chroot/etc/apt/preferences
+					echo "Pin-Priority: 99" >> chroot/etc/apt/preferences
+					;;
+			esac
+		fi
+
+		case "${LB_MODE}" in
+			progress)
+				if [ ! -e chroot/etc/apt/preferences.d/progress.pref ]
+				then
+					_DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')"
+
+					_ENABLE_DISTRIBUTIONS="${_DISTRIBUTION}"
+					_DISABLE_DISTRIBUTIONS=""
+
+					if [ "${LB_SECURITY}" = "true" ]
+					then
+						_ENABLE_DISTRIBUTIONS="${_ENABLE_DISTRIBUTIONS} ${_DISTRIBUTION}-security"
+					fi
+
+					if [ "${LB_VOLATILE}" = "true" ]
+					then
+						_ENABLE_DISTRIBUTIONS="${_ENABLE_DISTRIBUTIONS} ${_DISTRIBUTION}-updates"
+					fi
+
+					case "${LB_DISTRIBUTION}" in
+						*-backports)
+							if [ "${LB_BACKPORTS}" = "true" ]
+							then
+								_ENABLE_DISTRIBUTIONS="${_ENABLE_DISTRIBUTIONS} ${_DISTRIBUTION}-backports"
+							fi
+							;;
+
+						*)
+							if [ "${LB_BACKPORTS}" = "true" ]
+							then
+								_DISABLE_DISTRIBUTIONS="${_DISABLE_DISTRIBUTIONS} ${_DISTRIBUTION}-backports"
+							fi
+							;;
+					esac
+
+					for _DISTRIBUTION in ${_ENABLE_DISTRIBUTIONS}
+					do
+
+cat >> chroot/etc/apt/preferences.d/progress.pref << EOF
+
+Package: *
+Pin: release n=${_DISTRIBUTION}
+Pin-Priority: 999
+EOF
+
+					done
+
+					for _DISTRIBUTION in ${_DISABLE_DISTRIBUTIONS}
+					do
+
+cat >> chroot/etc/apt/preferences.d/progress.pref << EOF
+
+#Package: *
+#Pin: release n=${_DISTRIBUTION}
+#Pin-Priority: 999
+EOF
+
+					done
+
+					# Add temporary hack to avoid squashfs version mismatch
+					case "${LB_DISTRIBUTION}" in
+						artax-backports)
+
+cat >> chroot/etc/apt/preferences.d/progress.tmp.pref << EOF
+Package: squashfs-tools
+Pin: release n=squeeze
+Pin-Priority: 1001
+EOF
+
+						;;
+					esac
+				fi
+				;;
+		esac
+
+		# Creating stage file
+		Create_stagefile .build/chroot_apt
+		;;
+
+	remove)
+		Echo_message "Deconfiguring file /etc/apt/apt.conf"
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		# Deconfiguring aptitude ftp proxy
+		rm -f chroot/etc/apt/apt.conf.d/00ftp-proxy
+
+		# Deconfiguring aptitude http proxy
+		rm -f chroot/etc/apt/apt.conf.d/00http-proxy
+
+		# Deconfiguring aptitude pipeline
+		rm -f chroot/etc/apt/apt.conf.d/00pipeline
+
+		# Deconfiguring aptitude recommends
+		if [ "${LB_APT_RECOMMENDS}" = "true" ]
+		then
+			rm -f chroot/etc/apt/apt.conf.d/00recommends
+		fi
+
+		# Deconfiguring aptitude secure
+		if [ "${LB_APT_SECURE}" = "true" ]
+		then
+			rm -f chroot/etc/apt/apt.conf.d/00secure
+		fi
+
+		# Configuring apt config
+		if [ -f config/chroot_apt/apt.conf ]
+		then
+			if [ -f chroot/etc/apt/apt.conf ]
+			then
+				mv chroot/etc/apt/apt.conf chroot/etc/apt/apt.conf.orig
+			fi
+
+			cp config/chroot_apt/apt.conf chroot/etc/apt/apt.conf
+
+			if [ -f chroot/etc/apt/apt.conf.orig ]
+			then
+				mv chroot/etc/apt/apt.conf.orig chroot/etc/apt/apt.conf
+			fi
+		fi
+
+		# Deconfiguring apt preferences
+		if [ -f config/chroot_apt/preferences ]
+		then
+			if [ -f chroot/etc/apt/preferences ]
+			then
+				mv chroot/etc/apt/preferences chroot/etc/apt/preferences.orig
+			fi
+
+			cp config/chroot_apt/preferences chroot/etc/apt/preferences
+
+			if [ -f chroot/etc/apt/preferences.orig ]
+			then
+				mv chroot/etc/apt/preferences.orig chroot/etc/apt/preferences
+			fi
+		fi
+
+		if Find_files config/chroot_apt/*.pref
+		then
+			for _FILE in config/chroot_apt/*.pref
+			do
+				if [ -f chroot/etc/apt/preferences.d/$(basename ${_FILE}) ]
+				then
+					mv chroot/etc/apt/preferences.d/$(basename ${_FILE}) chroot/etc/apt/preferences.d/$(basename ${_FILE}).orig
+				fi
+
+				cp -aL ${_FILE} chroot/etc/apt/preferences.d
+
+				if [ -f chroot/etc/apt/preferences.d/$(basename ${_FILE}) ]
+				then
+					mv chroot/etc/apt/preferences.d/$(basename ${_FILE}).orig chroot/etc/apt/preferences.d/$(basename ${_FILE})
+				fi
+			done
+		fi
+
+		if Find_files config/packages.chroot/*.deb || Find_files config/packages/*.deb
+		then
+			if [ -f chroot/etc/apt/preferences ]
+			then
+				# delete additions from lb_chroot_apt install|install-binary to preferences
+				sed -i '/# Added by lb_chroot_apt/,$d' chroot/etc/apt/preferences
+				# delete the last empty line
+				sed -i '${/^[[:blank:]]*$/d;}' chroot/etc/apt/preferences
+				# if the resulting preferences file is empty there was no user additions, remove it
+				if [ ! -s chroot/etc/apt/preferences ]
+				then
+					rm -rf chroot/etc/apt/preferences
+				fi
+			fi
+
+		fi
+
+		# Remove temporary hack to avoid squashfs version mismatch for artax-backports
+		rm -f chroot/etc/apt/preferences.d/progress.tmp.pref
+
+		# Removing stage file
+		rm -f .build/chroot_apt
+		;;
+
+	*)
+		Usage
+		;;
+esac