| Message ID | 20170508045715.21770-22-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-powerpc-cross.docker | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/tests/docker/dockerfiles/debian-powerpc-cross.docker b/tests/docker/dockerfiles/debian-powerpc-cross.docker > index 9107ebc2d3..d6e4d1e977 100644 > --- a/tests/docker/dockerfiles/debian-powerpc-cross.docker > +++ b/tests/docker/dockerfiles/debian-powerpc-cross.docker > @@ -12,6 +12,13 @@ RUN dpkg --add-architecture powerpc && \ > DEBIAN_FRONTEND=noninteractive eatmydata apt-get install -y --no-install-recommends \ > crossbuild-essential-powerpc > > +# <kludge> to fix "following packages have unmet dependencies" ... > +RUN apt-get install -y --no-install-recommends equivs pkg-config && \ > + apt-fake install pkg-config:powerpc=0.28-1.1-fake && \ > + ln -s pkg-config /usr/bin/powerpc-linux-gnu-pkg-config > +ENV PKG_CONFIG_PATH /usr/lib/powerpc-linux-gnu/pkgconfig > +# </kludge> > + > # Specify the cross prefix for this image (see tests/docker/common.rc) > ENV QEMU_CONFIGURE_OPTS --cross-prefix=powerpc-linux-gnu- Given the image needs these package hacks it is probably best folded into the commit adding the target. -- Alex Bennée
On 05/08/2017 08:19 AM, Alex Bennée wrote: > > Philippe Mathieu-Daudé <f4bug@amsat.org> writes: > >> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> --- >> tests/docker/dockerfiles/debian-powerpc-cross.docker | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/tests/docker/dockerfiles/debian-powerpc-cross.docker b/tests/docker/dockerfiles/debian-powerpc-cross.docker >> index 9107ebc2d3..d6e4d1e977 100644 >> --- a/tests/docker/dockerfiles/debian-powerpc-cross.docker >> +++ b/tests/docker/dockerfiles/debian-powerpc-cross.docker >> @@ -12,6 +12,13 @@ RUN dpkg --add-architecture powerpc && \ >> DEBIAN_FRONTEND=noninteractive eatmydata apt-get install -y --no-install-recommends \ >> crossbuild-essential-powerpc >> >> +# <kludge> to fix "following packages have unmet dependencies" ... >> +RUN apt-get install -y --no-install-recommends equivs pkg-config && \ >> + apt-fake install pkg-config:powerpc=0.28-1.1-fake && \ >> + ln -s pkg-config /usr/bin/powerpc-linux-gnu-pkg-config >> +ENV PKG_CONFIG_PATH /usr/lib/powerpc-linux-gnu/pkgconfig >> +# </kludge> >> + >> # Specify the cross prefix for this image (see tests/docker/common.rc) >> ENV QEMU_CONFIGURE_OPTS --cross-prefix=powerpc-linux-gnu- > > Given the image needs these package hacks it is probably best folded > into the commit adding the target. Ok, will squash with the "ADD debian-apt-fake.sh /usr/local/bin/apt-fake" line. > -- > Alex Bennée >
diff --git a/tests/docker/dockerfiles/debian-powerpc-cross.docker b/tests/docker/dockerfiles/debian-powerpc-cross.docker index 9107ebc2d3..d6e4d1e977 100644 --- a/tests/docker/dockerfiles/debian-powerpc-cross.docker +++ b/tests/docker/dockerfiles/debian-powerpc-cross.docker @@ -12,6 +12,13 @@ RUN dpkg --add-architecture powerpc && \ DEBIAN_FRONTEND=noninteractive eatmydata apt-get install -y --no-install-recommends \ crossbuild-essential-powerpc +# <kludge> to fix "following packages have unmet dependencies" ... +RUN apt-get install -y --no-install-recommends equivs pkg-config && \ + apt-fake install pkg-config:powerpc=0.28-1.1-fake && \ + ln -s pkg-config /usr/bin/powerpc-linux-gnu-pkg-config +ENV PKG_CONFIG_PATH /usr/lib/powerpc-linux-gnu/pkgconfig +# </kludge> + # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=powerpc-linux-gnu-
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- tests/docker/dockerfiles/debian-powerpc-cross.docker | 7 +++++++ 1 file changed, 7 insertions(+)