Dependency checks + important bugfix (#16)

This commit is contained in:
Joseph Carter 2016-09-14 03:07:52 -07:00 committed by XECDesign
parent 8605ca74b2
commit 0245cbb958
4 changed files with 40 additions and 2 deletions

View file

@ -5,7 +5,7 @@
#Dependencies #Dependencies
`quilt kpartx realpath qemu-user-static debootstrap zerofree pxz` `quilt kpartx realpath qemu-user-static debootstrap zerofree pxz zip`
#Config #Config

View file

@ -17,7 +17,6 @@ EOF
if [ -f ${i}-packages-nr ]; then if [ -f ${i}-packages-nr ]; then
log "Begin ${SUB_STAGE_DIR}/${i}-packages-nr" log "Begin ${SUB_STAGE_DIR}/${i}-packages-nr"
PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < ${i}-packages-nr)" PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < ${i}-packages-nr)"
PACKAGES="$(sed -e "$sed_expr_packages" < ${i}-packages-nr)"
if [ -n "$PACKAGES" ]; then if [ -n "$PACKAGES" ]; then
on_chroot sh -e - << EOF on_chroot sh -e - << EOF
apt-get install --no-install-recommends -y $PACKAGES apt-get install --no-install-recommends -y $PACKAGES
@ -158,6 +157,10 @@ export QUILT_NO_DIFF_TIMESTAMPS=1
export QUILT_REFRESH_ARGS="-p ab" export QUILT_REFRESH_ARGS="-p ab"
source ${SCRIPT_DIR}/common source ${SCRIPT_DIR}/common
source ${SCRIPT_DIR}/dependencies_check
dependencies_check ${BASE_DIR}/depends
mkdir -p ${WORK_DIR} mkdir -p ${WORK_DIR}
log "Begin ${BASE_DIR}" log "Begin ${BASE_DIR}"

5
depends Normal file
View file

@ -0,0 +1,5 @@
quilt
qemu-arm-static:qemu-user-static
debootstrap
kpartx zerofree
pxz zip

View file

@ -0,0 +1,30 @@
# dependencies_check
# $@ Dependnecy files to check
#
# Each dependency is in the form of a tool to test for, optionally followed by
# a : and the name of a package if the package on a Debian-ish system is not
# named for the tool (i.e., qemu-user-static).
dependencies_check()
{
local depfile deps missing
for depfile in "$@"; do
if [[ -e "$depfile" ]]; then
deps="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < ${BASE_DIR}/depends"
fi
for dep in $deps; do
if ! hash ${dep%:*} 2>/dev/null; then
missing="${missing:+$missing }${dep#*:}"
fi
done
done
if [[ "$missing" ]]; then
echo "Reqired dependencies not installed"
echo
echo "This can be resolved on Debian/Raspbian systems by installing:"
echo "$missing"
false
fi
}