diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/binary | 1 | ||||
| -rwxr-xr-x | scripts/build/binary_iso | 7 | ||||
| -rwxr-xr-x | scripts/build/binary_yaboot | 284 | ||||
| -rwxr-xr-x | scripts/build/config | 2 | ||||
| -rwxr-xr-x | scripts/build/source_debian | 4 |
5 files changed, 1 insertions, 297 deletions
diff --git a/scripts/build/binary b/scripts/build/binary index 2d970c426..52125766d 100755 --- a/scripts/build/binary +++ b/scripts/build/binary @@ -65,7 +65,6 @@ lb binary_memtest ${@} lb binary_grub ${@} lb binary_grub2 ${@} lb binary_syslinux ${@} -lb binary_yaboot ${@} lb binary_disk ${@} lb binary_loadlin ${@} lb binary_win32-loader ${@} diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index 5df1f3d6a..10755ebe1 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -141,13 +141,6 @@ case "${LB_BOOTLOADER}" in XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table" ;; - yaboot) - XORRISO_OPTIONS="${XORRISO_OPTIONS} --iso-level 2 --netatalk -hfs -probe -map" - XORRISO_OPTIONS="${XORRISO_OPTIONS} binary/yaboot/hfs.map --chrp-boot -part -no-desktop" - XORRISO_OPTIONS="${XORRISO_OPTIONS} -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc" - XORRISO_EXCLUDE="yaboot/hfs.map" - ;; - *) Echo_warning "Bootloader on your architecture not yet supported by live-build." Echo_warning "This will produce a most likely not bootable image (Continuing in 5 seconds)." diff --git a/scripts/build/binary_yaboot b/scripts/build/binary_yaboot deleted file mode 100755 index 5ad1478db..000000000 --- a/scripts/build/binary_yaboot +++ /dev/null @@ -1,284 +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 yaboot 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}" != "yaboot" ] -then - exit 0 -fi - -Echo_message "Begin installing yaboot..." - -# Requiring stage file -Require_stagefile .build/config .build/bootstrap - -# Checking stage file -Check_stagefile .build/binary_yaboot - -# Checking yaboot templates -Check_templates yaboot - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -# Check architecture -Check_architectures powerpc ppc64 -Check_crossarchitectures - -# Checking depends -Check_package chroot/usr/lib/yaboot/yaboot yaboot - -# Restoring cache -Restore_cache cache/packages.binary - -# Installing depends -Install_package - -# Local functions -Yaboot_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}\tlabel=${LABEL}\n" - LINUX_LIVE="${LINUX_LIVE}\tinitrd=${DIRECTORY}/${INITRD}\n" - LINUX_LIVE="${LINUX_LIVE}\tappend=\"${INITFS:+boot=${INITFS} }config LB_BOOTAPPEND_LIVE ${APPEND}\"\n" - LINUX_LIVE="${LINUX_LIVE}\tinitrd-size=10240\n" -} - -Yaboot_install_entry () -{ - LABEL="${1}" - KERNEL="${2}" - INITRD="${3}" - APPEND="${4}" - - DIRECTORY="/$(basename ${DESTDIR_INSTALL})" - - QAPPEND="quiet" - - for TYPE in Install Expert Rescue Auto - do - case "${TYPE}" in - Install) - TAPPEND="${APPEND} ${QAPPEND}" - ;; - - Expert) - TAPPEND="priority=low ${APPEND}" - ;; - - Rescue) - TAPPEND="rescue/enable=true ${APPEND} ${QAPPEND}" - ;; - - Auto) - TAPPEND="auto=true priority=critical ${APPEND} ${QAPPEND}" - ;; - esac - - case "${LABEL}" in - Text) - TYPE_SUFFIX="" - ;; - GUI) - TYPE_SUFFIX="gui" - ;; - esac - - LINUX_INSTALL="${LINUX_INSTALL}\nimage=${DIRECTORY}/${KERNEL}\n" - LINUX_INSTALL="${LINUX_INSTALL}\tlabel=${TYPE}${TYPE_SUFFIX}\n" - LINUX_INSTALL="${LINUX_INSTALL}\tinitrd=${DIRECTORY}/${INITRD}\n" - LINUX_INSTALL="${LINUX_INSTALL}\tappend=\"${TAPPEND} ${LB_BOOTAPPEND_INSTALL}\"\n" - LINUX_INSTALL="${LINUX_INSTALL}\tinitrd-size=10240\n" - done -} - -case "${LB_INITRAMFS}" in - casper) - INITFS="casper" - ;; - - live-boot) - INITFS="live" - ;; - - *) - INITFS="" - ;; -esac - -# Setting destination directory -case "${LIVE_IMAGE_TYPE}" in - iso*) - case "${LB_INITRAMFS}" in - casper) - DESTDIR_LIVE="binary/casper" - ;; - - live-boot) - DESTDIR_LIVE="binary/live" - ;; - - *) - DESTDIR_LIVE="binary/boot" - ;; - esac - - DESTDIR_INSTALL="binary/install" - ;; - - hdd*|netboot|tar) - Echo_error "not yet supported, aborting (FIXME)." - exit 1 - ;; -esac - -Check_multiarchitectures - -# 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 yet supported on yaboot" - 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/vmlinux-*${DEFAULT_FLAVOUR})" -DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinux-||')" - -Yaboot_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" - -if [ "${LB_BOOTAPPEND_FAILSAFE}" != "none" ] -then - Yaboot_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/vmlinux-* - do - KERNEL_IMAGE="$(basename ${KERNEL})" - KERNEL_VERSION="$(echo ${KERNEL_IMAGE} | sed -e 's|vmlinux-||')" - INITRD="initrd.img-${KERNEL_VERSION}" - - Yaboot_live_entry "live-${KERNEL_VERSION}" "${KERNEL_IMAGE}" "${INITRD}" - Yaboot_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" - - VMLINUZ_GI="gtk/vmlinuz" - INITRD_GI="gtk/initrd.gz" - APPEND_GI="video=vesa:ywrap,mtrr vga=788" - - if [ -f "binary/${DESTDIR_INSTALL}/${VMLINUZ_DI}" ] && [ -f "binary/${DESTDIR_INSTALL}/${INITRD_DI}" ] - then - Yaboot_install_entry "Text" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}" - fi - - if [ -f "binary/${DESTDIR_INSTALL}/${VMLINUZ_GI}" ] && [ -f "binary/${DESTDIR_INSTALL}/${INITRD_GI}" ] - then - Yaboot_install_entry "GUI" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}" - fi -fi - -LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')" - -case "${LIVE_IMAGE_TYPE}" in - iso*|hdd*) - # Copying yaboot - mkdir -p binary/yaboot - - case "${LB_BUILD_WITH_CHROOT}" in - true) - cp chroot/usr/lib/yaboot/yaboot binary/yaboot - ;; - - false) - cp /usr/lib/yaboot/yaboot binary/yaboot - ;; - esac - - cp -r "${TEMPLATES}"/* binary/yaboot - - case "${LIVE_IMAGE_TYPE}" in - hdd*) - mv binary/yaboot/yaboot.conf binary/yaboot/yaboot.conf.tmp - echo "root=/dev/ram" > binary/yaboot/yaboot.conf - cat binary/yaboot/yaboot.conf.tmp >> binary/yaboot/yaboot.conf - rm -f binary/yaboot/yaboot.conf.tmp - ;; - esac - - # Configure yaboot templates - sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" binary/yaboot/yaboot.conf - sed -i -e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" -e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" binary/yaboot/yaboot.conf - sed -i -e "s|LB_DATE|$(date +%Y%m%d)|" -e "s|LB_VERSION|${VERSION}|" binary/yaboot/boot.msg - ;; -esac - -# Saving cache -Save_cache cache/packages.binary - -# Removing depends -Remove_package - -# Creating stage file -Create_stagefile .build/binary_yaboot diff --git a/scripts/build/config b/scripts/build/config index 9e2698779..cb2ed9eeb 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -32,7 +32,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\ \t [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\ \t [--bootappend-live-failsafe PARAMETER|\"PARAMETERS\"]\n\ -\t [--bootloader grub|syslinux|yaboot]\n\ +\t [--bootloader grub|syslinux]\n\ \t [--bootstrap cdebootstrap|cdebootstrap-static|debootstrap]\n\ \t [--cache true|false]\n\ \t [--cache-indices true|false]\n\ diff --git a/scripts/build/source_debian b/scripts/build/source_debian index 44c610f7e..ad733c6d0 100755 --- a/scripts/build/source_debian +++ b/scripts/build/source_debian @@ -85,10 +85,6 @@ EOF echo "${LB_MEMTEST}" >> source-selection.txt fi ;; - - powerpc) - echo "yaboot" >> source-selection.txt - ;; esac if [ -n "${LB_TASKS}" ] |