abc3e45727
* build.sh: Support comments in package files This patch allows the use of hash comments inside patch files. It's a little ugly, but it strips comments and collapses all whitespace down to single space characters between package names. It handles comments anywhere in a line, as well. Was unsure if \ continuation of the long sed line or the inclusion of a couple of lines of comments explaining what the sed expressions are doing would be appreciated, so didn't include them in this patch. * build.sh: whitespace fix * build.sh: Use sed script for packages files Broke the sed expressions out of build.sh and put them their own documented sed script. This greatly improves readability and avoids build.sh getting messier. Broke the substitution command into two separate subs. The first just deletes comments, and the second collapses all whitespace into a single space. This too is easier to read, and catches a couple of edge cases that would result it not all whitespace being collapsed. The result may still have (one) leading and/or trailing space, which is acceptable.
182 lines
4.1 KiB
Bash
Executable file
182 lines
4.1 KiB
Bash
Executable file
#!/bin/bash -e
|
|
|
|
run_sub_stage()
|
|
{
|
|
log "Begin ${SUB_STAGE_DIR}"
|
|
pushd ${SUB_STAGE_DIR} > /dev/null
|
|
for i in {00..99}; do
|
|
if [ -f ${i}-debconf ]; then
|
|
log "Begin ${SUB_STAGE_DIR}/${i}-debconf"
|
|
on_chroot sh -e - << EOF
|
|
debconf-set-selections <<SELEOF
|
|
`cat ${i}-debconf`
|
|
SELEOF
|
|
EOF
|
|
log "End ${SUB_STAGE_DIR}/${i}-debconf"
|
|
fi
|
|
if [ -f ${i}-packages-nr ]; then
|
|
log "Begin ${SUB_STAGE_DIR}/${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
|
|
on_chroot sh -e - << EOF
|
|
apt-get install --no-install-recommends -y $PACKAGES
|
|
EOF
|
|
fi
|
|
log "End ${SUB_STAGE_DIR}/${i}-packages-nr"
|
|
fi
|
|
if [ -f ${i}-packages ]; then
|
|
log "Begin ${SUB_STAGE_DIR}/${i}-packages"
|
|
PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < ${i}-packages)"
|
|
if [ -n "$PACKAGES" ]; then
|
|
on_chroot sh -e - << EOF
|
|
apt-get install -y $PACKAGES
|
|
EOF
|
|
fi
|
|
log "End ${SUB_STAGE_DIR}/${i}-packages"
|
|
fi
|
|
if [ -d ${i}-patches ]; then
|
|
log "Begin ${SUB_STAGE_DIR}/${i}-patches"
|
|
pushd ${STAGE_WORK_DIR} > /dev/null
|
|
if [ "${CLEAN}" = "1" ]; then
|
|
rm -rf .pc
|
|
rm -rf *-pc
|
|
fi
|
|
QUILT_PATCHES=${SUB_STAGE_DIR}/${i}-patches
|
|
SUB_STAGE_QUILT_PATCH_DIR="$(basename $SUB_STAGE_DIR)-pc"
|
|
mkdir -p $SUB_STAGE_QUILT_PATCH_DIR
|
|
ln -snf $SUB_STAGE_QUILT_PATCH_DIR .pc
|
|
if [ -e ${SUB_STAGE_DIR}/${i}-patches/EDIT ]; then
|
|
echo "Dropping into bash to edit patches..."
|
|
bash
|
|
fi
|
|
quilt upgrade
|
|
RC=0
|
|
quilt push -a || RC=$?
|
|
case "$RC" in
|
|
0|2)
|
|
;;
|
|
*)
|
|
false
|
|
;;
|
|
esac
|
|
popd > /dev/null
|
|
log "End ${SUB_STAGE_DIR}/${i}-patches"
|
|
fi
|
|
if [ -x ${i}-run.sh ]; then
|
|
log "Begin ${SUB_STAGE_DIR}/${i}-run.sh"
|
|
./${i}-run.sh
|
|
log "End ${SUB_STAGE_DIR}/${i}-run.sh"
|
|
fi
|
|
if [ -f ${i}-run-chroot ]; then
|
|
log "Begin ${SUB_STAGE_DIR}/${i}-run-chroot"
|
|
on_chroot sh -e - < ${i}-run-chroot
|
|
log "End ${SUB_STAGE_DIR}/${i}-run-chroot"
|
|
fi
|
|
done
|
|
popd > /dev/null
|
|
log "End ${SUB_STAGE_DIR}"
|
|
}
|
|
|
|
|
|
run_stage(){
|
|
log "Begin ${STAGE_DIR}"
|
|
STAGE=$(basename ${STAGE_DIR})
|
|
pushd ${STAGE_DIR} > /dev/null
|
|
unmount ${WORK_DIR}/${STAGE}
|
|
STAGE_WORK_DIR=${WORK_DIR}/${STAGE}
|
|
ROOTFS_DIR=${STAGE_WORK_DIR}/rootfs
|
|
if [ -f ${STAGE_DIR}/EXPORT_IMAGE ]; then
|
|
EXPORT_DIRS="${EXPORT_DIRS} ${STAGE_DIR}"
|
|
fi
|
|
if [ ! -f SKIP ]; then
|
|
if [ "${CLEAN}" = "1" ]; then
|
|
if [ -d ${ROOTFS_DIR} ]; then
|
|
rm -rf ${ROOTFS_DIR}
|
|
fi
|
|
fi
|
|
if [ -x prerun.sh ]; then
|
|
log "Begin ${STAGE_DIR}/prerun.sh"
|
|
./prerun.sh
|
|
log "End ${STAGE_DIR}/prerun.sh"
|
|
fi
|
|
for SUB_STAGE_DIR in ${STAGE_DIR}/*; do
|
|
if [ -d ${SUB_STAGE_DIR} ] &&
|
|
[ ! -f ${SUB_STAGE_DIR}/SKIP ]; then
|
|
run_sub_stage
|
|
fi
|
|
done
|
|
fi
|
|
unmount ${WORK_DIR}/${STAGE}
|
|
PREV_STAGE=${STAGE}
|
|
PREV_STAGE_DIR=${STAGE_DIR}
|
|
PREV_ROOTFS_DIR=${ROOTFS_DIR}
|
|
popd > /dev/null
|
|
log "End ${STAGE_DIR}"
|
|
}
|
|
|
|
if [ "$(id -u)" != "0" ]; then
|
|
echo "Please run as root" 1>&2
|
|
exit 1
|
|
fi
|
|
|
|
if [ -f config ]; then
|
|
source config
|
|
fi
|
|
|
|
if [ -z "${IMG_NAME}" ]; then
|
|
echo "IMG_NAME not set" 1>&2
|
|
exit 1
|
|
fi
|
|
|
|
export IMG_DATE=${IMG_DATE:-"$(date -u +%Y-%m-%d)"}
|
|
|
|
export BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
export SCRIPT_DIR="${BASE_DIR}/scripts"
|
|
export WORK_DIR="${BASE_DIR}/work/${IMG_DATE}-${IMG_NAME}"
|
|
export DEPLOY_DIR="${BASE_DIR}/deploy"
|
|
export LOG_FILE="${WORK_DIR}/build.log"
|
|
|
|
export CLEAN
|
|
export IMG_NAME
|
|
export APT_PROXY
|
|
|
|
export STAGE
|
|
export STAGE_DIR
|
|
export STAGE_WORK_DIR
|
|
export PREV_STAGE
|
|
export PREV_STAGE_DIR
|
|
export ROOTFS_DIR
|
|
export PREV_ROOTFS_DIR
|
|
export IMG_SUFFIX
|
|
export EXPORT_DIR
|
|
export EXPORT_ROOTFS_DIR
|
|
|
|
export QUILT_PATCHES
|
|
export QUILT_NO_DIFF_INDEX=1
|
|
export QUILT_NO_DIFF_TIMESTAMPS=1
|
|
export QUILT_REFRESH_ARGS="-p ab"
|
|
|
|
source ${SCRIPT_DIR}/common
|
|
|
|
mkdir -p ${WORK_DIR}
|
|
log "Begin ${BASE_DIR}"
|
|
|
|
for STAGE_DIR in ${BASE_DIR}/stage*; do
|
|
run_stage
|
|
done
|
|
|
|
CLEAN=1
|
|
for EXPORT_DIR in ${EXPORT_DIRS}; do
|
|
STAGE_DIR=${BASE_DIR}/export-image
|
|
IMG_SUFFIX=$(cat ${EXPORT_DIR}/EXPORT_IMAGE)
|
|
EXPORT_ROOTFS_DIR=${WORK_DIR}/$(basename ${EXPORT_DIR})/rootfs
|
|
run_stage
|
|
if [ -e ${EXPORT_DIR}/EXPORT_NOOBS ]; then
|
|
STAGE_DIR=${BASE_DIR}/export-noobs
|
|
run_stage
|
|
fi
|
|
done
|
|
|
|
log "End ${BASE_DIR}"
|