Skip to content

Update the ubuntu version for x86_64-unknown-linux-gnu #481

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

Closed
wants to merge 2 commits into from
Closed

Update the ubuntu version for x86_64-unknown-linux-gnu #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f892ea0
Updated the ubuntu version for x86_64-unknown-linux-gnu.
mathiaspeters-sig Nov 5, 2020
475225a
Updated config for x86_64 to make it work with focal fossa.
mathiaspeters-sig Nov 5, 2020
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
2 changes: 1 addition & 1 deletion docker/Dockerfile.x86_64-unknown-linux-gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM ubuntu:20.04

COPY common.sh /
RUN /common.sh
Expand Down
7 changes: 6 additions & 1 deletion docker/linux-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,12 @@ main() {
;;
x86_64)
arch=amd64
kernel="${kversion}-amd64"
#kernel="${kversion}-amd64"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While building an image with ubuntu 20.04 it fails to find some packages. Adding this allows it to find them, and the kernel bump was necessary for the image to build locally. Also, as far as I can see there is only one docker image using amd64 that is using this script so these changes will have no effect on other images

kernel="5.4.0-52-generic"
debsource="deb http://no.archive.ubuntu.com/ubuntu/ focal main restricted"
debsource="${debsource}\ndeb http://no.archive.ubuntu.com/ubuntu/ focal-updates main restricted"
debsource="${debsource}\ndeb http://no.archive.ubuntu.com/ubuntu/ focal universe"
debsource="${debsource}\ndeb http://no.archive.ubuntu.com/ubuntu/ focal-updates universe"
;;
*)
echo "Invalid arch: ${arch}"
Expand Down