diff options
author | Janne Grunau <janne-vlc@jannau.net> | 2020-02-11 21:29:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-11 12:29:36 -0800 |
commit | e37ccaa85fb54553479e4928b551bd970cb23c68 (patch) | |
tree | 5e1c62fd7e6e35658155fa08444107146ce72e70 /projects/dav1d | |
parent | 0ed0f37ca23cf1c15503879e7b4b18aa1ce93fda (diff) | |
download | oss-fuzz-e37ccaa85fb54553479e4928b551bd970cb23c68.tar.gz |
dav1d: use nasm from ubuntu eoan since dav1d needs nasm-2.14 (#3375)
Diffstat (limited to 'projects/dav1d')
-rw-r--r-- | projects/dav1d/Dockerfile | 2 | ||||
-rw-r--r-- | projects/dav1d/bionic.list | 2 | ||||
-rw-r--r-- | projects/dav1d/nasm.list | 2 | ||||
-rw-r--r-- | projects/dav1d/nasm_apt.pin | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/projects/dav1d/Dockerfile b/projects/dav1d/Dockerfile index 61340ad67..9ce8fe7dc 100644 --- a/projects/dav1d/Dockerfile +++ b/projects/dav1d/Dockerfile @@ -17,7 +17,7 @@ FROM gcr.io/oss-fuzz-base/base-builder MAINTAINER janne-vlc@jannau.net -ADD bionic.list /etc/apt/sources.list.d/bionic.list +ADD nasm.list /etc/apt/sources.list.d/nasm.list ADD nasm_apt.pin /etc/apt/preferences RUN dpkg --add-architecture i386 && \ diff --git a/projects/dav1d/bionic.list b/projects/dav1d/bionic.list deleted file mode 100644 index 8621803a7..000000000 --- a/projects/dav1d/bionic.list +++ /dev/null @@ -1,2 +0,0 @@ -# use nasm 2.13.02 from bionic -deb http://archive.ubuntu.com/ubuntu/ bionic universe diff --git a/projects/dav1d/nasm.list b/projects/dav1d/nasm.list new file mode 100644 index 000000000..337a89ec8 --- /dev/null +++ b/projects/dav1d/nasm.list @@ -0,0 +1,2 @@ +# use nasm from a newer ubuntu release +deb http://archive.ubuntu.com/ubuntu/ eoan universe diff --git a/projects/dav1d/nasm_apt.pin b/projects/dav1d/nasm_apt.pin index 69099026b..3c5ca7969 100644 --- a/projects/dav1d/nasm_apt.pin +++ b/projects/dav1d/nasm_apt.pin @@ -1,7 +1,7 @@ Package: * -Pin: release n=bionic +Pin: release n=eoan Pin-Priority: 1 Package: nasm -Pin: release n=bionic +Pin: release n=eoan Pin-Priority: 555 |