From 0888deb9fa17f3eb8c54887748d7064a53fec63b Mon Sep 17 00:00:00 2001
From: Bensuperpc <bensuperpc@gmail.com>
Date: Sat, 22 May 2021 22:29:03 +0200
Subject: [PATCH] Update Qemu to 3.1 on linux-ppc64le and remove packages who
 break with debian buster

Update Qemu to 3.1 on on linux-ppc64le and remove packages who break with debian buster: https://askubuntu.com/questions/564282/apt-get-unmet-dependencies-but-it-is-not-going-to-be-installed

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
---
 .github/workflows/main.yml  |  2 +-
 linux-ppc64le/Dockerfile.in | 19 ++++---------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f203025..3590cfe 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,7 +3,7 @@ name: Dockcross CI
 on:
   push:
     branches:
-    - 'master'
+    - '*'
   pull_request:
     branches:
     - '*'
diff --git a/linux-ppc64le/Dockerfile.in b/linux-ppc64le/Dockerfile.in
index 82dc8f3..aa61fc7 100644
--- a/linux-ppc64le/Dockerfile.in
+++ b/linux-ppc64le/Dockerfile.in
@@ -1,31 +1,20 @@
 FROM dockcross/base:latest
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
-COPY sources.list /etc/apt/sources.list
-RUN dpkg --add-architecture ppc64el ; apt-get update ; apt-get -y upgrade ; apt-get update ;
-
-ENV CROSS_TRIPLE powerpc64le-linux-gnu
-
-RUN apt-get install -y \
-  libbz2-dev:ppc64el \
-  libexpat1-dev:ppc64el \
-  ncurses-dev:ppc64el \
-  libssl-dev:ppc64el \
-  python-dev
-
 #include "common.crosstool"
 
 # ENV CROSS_TRIPLE powerpc64le-unknown-linux-gnu
+ENV CROSS_TRIPLE powerpc64le-linux-gnu
 
 WORKDIR /usr/src
 
 RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \
-  curl -L http://wiki.qemu-project.org/download/qemu-2.6.0.tar.bz2 | tar xj && \
-  cd qemu-2.6.0 && \
+  curl -L http://wiki.qemu-project.org/download/qemu-3.1.0.tar.bz2 | tar xj && \
+  cd qemu-3.1.0 && \
   ./configure --target-list=ppc64le-linux-user --prefix=/usr && \
   make -j$(nproc) && \
   make install && \
-  cd .. && rm -rf qemu-2.6.0
+  cd .. && rm -rf qemu-3.1.0
 
 ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \