Skip to content

Commit

Permalink
x-tools: Adjust environment to match new build system
Browse files Browse the repository at this point in the history 
Co-authored-by: Håvard Sørbø <[email protected]>
  • Loading branch information
@oleavr @hsorbo
oleavr and hsorbo committed Apr 29, 2024
1 parent b8167b0 commit 355eeef
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 130 deletions.
15 changes: 2 additions & 13 deletions x-tools/Dockerfile.linux-arm64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,7 @@ FROM ubuntu:22.04
COPY --from=build /opt /opt
ENV XTOOLS_HOST="aarch64-linux-gnu"
ENV \
PATH="/opt/x-tools/${XTOOLS_HOST}/bin:$PATH" \
CPP="${XTOOLS_HOST}-cpp" \
CC="${XTOOLS_HOST}-gcc" \
CXX="${XTOOLS_HOST}-g++" \
AS="${XTOOLS_HOST}-as" \
LD="${XTOOLS_HOST}-ld" \
AR="${XTOOLS_HOST}-ar" \
NM="${XTOOLS_HOST}-nm" \
RANLIB="${XTOOLS_HOST}-ranlib" \
STRIP="${XTOOLS_HOST}-strip" \
READELF="${XTOOLS_HOST}-readelf" \
OBJCOPY="${XTOOLS_HOST}-objcopy" \
OBJDUMP="${XTOOLS_HOST}-objdump"
PATH="/opt/x-tools/$XTOOLS_HOST/bin:$PATH" \
PKG_CONFIG_PATH="/opt/x-tools/$XTOOLS_HOST/$XTOOLS_HOST/sysroot/usr/lib/pkgconfig"
COPY scripts/install-packages.sh /tmp
RUN /tmp/install-packages.sh qemu-user
15 changes: 2 additions & 13 deletions x-tools/Dockerfile.linux-arm64-musl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,7 @@ FROM ubuntu:22.04
COPY --from=build /opt /opt
ENV XTOOLS_HOST="aarch64-linux-musl"
ENV \
PATH="/opt/x-tools/${XTOOLS_HOST}/bin:$PATH" \
CPP="${XTOOLS_HOST}-cpp" \
CC="${XTOOLS_HOST}-gcc" \
CXX="${XTOOLS_HOST}-g++" \
AS="${XTOOLS_HOST}-as" \
LD="${XTOOLS_HOST}-ld" \
AR="${XTOOLS_HOST}-ar" \
NM="${XTOOLS_HOST}-nm" \
RANLIB="${XTOOLS_HOST}-ranlib" \
STRIP="${XTOOLS_HOST}-strip" \
READELF="${XTOOLS_HOST}-readelf" \
OBJCOPY="${XTOOLS_HOST}-objcopy" \
OBJDUMP="${XTOOLS_HOST}-objdump"
PATH="/opt/x-tools/$XTOOLS_HOST/bin:$PATH" \
PKG_CONFIG_PATH="/opt/x-tools/$XTOOLS_HOST/$XTOOLS_HOST/sysroot/usr/lib/pkgconfig"
COPY scripts/install-packages.sh /tmp
RUN /tmp/install-packages.sh qemu-user
15 changes: 2 additions & 13 deletions x-tools/Dockerfile.linux-armhf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,7 @@ FROM ubuntu:22.04
COPY --from=build /opt /opt
ENV XTOOLS_HOST="arm-linux-gnueabihf"
ENV \
PATH="/opt/x-tools/${XTOOLS_HOST}/bin:$PATH" \
CPP="${XTOOLS_HOST}-cpp" \
CC="${XTOOLS_HOST}-gcc" \
CXX="${XTOOLS_HOST}-g++" \
AS="${XTOOLS_HOST}-as" \
LD="${XTOOLS_HOST}-ld" \
AR="${XTOOLS_HOST}-ar" \
NM="${XTOOLS_HOST}-nm" \
RANLIB="${XTOOLS_HOST}-ranlib" \
STRIP="${XTOOLS_HOST}-strip" \
READELF="${XTOOLS_HOST}-readelf" \
OBJCOPY="${XTOOLS_HOST}-objcopy" \
OBJDUMP="${XTOOLS_HOST}-objdump"
PATH="/opt/x-tools/$XTOOLS_HOST/bin:$PATH" \
PKG_CONFIG_PATH="/opt/x-tools/$XTOOLS_HOST/$XTOOLS_HOST/sysroot/usr/lib/pkgconfig"
COPY scripts/install-packages.sh /tmp
RUN /tmp/install-packages.sh qemu-user
15 changes: 2 additions & 13 deletions x-tools/Dockerfile.linux-mips
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,7 @@ FROM ubuntu:22.04
COPY --from=build /opt /opt
ENV XTOOLS_HOST="mips-linux-gnu"
ENV \
PATH="/opt/x-tools/${XTOOLS_HOST}/bin:$PATH" \
CPP="${XTOOLS_HOST}-cpp" \
CC="${XTOOLS_HOST}-gcc" \
CXX="${XTOOLS_HOST}-g++" \
AS="${XTOOLS_HOST}-as" \
LD="${XTOOLS_HOST}-ld" \
AR="${XTOOLS_HOST}-ar" \
NM="${XTOOLS_HOST}-nm" \
RANLIB="${XTOOLS_HOST}-ranlib" \
STRIP="${XTOOLS_HOST}-strip" \
READELF="${XTOOLS_HOST}-readelf" \
OBJCOPY="${XTOOLS_HOST}-objcopy" \
OBJDUMP="${XTOOLS_HOST}-objdump"
PATH="/opt/x-tools/$XTOOLS_HOST/bin:$PATH" \
PKG_CONFIG_PATH="/opt/x-tools/$XTOOLS_HOST/$XTOOLS_HOST/sysroot/usr/lib/pkgconfig"
COPY scripts/install-packages.sh /tmp
RUN /tmp/install-packages.sh qemu-user
15 changes: 2 additions & 13 deletions x-tools/Dockerfile.linux-mips64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,7 @@ FROM ubuntu:22.04
COPY --from=build /opt /opt
ENV XTOOLS_HOST="mips64-linux-gnu"
ENV \
PATH="/opt/x-tools/${XTOOLS_HOST}/bin:$PATH" \
CPP="${XTOOLS_HOST}-cpp" \
CC="${XTOOLS_HOST}-gcc" \
CXX="${XTOOLS_HOST}-g++" \
AS="${XTOOLS_HOST}-as" \
LD="${XTOOLS_HOST}-ld" \
AR="${XTOOLS_HOST}-ar" \
NM="${XTOOLS_HOST}-nm" \
RANLIB="${XTOOLS_HOST}-ranlib" \
STRIP="${XTOOLS_HOST}-strip" \
READELF="${XTOOLS_HOST}-readelf" \
OBJCOPY="${XTOOLS_HOST}-objcopy" \
OBJDUMP="${XTOOLS_HOST}-objdump"
PATH="/opt/x-tools/$XTOOLS_HOST/bin:$PATH" \
PKG_CONFIG_PATH="/opt/x-tools/$XTOOLS_HOST/$XTOOLS_HOST/sysroot/usr/lib/pkgconfig"
COPY scripts/install-packages.sh /tmp
RUN /tmp/install-packages.sh qemu-user
15 changes: 2 additions & 13 deletions x-tools/Dockerfile.linux-mips64el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,7 @@ FROM ubuntu:22.04
COPY --from=build /opt /opt
ENV XTOOLS_HOST="mips64el-linux-gnu"
ENV \
PATH="/opt/x-tools/${XTOOLS_HOST}/bin:$PATH" \
CPP="${XTOOLS_HOST}-cpp" \
CC="${XTOOLS_HOST}-gcc" \
CXX="${XTOOLS_HOST}-g++" \
AS="${XTOOLS_HOST}-as" \
LD="${XTOOLS_HOST}-ld" \
AR="${XTOOLS_HOST}-ar" \
NM="${XTOOLS_HOST}-nm" \
RANLIB="${XTOOLS_HOST}-ranlib" \
STRIP="${XTOOLS_HOST}-strip" \
READELF="${XTOOLS_HOST}-readelf" \
OBJCOPY="${XTOOLS_HOST}-objcopy" \
OBJDUMP="${XTOOLS_HOST}-objdump"
PATH="/opt/x-tools/$XTOOLS_HOST/bin:$PATH" \
PKG_CONFIG_PATH="/opt/x-tools/$XTOOLS_HOST/$XTOOLS_HOST/sysroot/usr/lib/pkgconfig"
COPY scripts/install-packages.sh /tmp
RUN /tmp/install-packages.sh qemu-user
15 changes: 2 additions & 13 deletions x-tools/Dockerfile.linux-mipsel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,7 @@ FROM ubuntu:22.04
COPY --from=build /opt /opt
ENV XTOOLS_HOST="mipsel-linux-gnu"
ENV \
PATH="/opt/x-tools/${XTOOLS_HOST}/bin:$PATH" \
CPP="${XTOOLS_HOST}-cpp" \
CC="${XTOOLS_HOST}-gcc" \
CXX="${XTOOLS_HOST}-g++" \
AS="${XTOOLS_HOST}-as" \
LD="${XTOOLS_HOST}-ld" \
AR="${XTOOLS_HOST}-ar" \
NM="${XTOOLS_HOST}-nm" \
RANLIB="${XTOOLS_HOST}-ranlib" \
STRIP="${XTOOLS_HOST}-strip" \
READELF="${XTOOLS_HOST}-readelf" \
OBJCOPY="${XTOOLS_HOST}-objcopy" \
OBJDUMP="${XTOOLS_HOST}-objdump"
PATH="/opt/x-tools/$XTOOLS_HOST/bin:$PATH" \
PKG_CONFIG_PATH="/opt/x-tools/$XTOOLS_HOST/$XTOOLS_HOST/sysroot/usr/lib/pkgconfig"
COPY scripts/install-packages.sh /tmp
RUN /tmp/install-packages.sh qemu-user
15 changes: 2 additions & 13 deletions x-tools/Dockerfile.linux-x86
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,7 @@ FROM ubuntu:22.04
COPY --from=build /opt /opt
ENV XTOOLS_HOST="i686-linux-gnu"
ENV \
PATH="/opt/x-tools/${XTOOLS_HOST}/bin:$PATH" \
CPP="${XTOOLS_HOST}-cpp" \
CC="${XTOOLS_HOST}-gcc" \
CXX="${XTOOLS_HOST}-g++" \
AS="${XTOOLS_HOST}-as" \
LD="${XTOOLS_HOST}-ld" \
AR="${XTOOLS_HOST}-ar" \
NM="${XTOOLS_HOST}-nm" \
RANLIB="${XTOOLS_HOST}-ranlib" \
STRIP="${XTOOLS_HOST}-strip" \
READELF="${XTOOLS_HOST}-readelf" \
OBJCOPY="${XTOOLS_HOST}-objcopy" \
OBJDUMP="${XTOOLS_HOST}-objdump"
PATH="/opt/x-tools/$XTOOLS_HOST/bin:$PATH" \
PKG_CONFIG_PATH="/opt/x-tools/$XTOOLS_HOST/$XTOOLS_HOST/sysroot/usr/lib/pkgconfig"
COPY scripts/install-packages.sh /tmp
RUN /tmp/install-packages.sh libc6-i386
15 changes: 2 additions & 13 deletions x-tools/Dockerfile.linux-x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,7 @@ FROM ubuntu:22.04
COPY --from=build /opt /opt
ENV XTOOLS_HOST="x86_64-linux-gnu"
ENV \
PATH="/opt/x-tools/${XTOOLS_HOST}/bin:$PATH" \
CPP="${XTOOLS_HOST}-cpp" \
CC="${XTOOLS_HOST}-gcc" \
CXX="${XTOOLS_HOST}-g++" \
AS="${XTOOLS_HOST}-as" \
LD="${XTOOLS_HOST}-ld" \
AR="${XTOOLS_HOST}-ar" \
NM="${XTOOLS_HOST}-nm" \
RANLIB="${XTOOLS_HOST}-ranlib" \
STRIP="${XTOOLS_HOST}-strip" \
READELF="${XTOOLS_HOST}-readelf" \
OBJCOPY="${XTOOLS_HOST}-objcopy" \
OBJDUMP="${XTOOLS_HOST}-objdump"
PATH="/opt/x-tools/$XTOOLS_HOST/bin:$PATH" \
PKG_CONFIG_PATH="/opt/x-tools/$XTOOLS_HOST/$XTOOLS_HOST/sysroot/usr/lib/pkgconfig"
COPY scripts/install-packages.sh /tmp
RUN /tmp/install-packages.sh
15 changes: 2 additions & 13 deletions x-tools/Dockerfile.linux-x86_64-musl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,7 @@ FROM ubuntu:22.04
COPY --from=build /opt /opt
ENV XTOOLS_HOST="x86_64-linux-musl"
ENV \
PATH="/opt/x-tools/${XTOOLS_HOST}/bin:$PATH" \
CPP="${XTOOLS_HOST}-cpp" \
CC="${XTOOLS_HOST}-gcc" \
CXX="${XTOOLS_HOST}-g++" \
AS="${XTOOLS_HOST}-as" \
LD="${XTOOLS_HOST}-ld" \
AR="${XTOOLS_HOST}-ar" \
NM="${XTOOLS_HOST}-nm" \
RANLIB="${XTOOLS_HOST}-ranlib" \
STRIP="${XTOOLS_HOST}-strip" \
READELF="${XTOOLS_HOST}-readelf" \
OBJCOPY="${XTOOLS_HOST}-objcopy" \
OBJDUMP="${XTOOLS_HOST}-objdump"
PATH="/opt/x-tools/$XTOOLS_HOST/bin:$PATH" \
PKG_CONFIG_PATH="/opt/x-tools/$XTOOLS_HOST/$XTOOLS_HOST/sysroot/usr/lib/pkgconfig"
COPY scripts/install-packages.sh /tmp
RUN /tmp/install-packages.sh

0 comments on commit 355eeef

Please sign in to comment.