Commit 08f3df1d authored by intrigeri's avatar intrigeri

Build system: disable eatmydata usage and caching.

In current Stretch, debootstrap fails if we use eatmydata + the operation mode
picked by live-build when caching is enabled.
parent d27640f9
......@@ -205,7 +205,7 @@ trap "kill -9 $! 2>/dev/null" EXIT HUP INT QUIT TERM
echo "Building $LB_BINARY_IMAGES image ${BUILD_BASENAME}..."
set -o pipefail
[ -z "$JENKINS_URL" ] || date --utc '+%s' > "$BUILD_START_FILENAME"
time eatmydata lb build noauto ${@}
time lb build noauto ${@}
RET=$?
if [ -e "${BUILD_FILENAME}.${BUILD_FILENAME_EXT}" ]; then
echo "Image was successfully created"
......
......@@ -14,8 +14,6 @@ if [ -e config/amnesia.local ] ; then
. config/amnesia.local
fi
export LB_BOOTSTRAP_INCLUDE='eatmydata'
# sanity checks
if grep -qs -E '^Pin:\s+release\s+.*a=' config/chroot_apt/preferences ; then
echo "Found unsupported a= syntax in config/chroot_apt/preferences,"
......@@ -65,6 +63,10 @@ $RUN_LB_CONFIG \
--backports false \
--binary-images iso \
--binary-indices false \
--cache false \
--cache-indices false \
--cache-packages false \
--cache-stages false \
--checksums none \
--bootappend-live "${AMNESIA_APPEND}" \
--bootstrap debootstrap \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment