From 355eeefc4e88a4eaabcbfe3a73f6a3f10d856e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= Date: Mon, 29 Apr 2024 13:23:09 +0200 Subject: [PATCH] x-tools: Adjust environment to match new build system MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Håvard Sørbø --- x-tools/Dockerfile.linux-arm64 | 15 ++------------- x-tools/Dockerfile.linux-arm64-musl | 15 ++------------- x-tools/Dockerfile.linux-armhf | 15 ++------------- x-tools/Dockerfile.linux-mips | 15 ++------------- x-tools/Dockerfile.linux-mips64 | 15 ++------------- x-tools/Dockerfile.linux-mips64el | 15 ++------------- x-tools/Dockerfile.linux-mipsel | 15 ++------------- x-tools/Dockerfile.linux-x86 | 15 ++------------- x-tools/Dockerfile.linux-x86_64 | 15 ++------------- x-tools/Dockerfile.linux-x86_64-musl | 15 ++------------- 10 files changed, 20 insertions(+), 130 deletions(-) diff --git a/x-tools/Dockerfile.linux-arm64 b/x-tools/Dockerfile.linux-arm64 index 3406f3b..cda1302 100644 --- a/x-tools/Dockerfile.linux-arm64 +++ b/x-tools/Dockerfile.linux-arm64 @@ -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 diff --git a/x-tools/Dockerfile.linux-arm64-musl b/x-tools/Dockerfile.linux-arm64-musl index bd193a0..e056065 100644 --- a/x-tools/Dockerfile.linux-arm64-musl +++ b/x-tools/Dockerfile.linux-arm64-musl @@ -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 diff --git a/x-tools/Dockerfile.linux-armhf b/x-tools/Dockerfile.linux-armhf index c605d93..a8f7696 100644 --- a/x-tools/Dockerfile.linux-armhf +++ b/x-tools/Dockerfile.linux-armhf @@ -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 diff --git a/x-tools/Dockerfile.linux-mips b/x-tools/Dockerfile.linux-mips index acd5b0f..78bfb94 100644 --- a/x-tools/Dockerfile.linux-mips +++ b/x-tools/Dockerfile.linux-mips @@ -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 diff --git a/x-tools/Dockerfile.linux-mips64 b/x-tools/Dockerfile.linux-mips64 index a7c2aa2..80205fe 100644 --- a/x-tools/Dockerfile.linux-mips64 +++ b/x-tools/Dockerfile.linux-mips64 @@ -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 diff --git a/x-tools/Dockerfile.linux-mips64el b/x-tools/Dockerfile.linux-mips64el index 54ccdd8..e5da8aa 100644 --- a/x-tools/Dockerfile.linux-mips64el +++ b/x-tools/Dockerfile.linux-mips64el @@ -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 diff --git a/x-tools/Dockerfile.linux-mipsel b/x-tools/Dockerfile.linux-mipsel index dacf5c7..462b253 100644 --- a/x-tools/Dockerfile.linux-mipsel +++ b/x-tools/Dockerfile.linux-mipsel @@ -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 diff --git a/x-tools/Dockerfile.linux-x86 b/x-tools/Dockerfile.linux-x86 index 04d0f7b..f68e95d 100644 --- a/x-tools/Dockerfile.linux-x86 +++ b/x-tools/Dockerfile.linux-x86 @@ -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 diff --git a/x-tools/Dockerfile.linux-x86_64 b/x-tools/Dockerfile.linux-x86_64 index 7164336..74eb180 100644 --- a/x-tools/Dockerfile.linux-x86_64 +++ b/x-tools/Dockerfile.linux-x86_64 @@ -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 diff --git a/x-tools/Dockerfile.linux-x86_64-musl b/x-tools/Dockerfile.linux-x86_64-musl index b24ac8f..7209867 100644 --- a/x-tools/Dockerfile.linux-x86_64-musl +++ b/x-tools/Dockerfile.linux-x86_64-musl @@ -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