From 6aafbbcb051c33c8e7f205b8e7747a3840852424 Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Sun, 15 Jun 2025 22:56:36 -0700 Subject: [PATCH] Enable using LDEARCH to set wsl1 as the osversion. Set LDEARCH to get a WSL1 compile on a standard Linux system in Dockerfile_maiko (and hence in the workflow buildRelease.yml). --- .github/workflows/Dockerfile_maiko | 8 ++------ bin/osversion | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/Dockerfile_maiko b/.github/workflows/Dockerfile_maiko index 3b3e66d..4b209ca 100755 --- a/.github/workflows/Dockerfile_maiko +++ b/.github/workflows/Dockerfile_maiko @@ -26,14 +26,10 @@ RUN cd ${INSTALL_LOCATION}/bin \ RUN cd ${INSTALL_LOCATION}/bin \ && arch="$(./machinetype)" \ && if [ "$arch" = "x86_64" ] || [ "$arch" = "aarch64" ]; then \ - mv osversion osversion.hold \ - && echo "#!/bin/sh" > osversion \ - && echo "echo wsl1" >> osversion \ - && chmod ugo+x osversion \ + && export LDEARCH="${arch}-microsoft-wsl1" \ && ./makeright x cleanup \ && ./makeright x \ + && ./makeright init clean \ && ./makeright init \ - && mv osversion.hold osversion \ - && chmod ugo+x osversion \ ; \ fi diff --git a/bin/osversion b/bin/osversion index b51d919..c002796 100755 --- a/bin/osversion +++ b/bin/osversion @@ -15,6 +15,7 @@ case "$os" in *-*-freebsd*) echo freebsd ;; *-*-cygwin*) echo cygwin ;; *-*-haiku*) echo haiku ;; + *-microsoft-wsl1) echo wsl1 ;; esac ### Don't leave the variable set. unset os