Dropping global binary includes and moving binary local-includes to includes, just as with chroot includes and local-includes.

4 files changed, 15 insertions, 194 deletions

diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary
index 3f56a589e..10d21677c 100755
--- a/scripts/build/lb_binary
+++ b/scripts/build/lb_binary
@@ -71,7 +71,6 @@ lb binary_silo ${*}
 lb binary_disk ${*}
 lb binary_win32-loader ${*}
 lb binary_includes ${*}
-lb binary_local-includes ${*}
 lb binary_hooks ${*}
 lb binary_checksums ${*}
 
diff --git a/scripts/build/lb_binary_includes b/scripts/build/lb_binary_includes
index f578ef537..702c26d2d 100755
--- a/scripts/build/lb_binary_includes
+++ b/scripts/build/lb_binary_includes
@@ -24,18 +24,13 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LB_INCLUDES}" = "none" ]
-then
-	exit 0
-fi
-
 Echo_message "Begin copying binary includes..."
 
 # Requiring stage file
 Require_stagefile .build/config .build/bootstrap
 
 # Checking stage file
-Check_stagefile .build/binary_includes
+Check_stagefile .build/includes.binary
 
 # Checking lock file
 Check_lockfile .lock
@@ -43,126 +38,20 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-# Check user includes
-if [ ! -d "${LB_INCLUDES}" ]
-then
-	if [ -d ../"${LB_INCLUDES}" ]
-	then
-		LB_INCLUDES="../${LB_INCLUDES}"
-	else
-		Echo_error "user specified includes not accessible in %s" "${LB_INCLUDES}"
-		exit 1
-	fi
-fi
-
-# Checking local includes
-if [ -d config/includes/"${LB_DISTRIBUTION}" ]
-then
-	LB_INCLUDES="config/includes"
-fi
-
-# Assemble architecture
-case "${LB_ARCHITECTURES}" in
-	amd64)
-		ARCH="amd"
-		;;
-
-	i386)
-		ARCH="386"
-		;;
-
-	powerpc)
-		ARCH="ppc"
-		;;
-
-	sparc)
-		ARCH="spa"
-		;;
-esac
-
-# Working arround vfat limitations
-case "${LB_BINARY_IMAGES}" in
-	hdd*)
-		case "${LB_BINARY_FILESYSTEM}" in
-			fat*)
-				CP_OPTIONS="-L"
-				;;
-		esac
-		;;
-esac
-
-# Copying common templates
-if [ -d "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/common ] && \
-Find_files "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/common/*
-then
-	cp -r ${CP_OPTIONS} "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/common/* binary
-fi
-
-if [ -d "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/common."${ARCH}" ] && \
-Find_files "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/common."${ARCH}"/*
-then
-	cp -r ${CP_OPTIONS} "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/common."${ARCH}"/* binary
-fi
-
-# Copying live templates
-if [ -d "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/live ] && \
-Find_files "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/live/*
-then
-	cp -r ${CP_OPTIONS} "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/live/* binary
-fi
-
-if [ -d "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/live."${ARCH}" ] && \
-Find_files "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/live."${ARCH}"/*
-then
-	cp -r ${CP_OPTIONS} "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/live."${ARCH}"/* binary
-fi
-
-if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
+if Find_files config/includes.binary/
 then
-	# Copying install templates
-	if [ -d "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/install ] && \
-	Find_files "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/install/*
-	then
-		cp -r ${CP_OPTIONS} "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/install/* binary
-	fi
-
-	if [ -d "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/install."${ARCH}" ] && \
-	Find_files "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/install."${ARCH}"/*
-	then
-		cp -r ${CP_OPTIONS} "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/install."${ARCH}"/* binary
-	fi
-
-	# Adjusting install templates
-	ARCHITECTURE="$(echo ${LB_ARCHITECTURES} | sed -e 's| |/|g')"
-	DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
-	DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION} | cut -b 2-)"
-	eval VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`"
+	# Copying includes
+	cd config/includes.binary
+	find . | cpio -dmpu --no-preserve-owner "${OLDPWD}"/binary
+	cd "${OLDPWD}"
 
-	if [ -d binary/pool/main/l/live-installer ]
-	then
-		TYPE="LIVE/INSTALL"
-	fi
+	# Removing symlinks
+	case "${LB_BINARY_IMAGES}" in
+		hdd*)
+			find binary -type l | xargs rm -f
+			;;
+	esac
 
-	TYPE="LIVE/NETINST"
-
-	DEBIAN_NAME="Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Binary $(date +%Y%m%d-%H:%M)"
-	DEBIAN_DATE="$(date +%Y%m%d-%H:%M)"
-
-	if [ "${LB_ARCHITECTURES}" = "i386" ]
-	then
-		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n and\n <tt>&nbsp;\n <A href="install/floppy/">/install/floppy/</a>\n </tt>"
-		DEBIAN_TOOLS_TXT="/tools/ and   /install/floppy/"
-	else
-		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n\n\n\n\n"
-		DEBIAN_TOOLS_TXT="/tools/"
-	fi
-
-	if [ -f binary/README.html ]
-	then
-		sed -i -e "s|DEBIAN_NAME|${DEBIAN_NAME}|g" -e "s|DEBIAN_DATE|${DEBIAN_DATE}|g" -e "s|DEBIAN_TOOLS|${DEBIAN_TOOLS_HTML}|g" binary/README.html
-		sed -i -e "s|DEBIAN_NAME|${DEBIAN_NAME}|g" -e "s|DEBIAN_DATE|${DEBIAN_DATE}|g" -e "s|DEBIAN_TOOLS|${DEBIAN_TOOLS_TXT}|g" binary/README.txt
-	fi
+	# Creating stage file
+	Create_stagefile .build/binary_includes
 fi
-
-# Creating stage file
-Create_stagefile .build/binary_includes
diff --git a/scripts/build/lb_binary_local-includes b/scripts/build/lb_binary_local-includes
deleted file mode 100755
index 773ea8d29..000000000
--- a/scripts/build/lb_binary_local-includes
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
-##
-## 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
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'copy files into binary')"
-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 binary local includes..."
-
-# Requiring stage file
-Require_stagefile .build/config .build/bootstrap
-
-# Checking stage file
-Check_stagefile .build/binary_local-includes
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if Find_files config/includes.binary/
-then
-	# Copying includes
-	cd config/includes.binary
-	find . | cpio -dmpu --no-preserve-owner "${OLDPWD}"/binary
-	cd "${OLDPWD}"
-
-	# Removing symlinks
-	case "${LB_BINARY_IMAGES}" in
-		hdd*)
-			find binary -type l | xargs rm -f
-			;;
-	esac
-
-	# Creating stage file
-	Create_stagefile .build/binary_local-includes
-fi
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 0c6a16f18..8a23f9705 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -78,7 +78,6 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--gzip-options OPTION|\"OPTIONS\"]\n\
 \t    [--hooks FILE]\n\
 \t    [--ignore-system-defaults]\n\
-\t    [--includes PATH|none]\n\
 \t    [--initramfs auto|none|live-boot|casper]\n\
 \t    [--initramfs-compression bzip2|gzip|lzma]\n\
 \t    [--initsystem sysvinit|runit|systemd|upstart|none]\n\
@@ -159,7 +158,7 @@ Local_arguments ()
 	LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-options:,aptitute-options:,
 		apt-pipeline:,apt-recommends:,apt-secure:,apt-source-archives:,bootstrap:,cache:,cache-indices:,cache-packages:,
 		cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump,
-		initramfs:,initramfs-compression:,initsystem:,fdisk:,losetup:,mode:,system:,root-command:,use-fakeroot:,tasksel:,includes:,
+		initramfs:,initramfs-compression:,initsystem:,fdisk:,losetup:,mode:,system:,root-command:,use-fakeroot:,tasksel:,
 		templates:,architectures:,bootstrap-flavour:,bootstrap-keyring:,clean,
 		distribution:,parent-distribution:,parent-debian-installer-distribution:,parent-mirror-bootstrap:,parent-mirror-chroot:,parent-mirror-chroot-security:,parent-mirror-chroot-volatile:,parent-mirror-chroot-backports:,parent-mirror-binary:,
 		parent-mirror-binary-security:,parent-mirror-binary-volatile:,parent-mirror-binary-backports:,parent-mirror-debian-installer:,
@@ -374,11 +373,6 @@ Local_arguments ()
 				shift 2
 				;;
 
-			--includes)
-				LB_INCLUDES="${2}"
-				shift 2
-				;;
-
 			--templates)
 				LB_TEMPLATES="${2}"
 				shift 2
@@ -1024,10 +1018,6 @@ LB_USE_FAKEROOT="${LB_USE_FAKEROOT}"
 # (Default: ${LB_TASKSEL})
 LB_TASKSEL="${LB_TASKSEL}"
 
-# \$LB_INCLUDES: set includes
-# (Default: ${LB_INCLUDES})
-LB_INCLUDES="${LB_INCLUDES}"
-
 # \$LB_TEMPLATES: set templates
 # (Default: ${LB_TEMPLATES})
 LB_TEMPLATES="${LB_TEMPLATES}"