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

1 files changed, 14 insertions, 125 deletions

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