Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 42de1c9

Browse files
[pkg] fix: remove explicit qemu-user-static use
QEMU breaks ARM32/64 hosts as QEMU is installed as a x86-64 binary.
1 parent da9e562 commit 42de1c9

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

‎packaging/Dockerfile‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,30 @@ FROM ev3dev/ev3dev-$DEBIAN_RELEASE-ev3-base
44
ARG DEBIAN_RELEASE
55
ENV DISTRO=$DEBIAN_RELEASE
66

7-
# copy QEMU
7+
# copy QEMU for x86 hosts (binfmt_misc is required)
88
COPY qemu-arm-static /usr/bin/qemu-arm-static
99

1010
# install packaging utilities
11-
RUN ["/usr/bin/qemu-arm-static", "/bin/bash", "-c", \
12-
"apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install --yes --no-install-recommends devscripts debhelper fakeroot zip unzip gnupg dctrl-tools dput liblcms2-2"]
11+
RUN apt-get -qq update && \
12+
DEBIAN_FRONTEND=noninteractive apt-get -qq install --yes --no-install-recommends \
13+
devscripts debhelper fakeroot \
14+
zip unzip \
15+
gnupg dctrl-tools dput \
16+
liblcms2-2
1317

1418
# prepare a nonroot user
1519
COPY compiler.sudoers /etc/sudoers.d/compiler
16-
RUN ["/usr/bin/qemu-arm-static", "/bin/bash", "-c", \
17-
"chmod 0440 /etc/sudoers.d/compiler && adduser --disabled-password --gecos \"\" compiler && usermod -a -G sudo compiler"]
20+
RUN chmod 0440 /etc/sudoers.d/compiler && \
21+
adduser --disabled-password --gecos \"\" compiler && usermod -a -G sudo compiler
1822

1923
# copy build patches & scripts
2024
COPY *.awk *.patch *.sh /opt/jdkpkg/
2125
COPY debian/ /opt/jdkpkg/debian/
22-
RUN ["/usr/bin/qemu-arm-static", "/bin/bash", "-c", "chmod +x /opt/jdkpkg/*.sh"]
26+
RUN chmod +x /opt/jdkpkg/*.sh
2327

2428
# this directory should be mounted
2529
VOLUME /build
2630

2731
USER compiler
2832
WORKDIR /opt/jdkpkg
29-
ENTRYPOINT ["/usr/bin/qemu-arm-static", "/bin/bash", "-c"]
30-
CMD ["/opt/jdkpkg/package.sh"]
33+
CMD ["/bin/bash", "-c", "/opt/jdkpkg/package.sh"]

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /