| Message ID | 20170508045715.21770-16-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
Philippe Mathieu-Daudé <f4bug@amsat.org> writes: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > tests/docker/dockerfiles/debian-mipsel-cross.docker | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker > index c569a2e1b4..3c4945d78e 100644 > --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker > +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker > @@ -12,6 +12,13 @@ RUN dpkg --add-architecture mipsel && \ > DEBIAN_FRONTEND=noninteractive eatmydata apt-get install -y --no-install-recommends \ > crossbuild-essential-mipsel > > +# <kludge> to fix "following packages have unmet dependencies" ... > +RUN apt-get install -y --no-install-recommends equivs pkg-config && \ > + apt-fake install pkgconf:mipsel=0.9.7-fake > pkg-config:mipsel=0.28-1.1-fake && \ I'll take your word that this fixes the problem for broken packages. When I ran into these I just started using the linux-user approach because it seemed fragile otherwise. I assume a dot release of any of these packages might break the image build? > + ln -s pkg-config /usr/bin/mipsel-linux-gnu-pkg-config > +ENV PKG_CONFIG_PATH /usr/lib/mipsel-linux-gnu/pkgconfig > + Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > # Specify the cross prefix for this image (see tests/docker/common.rc) > ENV QEMU_CONFIGURE_OPTS --cross-prefix=mipsel-linux-gnu- -- Alex Bennée
diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index c569a2e1b4..3c4945d78e 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -12,6 +12,13 @@ RUN dpkg --add-architecture mipsel && \ DEBIAN_FRONTEND=noninteractive eatmydata apt-get install -y --no-install-recommends \ crossbuild-essential-mipsel +# <kludge> to fix "following packages have unmet dependencies" ... +RUN apt-get install -y --no-install-recommends equivs pkg-config && \ + apt-fake install pkgconf:mipsel=0.9.7-fake pkg-config:mipsel=0.28-1.1-fake && \ + ln -s pkg-config /usr/bin/mipsel-linux-gnu-pkg-config +ENV PKG_CONFIG_PATH /usr/lib/mipsel-linux-gnu/pkgconfig +# </kludge> + # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=mipsel-linux-gnu-
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- tests/docker/dockerfiles/debian-mipsel-cross.docker | 7 +++++++ 1 file changed, 7 insertions(+)