Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-20 13:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use eatmydata only with the dpkg command

Browse Source 
Eatmydata wrapping the build as well could break tests.

Thanks: Julian Andres Klode for suggesting this solution
This commit is contained in:
Balint Reczey 2021-03-26 13:20:38 +01:00
parent 728849964e
commit a5ee35c812
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mk-sbuild
View File

@ -681,6 +681,13 @@ sudo mkdir -p -m 0700 "$MNT"/root/.gnupg
# debootstrap the chroot # debootstrap the chroot
sudo ${proxy:+"http_proxy=${proxy}"} "$DEBOOTSTRAP_COMMAND" --arch="$CHROOT_ARCH" $variant_opt $debootstrap_opts "$RELEASE" "$MNT" "${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu}" sudo ${proxy:+"http_proxy=${proxy}"} "$DEBOOTSTRAP_COMMAND" --arch="$CHROOT_ARCH" $variant_opt $debootstrap_opts "$RELEASE" "$MNT" "${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu}"
if [ $EATMYDATA -eq 1 ]; then
sudo mkdir -p "${MNT}/usr/local/libexec/mk-sbuild"
sudo ln -s /usr/bin/eatmydata "${MNT}/usr/local/libexec/mk-sbuild/dpkg"
echo 'Dir::Bin::dpkg "/usr/local/libexec/mk-sbuild/dpkg";' \
| sudo tee "${MNT}/etc/apt/apt.conf.d/00mk-sbuild-eatmydata" > /dev/null
fi
# Update the package sources # Update the package sources
TEMP_SOURCES=`mktemp -t sources-XXXXXX` TEMP_SOURCES=`mktemp -t sources-XXXXXX`
if [ -z "$TEMPLATE_SOURCES" ]; then if [ -z "$TEMPLATE_SOURCES" ]; then
@ -778,11 +785,6 @@ root-groups=$ADMIN_GROUPS
type=SCHROOT_TYPE type=SCHROOT_TYPE
profile=$SCHROOT_PROFILE profile=$SCHROOT_PROFILE
EOM EOM
if [ $EATMYDATA -eq 1 ]; then
cat >> "$TEMP_SCHROOTCONF" <<EOM
command-prefix=eatmydata
EOM
fi
case "$SCHROOT_TYPE" in case "$SCHROOT_TYPE" in
"lvm-snapshot") "lvm-snapshot")
cat >> "$TEMP_SCHROOTCONF" <<EOM cat >> "$TEMP_SCHROOTCONF" <<EOM