From d1e0fe2dd82100c4393a26e0426e09af2862cbf1 Mon Sep 17 00:00:00 2001 From: vitaliylag Date: Wed, 30 Jul 2025 12:56:37 +0400 Subject: [PATCH 1/2] Set $PYTHON to python3.10 --- recipes/loong64/Dockerfile | 5 ++++- recipes/loong64/run.sh | 1 + recipes/loong64/should-build.sh | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/recipes/loong64/Dockerfile b/recipes/loong64/Dockerfile index 9fd9aad..9d68b42 100644 --- a/recipes/loong64/Dockerfile +++ b/recipes/loong64/Dockerfile @@ -23,7 +23,10 @@ RUN apt-get update \ gcc-14-loongarch64-linux-gnu RUN addgroup --gid $GID node \ - && adduser --gid $GID --uid $UID --disabled-password --gecos node node + || groupmod -n node ubuntu + +RUN adduser --gid $GID --uid $UID --disabled-password --gecos node node \ + || usermod -l node ubuntu RUN rm -f /usr/bin/python3 RUN ln -s /usr/bin/python3.10 /usr/bin/python3 diff --git a/recipes/loong64/run.sh b/recipes/loong64/run.sh index 4b7ea6f..0b5802a 100755 --- a/recipes/loong64/run.sh +++ b/recipes/loong64/run.sh @@ -22,6 +22,7 @@ export CC_host="ccache gcc-13" export CXX_host="ccache g++-13" export CC="ccache /usr/bin/loongarch64-linux-gnu-gcc-14" export CXX="ccache /usr/bin/loongarch64-linux-gnu-g++-14" +export PYTHON="python3.10" make -j$(getconf _NPROCESSORS_ONLN) binary V= \ DESTCPU="loong64" \ diff --git a/recipes/loong64/should-build.sh b/recipes/loong64/should-build.sh index f4952b1..ce697b8 100755 --- a/recipes/loong64/should-build.sh +++ b/recipes/loong64/should-build.sh @@ -11,4 +11,4 @@ decode "$fullversion" (test "$major" -eq "20" && test "$minor" -ge "10") || \ (test "$major" -eq "21") || \ (test "$major" -eq "22" && test "$minor" -ge "14") || \ -(test "$major" -eq "23") +(test "$major" -ge "23") From f482871b93a92bc84da9b9bc16b54cdbe88671a4 Mon Sep 17 00:00:00 2001 From: vitaliylag Date: Wed, 30 Jul 2025 13:24:12 +0400 Subject: [PATCH 2/2] Revert run.sh --- recipes/loong64/run.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/loong64/run.sh b/recipes/loong64/run.sh index 0b5802a..4b7ea6f 100755 --- a/recipes/loong64/run.sh +++ b/recipes/loong64/run.sh @@ -22,7 +22,6 @@ export CC_host="ccache gcc-13" export CXX_host="ccache g++-13" export CC="ccache /usr/bin/loongarch64-linux-gnu-gcc-14" export CXX="ccache /usr/bin/loongarch64-linux-gnu-g++-14" -export PYTHON="python3.10" make -j$(getconf _NPROCESSORS_ONLN) binary V= \ DESTCPU="loong64" \