Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Import bash-4.4.18-1ubuntu1osrf1 to fix qemu support." #24

Merged
merged 1 commit into from
Apr 9, 2018
Merged

Revert "Import bash-4.4.18-1ubuntu1osrf1 to fix qemu support." #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Revert "Import bash-4.4.18-1ubuntu1osrf1 to fix qemu support."
  • Loading branch information
@nuclearsandwich
nuclearsandwich committed Apr 6, 2018
commit c4fbb993b234322abf79092e1697bb247403a518
18 changes: 1 addition & 17 deletions build-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,23 +68,7 @@ if [[ ${foreign_arches[*]} =~ $arch ]]; then
elif [ $arch == 'arm64' ]; then
cp qemu-aarch64-static $chroot_dir/usr/bin/
fi
# Use a modified bash in arm bionic
# Workaround for https://github.com/osrf/multiarch-docker-image-generation/issues/18
# This is very hairy because bash's config scripts are all in bash and
# dpkg doesn't seem able to override the exist status of a prerm script.
if [ $suite == 'bionic' -a \( $arch == 'arm64' -o $arch == 'armhf' \) ]; then
_bash_pkg="bash_4.4.18-1ubuntu1osrf1_${arch}.deb"
if [ ! -e $_bash_pkg ]; then
wget "https://github.com/osrf/multiarch-docker-image-generation/releases/download/bash-4.4.18-1ubuntu1osrf1/$_bash_pkg"
fi
cp $_bash_pkg $chroot_dir/tmp/$_bash_pkg
echo $(LC_ALL=C LANGUAGE=C LANG=C chroot $chroot_dir /debootstrap/debootstrap --second-stage || true)
LC_ALL=C LANGUAGE=C LANG=C chroot $chroot_dir rm /var/lib/dpkg/info/bash.prerm
LC_ALL=C LANGUAGE=C LANG=C chroot $chroot_dir dpkg --purge --force-all bash
LC_ALL=C LANGUAGE=C LANG=C chroot $chroot_dir dpkg -i /tmp/$_bash_pkg
else
LC_ALL=C LANGUAGE=C LANG=C chroot $chroot_dir /debootstrap/debootstrap --second-stage
fi
LC_ALL=C LANGUAGE=C LANG=C chroot $chroot_dir /debootstrap/debootstrap --second-stage
LC_ALL=C LANGUAGE=C LANG=C chroot $chroot_dir dpkg --configure -a
fi
if [ $os == 'ubuntu' ]; then
Expand Down