manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dropping theme package support, themes are either in the config tree or the embedded one from live-build is used.

This commit is contained in:
Daniel Baumann 2013-02-08 23:11:15 +01:00 committed by Daniel Baumann
parent 0290d0be6b
commit 516cf8299f
3 changed files with 31 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
functions/defaults.sh
View File

@ -1126,21 +1126,6 @@ Set_defaults ()
# Setting net tarball
LB_NET_TARBALL="${LB_NET_TARBALL:-true}"
# Setting syslinux theme package
case "${LB_MODE}" in
progress-linux)
LB_SYSLINUX_THEME="${LB_SYSLINUX_THEME:-progress-standard}"
;;
ubuntu)
LB_SYSLINUX_THEME="${LB_SYSLINUX_THEME:-ubuntu-oneiric}"
;;
*)
LB_SYSLINUX_THEME="${LB_SYSLINUX_THEME:-live-build}"
;;
esac
# Setting firmware option
case "${LB_MODE}" in
ubuntu)

106
scripts/build/binary_syslinux
View File

@ -83,27 +83,30 @@ case "${LIVE_IMAGE_TYPE}" in
;;
esac
if [ -e "config/bootloaders/${_BOOTLOADER}" ]
then
# Internal local copy
_SOURCE="config/bootloaders/${_BOOTLOADER}"
else
# Internal system copy
if [ -n "${LIVE_BUILD}" ]
then
_SOURCE="${LIVE_BUILD}/share/bootloaders/${_BOOTLOADER}"
else
_SOURCE="/usr/share/live/build/bootloaders/${_BOOTLOADER}"
fi
fi
# Checking depends
case "${LB_BUILD_WITH_CHROOT}" in
true)
Check_package chroot/usr/bin/syslinux syslinux
Check_package chroot/usr/lib/syslinux syslinux-common
case "${LB_SYSLINUX_THEME}" in
live-build)
Check_package chroot/usr/bin/rsvg librsvg2-bin
;;
*)
Check_package chroot/usr/share/syslinux/themes/${LB_SYSLINUX_THEME} syslinux-themes-${LB_SYSLINUX_THEME}
case "${LB_MODE}" in
ubuntu)
Check_package chroot/usr/share/gfxboot-theme-ubuntu/bootlogo.tar.gz gfxboot-theme-ubuntu
;;
esac
;;
esac
if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1
then
Check_package chroot/usr/bin/rsvg librsvg2-bin
fi
;;
false)
@ -121,25 +124,15 @@ case "${LB_BUILD_WITH_CHROOT}" in
exit 1
fi
case "${LB_SYSLINUX_THEME}" in
live-build)
if [ ! -e /usr/bin/rsvg ]
then
# librsvg2-bin
Echo_error "/usr/bin/rsvg - no such file"
exit 1
fi
;;
*)
if [ ! -e /usr/share/syslinux/themes/${LB_SYSLINUX_THEME} ]
then
# syslinux-theme
Echo_error "/usr/share/syslinux/themes/${LB_SYSLINUX_THEME} - no such directory."
exit 1
fi
;;
esac
if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1
then
if [ ! -e /usr/bin/rsvg ]
then
# librsvg2-bin
Echo_error "/usr/bin/rsvg - no such file"
exit 1
fi
fi
;;
esac
@ -149,48 +142,15 @@ Restore_cache cache/packages.binary
# Installing depends
Install_package
# FIXME: cleanup, unify, and extend themes for ${_BOOTLOADER}-live and ${_BOOTLOADER}-installer
if [ "${LB_SYSLINUX_THEME}" = "live-build" ]
then
if [ -e "config/bootloaders/${_BOOTLOADER}" ]
then
# Internal local copy
_SOURCE="config/bootloaders/${_BOOTLOADER}"
else
# Internal system copy
if [ -n "${LIVE_BUILD}" ]
then
_SOURCE="${LIVE_BUILD}/share/bootloaders/${_BOOTLOADER}"
else
_SOURCE="/usr/share/live/build/bootloaders/${_BOOTLOADER}"
fi
fi
else
# External copy from chroot or system
_SOURCE="/usr/share/syslinux/themes/${LB_SYSLINUX_THEME}/${_BOOTLOADER}-live"
fi
# Copying files
case "${LB_BUILD_WITH_CHROOT}" in
true)
mkdir -p $(dirname ${_TARGET})
# Copy in two steps since the theme can have absolute symlinks and would therefore not be dereferenced correctly
if [ "${LB_SYSLINUX_THEME}" = "live-build" ]
then
cp -a ${_SOURCE} chroot/root
Chroot chroot cp -aL /root/$(basename ${_SOURCE}) /root/$(basename ${_SOURCE}).tmp || true
rm -rf chroot/$(basename ${_SOURCE})
else
Chroot chroot cp -aL ${_SOURCE} /root/$(basename ${_SOURCE}).tmp || true
fi
case "${LB_MODE}" in
ubuntu)
Chroot chroot "tar xfz /usr/share/gfxboot-theme-ubuntu/bootlogo.tar.gz -C /root/$(basename ${_SOURCE}).tmp"
;;
esac
cp -a ${_SOURCE} chroot/root
Chroot chroot cp -aL /root/$(basename ${_SOURCE}) /root/$(basename ${_SOURCE}).tmp || true
rm -rf chroot/$(basename ${_SOURCE})
mv chroot/root/$(basename ${_SOURCE}).tmp ${_TARGET}
;;
@ -198,12 +158,6 @@ case "${LB_BUILD_WITH_CHROOT}" in
mkdir -p ${_TARGET}
cp -aL ${_SOURCE}/* ${_TARGET} || true
case "${LB_MODE}" in
ubuntu)
tar xfz /usr/share/gfxboot-theme-ubuntu/bootlogo.tar.gz -C ${_TARGET}
;;
esac
;;
esac

12
scripts/build/config
View File

@ -125,7 +125,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--firmware-chroot true|false]\n\
\t [--swap-file-path PATH]\n\
\t [--swap-file-size MB]\n\
\t [--syslinux-theme THEME_SUFFIX]\n\
\t [--tasksel apt|aptitude|tasksel]\n\
\t [--templates PATH]\n\
\t [--updates true|false]\n\
@ -158,7 +157,7 @@ Local_arguments ()
grub-splash:,isohybrid-options:,hdd-label:,hdd-size:,iso-application:,iso-preparer:,iso-publisher:,
iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:,
net-root-path:,net-root-server:,net-cow-filesystem:,net-cow-mountoptions:,net-cow-path:,
net-cow-server:,net-tarball:,firmware-binary:,firmware-chroot:,swap-file-path:,swap-file-size:,syslinux-theme:,
net-cow-server:,net-tarball:,firmware-binary:,firmware-chroot:,swap-file-path:,swap-file-size:,
loadlin:,win32-loader:,source:,source-images:,breakpoints,conffile:,debug,force,
help,ignore-system-defaults,quiet,usage,verbose,version,bootstrap-qemu-static:,bootstrap-qemu-arch:,
bootstrap-qemu-exclude:"
@ -757,11 +756,6 @@ Local_arguments ()
shift 2
;;
--syslinux-theme)
LB_SYSLINUX_THEME="${2}"
shift 2
;;
--loadlin)
LB_LOADLIN="${2}"
shift 2
@ -1444,10 +1438,6 @@ LB_SWAP_FILE_PATH="${LB_SWAP_FILE_PATH}"
# \$LB_SWAP_FILE_SIZE: set swap file size
# (Default: ${LB_SWAP_FILE_SIZE})
LB_SWAP_FILE_SIZE="${LB_SWAP_FILE_SIZE}"
# \$LB_SYSLINUX_THEME: set syslinux theme package
# (Default: ${LB_SYSLINUX_THEME})
LB_SYSLINUX_THEME="${LB_SYSLINUX_THEME}"
EOF
# Creating lb_source_* configuration