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

Moving installation of live packages to second pass.

This commit is contained in:
Daniel Baumann 2011-06-11 19:36:46 +02:00
parent 48e2af1ab9
commit df7b3d934f
3 changed files with 87 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/build/lb_chroot
View File

@ -70,6 +70,7 @@ do
fi
done
lb chroot_live-packages ${*}
lb chroot_local-includes ${*}
lb chroot_local-patches ${*}
lb chroot_local-hooks ${*}

33
scripts/build/lb_chroot_linux-image
View File

@ -52,34 +52,7 @@ then
echo ${PACKAGE}-${FLAVOUR} >> chroot/root/chroot_packages
done
done
# Creating stage file
Create_stagefile .stage/chroot_linux-image
fi
# Queue installation of linux-image and ${LB_INITRAMFS}
if [ "${LB_INITRAMFS}" != "none" ]
then
echo ${LB_INITRAMFS} >> chroot/root/chroot_packages
fi
# Queue installation of live-config
if [ "${LB_INITSYSTEM}" != "none" ]
then
echo "live-config live-config-${LB_INITSYSTEM}" >> chroot/root/chroot_packages
fi
# Do initsystem specific hacks
if [ "${LB_INITSYSTEM}" != "sysvinit" ]
then
# lets see if we still need the squeeze's "pre init system policy discussion" hack:
IS_SYSVINIT_ESSENTIAL="$(Chroot chroot dpkg-query --show --showformat='${Essential}\n' sysvinit)"
RC="$?"
if [ "${IS_SYSVINIT_ESSENTIAL}" != "no" ] && [ "${RC}" = "0" ]
then
# sysvinit is both installed and essential, ugly hack to remove it
Chroot chroot dpkg --force-remove-essential --remove sysvinit || true
fi
fi
# Creating stage file
Create_stagefile .stage/chroot_linux-image

83
scripts/build/lb_chroot_live-packages Executable file
View File

@ -0,0 +1,83 @@
#!/bin/sh
## live-build(7) - System Build Scripts
## Copyright (C) 2006-2011 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
. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'schedule live packages for installation')"
HELP=""
USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Requiring stage file
Require_stagefile .stage/config .stage/bootstrap
# Checking stage file
Check_stagefile .stage/chroot_live-packages
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
_PACKAGES=""
# Queue installation of linux-image and ${LB_INITRAMFS}
if [ "${LB_INITRAMFS}" != "none" ]
then
_PACKAGES="${LB_INITRAMFS}"
fi
# Queue installation of live-config
if [ "${LB_INITSYSTEM}" != "none" ]
then
_PACKAGES="${_PACKAGES} live-config live-config-${LB_INITSYSTEM}"
fi
# Do initsystem specific hacks
if [ "${LB_INITSYSTEM}" != "sysvinit" ]
then
# lets see if we still need the squeeze's "pre init system policy discussion" hack:
IS_SYSVINIT_ESSENTIAL="$(Chroot chroot dpkg-query --show --showformat='${Essential}\n' sysvinit)"
RC="$?"
if [ "${IS_SYSVINIT_ESSENTIAL}" != "no" ] && [ "${RC}" = "0" ]
then
# sysvinit is both installed and essential, ugly hack to remove it
Chroot chroot dpkg --force-remove-essential --remove sysvinit || true
fi
fi
# Install live packages
if [ -n "${_PACKAGES}" ]
then
case "${LB_APT}" in
apt|apt-get)
Chroot chroot "apt-get ${APT_OPTIONS} install ${_PACKAGES}"
;;
aptitude)
Chroot chroot "aptitude ${APTITUDE_OPTIONS} install ${_PACKAGES}"
;;
esac
# Creating stage file
Create_stagefile .stage/chroot_live-packages
fi