4 files changed, 0 insertions, 254 deletions
diff --git a/scripts/build/binary b/scripts/build/binary
index 8b218c45d..2d970c426 100755
--- a/scripts/build/binary
+++ b/scripts/build/binary
@@ -66,7 +66,6 @@ lb binary_grub ${@}
 lb binary_grub2 ${@}
 lb binary_syslinux ${@}
 lb binary_yaboot ${@}
-lb binary_silo ${@}
 lb binary_disk ${@}
 lb binary_loadlin ${@}
 lb binary_win32-loader ${@}
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index fedeb9865..5df1f3d6a 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -125,11 +125,6 @@ case "${LB_BOOTLOADER}" in
 		XORRISO_EXCLUDE="boot/grub/grub_eltorito"
 		;;
 
-	silo)
-		XORRISO_OPTIONS="${XORRISO_OPTIONS} -G boot/isofs.b -B ..."
-		XORRISO_EXCLUDE="boot/isofs.b"
-		;;
-
 	syslinux)
 		case "${LB_MODE}" in
 			progress-linux)
diff --git a/scripts/build/binary_silo b/scripts/build/binary_silo
deleted file mode 100755
index 33826b2ab..000000000
--- a/scripts/build/binary_silo
+++ /dev/null
@@ -1,239 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 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 'installs silo 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
-
-if [ "${LB_BOOTLOADER}" != "silo" ]
-then
-	exit 0
-fi
-
-# Check image type
-case "${LIVE_IMAGE_TYPE}" in
-	iso*|hdd*|tar)
-		;;
-
-	netboot)
-		# silo not required for sparc netbooting
-		exit 0
-		;;
-esac
-
-Echo_message "Begin installing silo..."
-
-# Requiring stage file
-Require_stagefile .build/config .build/bootstrap
-
-# Checking stage file
-Check_stagefile .build/binary_silo
-
-# Checking silo templates
-Check_templates silo
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Check architecture
-Check_architectures sparc
-
-# Checking depends
-Check_package chroot/usr/sbin/silo silo
-
-# Restoring cache
-Restore_cache cache/packages.binary
-
-# Installing depends
-Install_package
-
-# Local functions
-Silo_live_entry ()
-{
-	LABEL="${1}"
-	KERNEL="${2}"
-	INITRD="${3}"
-	APPEND="${4}"
-
-	DIRECTORY="/$(basename ${DESTDIR_LIVE})"
-
-	LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n"
-	LINUX_LIVE="${LINUX_LIVE}\t  label=${LABEL}\n"
-	LINUX_LIVE="${LINUX_LIVE}\t  initrd=${DIRECTORY}/${INITRD}\n"
-	LINUX_LIVE="${LINUX_LIVE}\t  append=\"${INITFS:+boot=${INITFS} }config LB_BOOTAPPEND_LIVE ${APPEND}\"\n"
-}
-
-Silo_install_entry ()
-{
-	LABEL="${1}"
-	KERNEL="${2}"
-	INITRD="${3}"
-	APPEND="${4}"
-
-	DIRECTORY="/$(basename ${DESTDIR_INSTALL})"
-
-	if [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
-	then
-		APPEND="${APPEND} quiet"
-	fi
-
-	LINUX_INSTALL="${LINUX_INSTALL}\nimage=${DIRECTORY}/${KERNEL}\n"
-	LINUX_INSTALL="${LINUX_INSTALL}\t  label=${LABEL}\n"
-	LINUX_INSTALL="${LINUX_INSTALL}\t  initrd=${DIRECTORY}/${INITRD}\n"
-	LINUX_INSTALL="${LINUX_INSTALL}\t  append=\"LB_BOOTAPPEND_LIVE ${APPEND} LB_BOOTAPPEND_INSTALL\"\n"
-}
-
-# Setting destination directories
-DESTDIR_INSTALL="binary/install"
-case "${LB_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		DESTDIR_LIVE="binary/casper"
-		;;
-
-	live-boot)
-		INITFS="live"
-		DESTDIR_LIVE="binary/live"
-		;;
-
-	*)
-		INITFS=""
-		DESTDIR_LIVE="binary/boot"
-		;;
-esac
-
-# Creating directory
-mkdir -p "${DESTDIR_LIVE}"
-
-# Setting boot parameters
-if [ "${LB_UNION_FILESYSTEM}" != "aufs" ]
-then
-	LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}"
-fi
-
-if [ -n "${LB_NET_COW_PATH}" ]
-then
-	Echo_error "Net cow not supported on silo"
-	exit 1
-fi
-
-if [ "${LB_EXPOSED_ROOT}" != "false" ]
-then
-	LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} exposedroot"
-fi
-
-LB_BOOTAPPEND_LIVE="$(echo ${LB_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
-
-# Assembling kernel configuration
-
-# Default entries
-DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
-DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
-DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
-
-Silo_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
-
-if [ "${LB_BOOTAPPEND_FAILSAFE}" != "none" ]
-then
-	Silo_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${LB_BOOTAPPEND_FAILSAFE}"
-fi
-
-if [ "$(echo ${LB_LINUX_FLAVOURS} | wc -w)" -gt "1" ]
-then
-	for KERNEL in chroot/boot/vmlinuz-*
-	do
-		KERNEL_IMAGE="$(basename ${KERNEL})"
-		KERNEL_VERSION="$(echo ${KERNEL_IMAGE} | sed -e 's|vmlinuz-||')"
-		INITRD="initrd.img-${KERNEL_VERSION}"
-
-		Silo_live_entry "live-${KERNEL_VERSION}" "${KERNEL_IMAGE}" "${INITRD}"
-		Silo_live_entry "live-${KERNEL_VERSION}-failsafe" "${KERNEL_IMAGE}" "${INITRD}" "${LB_BOOTAPPEND_FAILSAFE}"
-	done
-fi
-
-LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
-
-# Assembling debian-installer configuration
-if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
-then
-	VMLINUZ_DI="vmlinuz"
-	INITRD_DI="initrd.gz"
-	APPEND_DI="vga=normal"
-
-	Silo_install_entry "linux" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
-	Silo_install_entry "install" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
-	Silo_install_entry "expert" "${VMLINUZ_DI}" "${INITRD_DI}" "priority=low ${APPEND_DI}"
-	Silo_install_entry "rescue" "${VMLINUZ_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_DI}"
-	Silo_install_entry "auto" "${VMLINUZ_DI}" "${INITRD_DI}" "auto=true priority=critical ${APPEND_DI}"
-fi
-
-LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
-
-case "${LIVE_IMAGE_TYPE}" in
-	iso*|hdd*)
-		# Copying silo
-		mkdir -p binary/boot
-
-		case "${LB_BUILD_WITH_CHROOT}" in
-			true)
-				cp chroot/boot/second.b binary/boot
-				;;
-
-			false)
-				cp /boot/second.b binary/boot
-				;;
-		esac
-
-		cp -r "${TEMPLATES}"/* binary/boot
-
-		if [ "${LB_DEBIAN_INSTALLER}" = "false" ]
-		then
-			rm -f binary/boot/debian.txt.install
-		else
-			mv binary/boot/debian.txt.install binary/boot/debian.txt
-		fi
-
-		# Configure silo templates
-		sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" \
-		       -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" \
-		       binary/boot/silo.conf
-		sed -i -e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" \
-		       -e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" \
-		       binary/boot/silo.conf
-		sed -i -e "s|LB_DATE|$(date +%Y%m%d)|" \
-		       -e "s|LB_VERSION|${VERSION}|" \
-		       -e "s|LB_DISTRIBUTION|${LB_DISTRIBUTION}|" \
-		       binary/boot/debian.txt
-		;;
-esac
-
-# Saving cache
-Save_cache cache/packages.binary
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .build/binary_silo
diff --git a/scripts/build/source_debian b/scripts/build/source_debian
index 5d7a984d8..44c610f7e 100755
--- a/scripts/build/source_debian
+++ b/scripts/build/source_debian
@@ -89,15 +89,6 @@ EOF
 	powerpc)
 		echo "yaboot" >> source-selection.txt
 		;;
-
-	sparc)
-
-cat >> source-selection.txt << EOF
-silo
-sparc-utils
-EOF
-
-		;;
 esac
 
 if [ -n "${LB_TASKS}" ]