Skip to content

Commit

Permalink
spread: drop cross-build from ubuntu task (#3435)
Browse files Browse the repository at this point in the history
We're only cross-building in `sbuild`.
  • Loading branch information
AlanGriffiths authored Jun 28, 2024
2 parents a994779 + 23222bd commit 5523bf4
Showing 1 changed file with 0 additions and 34 deletions.
34 changes: 0 additions & 34 deletions spread/build/ubuntu/task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,40 +26,6 @@ execute: |
dpkg-dev \
$( $NODBG || echo wlcs-dbgsym )
# set host and build environment up
source <( dpkg-architecture --print-set --host-arch ${ARCH} )
# if cross-building
if [ "${DEB_BUILD_ARCH}" != "${DEB_HOST_ARCH}" ]; then
# add host architecture
dpkg --add-architecture "${DEB_HOST_ARCH}"
# don't run tests
DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS} nocheck"
# limit existing apt sources to build architecture
sed -i "s/^deb \(\[arch=.*\] \)\?/deb [arch=${DEB_BUILD_ARCH}] /" \
/etc/apt/sources.list
case "${DEB_HOST_ARCH}" in
amd64|i386)
ARCHIVE_URL="http://archive.ubuntu.com/ubuntu"
;;
*)
ARCHIVE_URL="http://ports.ubuntu.com/ubuntu-ports"
;;
esac
# add host architecture apt sources
printf "deb [arch=${DEB_HOST_ARCH}] ${ARCHIVE_URL} \
%s main multiverse universe restricted\n" \
$(lsb_release -sc){,-security,-updates} \
> /etc/apt/sources.list.d/cross-${DEB_HOST_ARCH}.list
apt-get update
apt-get --yes install qemu-user-static binfmt-support
fi
# Mark the "release" in the changelog
debchange --release "CI release"
Expand Down

0 comments on commit 5523bf4

Please sign in to comment.