From 189b8a2e9b15a05f8fbc9601825aea9f7adf9005 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Mon, 3 Aug 2020 15:22:16 -0600 Subject: [PATCH] linux-frozen: re-freezing dependencies to Ubuntu 20.04 --- linux-frozen/Dockerfile | 26 +++++++++++++------------- linux-frozen/install_package.py | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/linux-frozen/Dockerfile b/linux-frozen/Dockerfile index 9a2b0f9..043beaf 100644 --- a/linux-frozen/Dockerfile +++ b/linux-frozen/Dockerfile @@ -3,17 +3,17 @@ LABEL maintainer="citraemu" ENV DEBIAN_FRONTEND=noninteractive RUN mkdir -p /tmp/pkgs COPY install_package.py /tmp/pkgs -RUN apt-get update && apt-get install -y p7zip-full build-essential wget git python-launchpadlib ccache ninja-build -RUN cd /tmp/pkgs && python2 install_package.py \ - libsdl2-dev 2.0.7+dfsg1-3ubuntu1 bionic \ - qtbase5-dev 5.9.3+dfsg-0ubuntu2 bionic \ - libqt5opengl5-dev 5.9.3+dfsg-0ubuntu2 bionic \ - qt5-qmltooling-plugins 5.9.3-0ubuntu1 bionic \ - qtdeclarative5-dev 5.9.3-0ubuntu1 bionic \ - qtmultimedia5-dev 5.9.3-0ubuntu3 bionic \ - libicu57 57.1-6ubuntu0.2 bionic \ - cmake 3.10.2-1ubuntu2 bionic \ - libavcodec-dev 7:3.4.4-0ubuntu0.18.04.1 bionic \ - libavformat-dev 7:3.4.4-0ubuntu0.18.04.1 bionic \ - libswscale-dev 7:3.4.4-0ubuntu0.18.04.1 bionic +RUN apt-get update && apt-get install -y p7zip-full build-essential wget git python3-launchpadlib ccache ninja-build +RUN cd /tmp/pkgs && python3 install_package.py \ + libsdl2-dev 2.0.10+dfsg1-3 focal \ + qtbase5-dev 5.12.8+dfsg-0ubuntu1 focal \ + libqt5opengl5-dev 5.12.8+dfsg-0ubuntu1 focal \ + qt5-qmltooling-plugins 5.12.8-0ubuntu1 focal \ + qtdeclarative5-dev 5.12.8-0ubuntu1 focal \ + qtmultimedia5-dev 5.12.8-0ubuntu1 focal \ + libicu66 66.1-2ubuntu2 focal \ + cmake 3.16.3-1ubuntu1 focal \ + libavcodec-dev 7:4.2.4-1ubuntu0.1 focal \ + libavformat-dev 7:4.2.4-1ubuntu0.1 focal \ + libswscale-dev 7:4.2.4-1ubuntu0.1 focal RUN rm -rf /tmp/pkgs diff --git a/linux-frozen/install_package.py b/linux-frozen/install_package.py index 50473c2..fd884a6 100755 --- a/linux-frozen/install_package.py +++ b/linux-frozen/install_package.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 import sys import re @@ -27,8 +27,8 @@ def get_url(pkg, distro): def list_dependencies(deb_file): t = subprocess.check_output( - ['bash', '-c', '(dpkg -I {} | grep -oP "^ Depends\: \K.*$") || true'.format(deb_file)]) - deps = [i.split('|')[0].strip() for i in t.split(',')] + ['bash', '-c', '(dpkg -I {} | grep -oP "^ Depends\\: \\K.*$") || true'.format(deb_file)]) + deps = [i.split(b'|')[0].decode('utf-8').strip() for i in t.split(b',')] equals_re = re.compile(r'^(.*) \(= (.*)\)$') return [equals_re.sub(r'\1=\2', i).split('=') for i in filter(equals_re.match, deps)]