Dropping chroot_live-packages by moving logic outside of live-build into the config directory.
This commit is contained in:
Daniel Baumann
parent
19cc16df3f
commit
42fb1e1976
|
|
@ -67,7 +67,6 @@ do
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
lb chroot_live-packages ${@}
|
|
||||||
lb chroot-includes ${@}
|
lb chroot-includes ${@}
|
||||||
lb chroot-hooks ${@}
|
lb chroot-hooks ${@}
|
||||||
lb chroot_hacks ${@}
|
lb chroot_hacks ${@}
|
||||||
|
|
|
||||||
|
|
@ -1,87 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
## live-build(7) - System Build Scripts
|
|
||||||
## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
|
|
||||||
##
|
|
||||||
## 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 '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 .build/config .build/bootstrap
|
|
||||||
|
|
||||||
# Checking stage file
|
|
||||||
Check_stagefile .build/chroot_live-packages
|
|
||||||
|
|
||||||
# Checking lock file
|
|
||||||
Check_lockfile .lock
|
|
||||||
|
|
||||||
# Creating lock file
|
|
||||||
Create_lockfile .lock
|
|
||||||
|
|
||||||
# Queue installation of live-boot
|
|
||||||
if [ -n "${LB_INITRAMFS}" ] && [ "${LB_INITRAMFS}" != "none" ]
|
|
||||||
then
|
|
||||||
_PACKAGES="${LB_INITRAMFS}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Queue installation of live-config
|
|
||||||
if [ -n "${LB_INITSYSTEM}" ] && [ "${LB_INITSYSTEM}" != "none" ]
|
|
||||||
then
|
|
||||||
_PACKAGES="${_PACKAGES} live-config live-config-${LB_INITSYSTEM}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Do initsystem specific hacks
|
|
||||||
case "${LB_INITSYSTEM}" in
|
|
||||||
systemd)
|
|
||||||
_PACKAGES="${_PACKAGES} systemd-sysv"
|
|
||||||
|
|
||||||
if [ -e chroot/var/lib/dpkg/info/sysvinit.list ]
|
|
||||||
then
|
|
||||||
Chroot chroot "dpkg --force-remove-essential --purge sysvinit"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
sysvinit)
|
|
||||||
_PACKAGES="${_PACKAGES} sysvinit"
|
|
||||||
|
|
||||||
if [ -e chroot/var/lib/dpkg/info/systemd-sysv.list ]
|
|
||||||
then
|
|
||||||
Chroot chroot "dpkg --force-remove-essential --purge systemd systemd-sysv"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# 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 .build/chroot_live-packages
|
|
||||||
fi
|
|
||||||
|
|
@ -1475,5 +1475,17 @@ do
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
case "${LB_SYSTEM}" in
|
||||||
|
live)
|
||||||
|
for _PACKAGE in live-boot live-config live-config-sysvinit
|
||||||
|
do
|
||||||
|
if ! grep -qs "${_PACKAGE}" config/package-lists/*
|
||||||
|
then
|
||||||
|
echo "${_PACKAGE}" >> config/package-lists/live.list.chroot
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
# Creating stage file
|
# Creating stage file
|
||||||
Create_stagefile .build/config
|
Create_stagefile .build/config
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue