feat: 添加补丁

Author: wojiushixiaobai

.github/workflows/release.yml

@@ -14,6 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       app_version: ${{ steps.get-version.outputs.app_version }}
+      app_build: ${{ steps.check-release.outputs.app_build }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-buildx-action@v3
@@ -37,6 +38,7 @@ jobs:
         id: check-release
         run: |
           gh release view ${app_version} -R ${{ github.repository }} >/dev/null 2>&1 || echo "create=1" >> $GITHUB_OUTPUT
+          gh release view ${app_version} -R ${{ github.repository }} | grep ${{ env.app_name }}-Debian-nw.tar.gz >/dev/null 2>&1 || echo "app_build=1" >> $GITHUB_OUTPUT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -62,25 +64,15 @@ jobs:
   build-binaries:
     runs-on: ubuntu-latest
     needs: check-binaries
+    if: ${{ needs.check-binaries.outputs.app_build == '1' }}
     env:
       app_version: ${{ needs.check-binaries.outputs.app_version }}
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ env.app_version }}
-      
       - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
 
-      - name: Check Release
-        id: create-binaries
-        run: |
-          gh release view ${{ env.app_version }} -R ${{ github.repository }} | grep ${{ env.app_name }}-x86_64 >/dev/null 2>&1 || echo "create=1" >> $GITHUB_OUTPUT
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Cache Docker layers
-        if : steps.create-binaries.outputs.create == '1'
         uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
@@ -89,12 +81,10 @@ jobs:
             ${{ runner.os }}-buildx-
 
       - name: Build Binaries
-        if : steps.create-binaries.outputs.create == '1'
         run: |
-          docker buildx build --platform linux/loong64 -t ${{ env.app_name }}-debian-loong64:${{ env.app_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache-new,mode=max debian --load
+          docker buildx build --platform linux/loong64 --build-arg VERSION=${{ env.app_version }} -t ${{ env.app_name }}-debian-loong64:${{ env.app_version }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache-new,mode=max debian --load
 
       - name: Upgrade Release
-        if : steps.create-binaries.outputs.create == '1'
         run: |
           docker run --rm -v $(pwd)/dist:/dist ${{ env.app_name }}-debian-loong64:${{ env.app_version }}
           ls -al dist
@@ -103,7 +93,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Move cache
-        if : steps.create-binaries.outputs.create == '1'
         run: |
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache

debian/Dockerfile

@@ -1,7 +1,6 @@
 FROM ghcr.io/loong64/debian:trixie-slim AS build-lat
 ARG TARGETARCH
 
-# git ninja-build libssl-dev libc6 gcc g++ pkg-config libglib2.0-dev libdrm-dev lsb-release make python3-setuptools
 ARG DEPENDENCIES="        \
         ccache            \
         curl              \
@@ -11,6 +10,7 @@ ARG DEPENDENCIES="        \
         libc6             \
         libdrm-dev        \
         libglib2.0-dev    \
+        libkeyutils-dev   \
         libssl-dev        \
         lsb-release       \
         make              \
@@ -23,28 +23,31 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     apt-get update \
     && apt-get install -y ${DEPENDENCIES}
 
-ARG VERSION=master
+ARG VERSION
 ARG WORKDIR=/opt/lat
 
 WORKDIR ${WORKDIR}
 
 RUN set -ex \
-    && git clone --depth=1 --recursive --branch ${VERSION} https://github.com/lat-opensource/lat ${WORKDIR} \
-    && curl -sSL "https://github.com/lat-opensource/lat/commit/27026fb60dc1707962539d8887ee4a9e4fb7d3ed.patch" | git apply
+    && git clone --depth=1 --recursive --branch master https://github.com/lat-opensource/lat ${WORKDIR}
 
 ENV USE_CCACHE=1
+ADD lat_loong64.patch /opt/lat_loong64.patch
 
 RUN --mount=type=cache,target=/root/.cache/ccache \
-    cd latxbuild && ./build-release-nw.sh
+    git apply /opt/lat_loong64.patch \
+    && sed -i 's@rm -rf@# rm -rf@g' latxbuild/build-release-nw.sh \
+    && cd latxbuild \
+    && ./build-release-nw.sh
 
 FROM ghcr.io/loong64/debian:trixie-slim
 ARG TARGETARCH
 
 WORKDIR /opt/dist
 
-COPY --from=build-lat /opt/lat/lat-Debian-nw /opt/dist/lat-Debian-nw
+COPY --from=build-lat /opt/lat/lat-Debian-nw.tar.gz /opt/dist/
 
-RUN tar -czf lat-Debian-nw.tar.gz lat-Debian-nw
+RUN sha256sum lat-Debian-nw.tar.gz > lat-Debian-nw.tar.gz.sha256sum
 
 VOLUME /dist
 

debian/lat_loong64.patch

@@ -0,0 +1,172 @@
+diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
+index 6750da5..2e16f0f 100644
+--- a/accel/tcg/translate-all.c
++++ b/accel/tcg/translate-all.c
+@@ -4607,6 +4607,7 @@ int shared_private_interpret(siginfo_t *info, ucontext_t *uc)
+         *(int64_t *)(mem_addr + 24) = UC_GET_LASX(&extctx, fd, 3, int64_t);
+         goto end;
+ #endif
++#ifndef CONFIG_LOONGARCH_NEW_WORLD
+     case 0xc0:
+         if (inst & (1<<21)) {
+             /*VLDREPL.W*/
+@@ -4634,6 +4635,7 @@ int shared_private_interpret(siginfo_t *info, ucontext_t *uc)
+             *((int8_t *)&UC_FREG(uc)[fd].__val32[i] + 3) = *(int8_t *)mem_addr;
+         }
+         goto end;
++#endif
+     case 0xb8: /* LDL.W */
+     case 0xb9: /* LDR.W */
+     case 0xba: /* LDL.D */
+diff --git a/include/loongarch-extcontext.h b/include/loongarch-extcontext.h
+index 461345e..3a6ae91 100644
+--- a/include/loongarch-extcontext.h
++++ b/include/loongarch-extcontext.h
+@@ -5,6 +5,8 @@
+  */
+ #ifndef LOONGARCH_EXTCONTEXT_H
+ #define LOONGARCH_EXTCONTEXT_H
++#include "config-host.h"
++
+ #if defined(CONFIG_LOONGARCH_NEW_WORLD) && defined(__loongarch__)
+ #include "qemu/osdep.h"
+ #include "asm/sigcontext.h"
+diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
+index db088ce..8612c75 100644
+--- a/include/qemu/osdep.h
++++ b/include/qemu/osdep.h
+@@ -27,15 +27,22 @@
+ #ifndef QEMU_OSDEP_H
+ #define QEMU_OSDEP_H
+ 
++#include "config-host.h"
++
+ /* arch dependent signal context retriev macros */
+ #if defined(__mips__)
+ #define UC_GR(uc) ((uc)->uc_mcontext.gregs)
+ #define UC_PC(uc) ((uc)->uc_mcontext.pc)
+ #elif defined(__loongarch__)
++#ifdef CONFIG_LOONGARCH_NEW_WORLD
+ #define UC_GR(uc) ((uc)->uc_mcontext.__gregs)
+ #define UC_PC(uc) ((uc)->uc_mcontext.__pc)
+-#define UC_FREG(uc) ((uc)->uc_mcontext.__fpregs)
+-#define UC_FCSR(uc) ((uc)->uc_mcontext.__fcsr)
++#else
++    #define UC_GR(uc) ((uc)->uc_mcontext.sc_regs)
++    #define UC_PC(uc) ((uc)->uc_mcontext.sc_pc)
++    #define UC_FREG(uc) ((uc)->uc_mcontext.__fpregs)
++    #define UC_FCSR(uc) ((uc)->uc_mcontext.__fcsr)
++#endif
+ #else
+ #error "unknown arch"
+ #endif
+diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
+index 76ae0b5..a46f6f6 100644
+--- a/linux-user/syscall_defs.h
++++ b/linux-user/syscall_defs.h
+@@ -1527,8 +1527,15 @@ struct target_winsize {
+ #include "termbits.h"
+ 
+ #define HUGETLB_FLAG_ENCODE_SHIFT   26
++
++#ifndef MAP_HUGE_2MB
+ #define MAP_HUGE_2MB     (21 << HUGETLB_FLAG_ENCODE_SHIFT)
++#endif
++
++#ifndef MAP_HUGE_1GB
+ #define MAP_HUGE_1GB     (30 << HUGETLB_FLAG_ENCODE_SHIFT)
++#endif
++
+ #define LEGACY_MAP_MASK (TARGET_MAP_SHARED \
+         | TARGET_MAP_PRIVATE \
+         | TARGET_MAP_FIXED \
+diff --git a/meson.build b/meson.build
+index a30002f..074aa3a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -17,9 +17,9 @@ cc = meson.get_compiler('c')
+ config_host = keyval.load(meson.current_build_dir() / 'config-host.mak')
+ enable_static = 'CONFIG_STATIC' in config_host
+ 
+-latx_version_h = vcs_tag(command : ['git', 'describe'],
++latx_version_h = vcs_tag(command : ['cat', 'VERSION'],
+                         fallback : 'unknown',
+-			input : 'linux-user/latx-version.h.in',
++                        input : 'linux-user/latx-version.h.in',
+                         output :'latx-version.h')
+ # Allow both shared and static libraries unless --enable-static
+ static_kwargs = enable_static ? {'static': true} : {}
+@@ -206,7 +206,10 @@ config_host_data.set('CONFIG_MALLOC_TRIM', has_malloc_trim)
+ lsb_release = find_program('lsb_release', required: false)
+ if lsb_release.found()
+   lsb_release_output = run_command('lsb_release', '-si').stdout().strip()
+-  if lsb_release_output == 'Loongnix'
++  if lsb_release_output == 'Debian'
++    config_host_data.set('HAVE_DRM_H', cc.has_header('libdrm/drm.h'))
++    config_host_data.set('IS_DEBIAN', 'true')
++  elif lsb_release_output == 'Loongnix'
+     config_host_data.set('HAVE_DRM_H', cc.has_header('libdrm/drm.h'))
+     config_host_data.set('IS_LOONGNIX', 'true')
+   elif lsb_release_output == 'Arch'
+diff --git a/target/i386/latx/context/myalign.c b/target/i386/latx/context/myalign.c
+index 62698d0..3695113 100644
+--- a/target/i386/latx/context/myalign.c
++++ b/target/i386/latx/context/myalign.c
+@@ -1,3 +1,4 @@
++#include "config-host.h"
+ #include "lsenv.h"
+ #include "myalign.h"
+ #include "elfloader.h"
+diff --git a/target/i386/latx/context/wrappedlibc.c b/target/i386/latx/context/wrappedlibc.c
+index 3cfe2ac..fa5b70c 100644
+--- a/target/i386/latx/context/wrappedlibc.c
++++ b/target/i386/latx/context/wrappedlibc.c
+@@ -1,3 +1,4 @@
++#include "config-host.h"
+ #define _LARGEFILE_SOURCE 1
+ #define _FILE_OFFSET_BITS 64
+ #include <stdlib.h>
+diff --git a/target/i386/latx/include/generated/wrappedlibctypes.h b/target/i386/latx/include/generated/wrappedlibctypes.h
+index 88c1867..92258aa 100644
+--- a/target/i386/latx/include/generated/wrappedlibctypes.h
++++ b/target/i386/latx/include/generated/wrappedlibctypes.h
+@@ -4,6 +4,8 @@
+ #ifndef __wrappedlibcTYPES_H_
+ #define __wrappedlibcTYPES_H_
+ 
++#include "config-host.h"
++
+ #ifndef LIBNAME
+ #error You should only #include this file inside a wrapped*.c file
+ #endif
+diff --git a/target/i386/latx/include/library_list.h b/target/i386/latx/include/library_list.h
+index f14793f..01638dd 100755
+--- a/target/i386/latx/include/library_list.h
++++ b/target/i386/latx/include/library_list.h
+@@ -2,6 +2,8 @@
+ #error Nope
+ #endif
+ 
++#include "config-host.h"
++
+ GO("libEGL.so.1", libegl)
+ #ifndef CONFIG_LOONGARCH_NEW_WORLD
+ GO("libdl.so.2", libdl)
+diff --git a/target/i386/latx/include/wrappedlibc_private.h b/target/i386/latx/include/wrappedlibc_private.h
+index 2b63178..f836a95 100644
+--- a/target/i386/latx/include/wrappedlibc_private.h
++++ b/target/i386/latx/include/wrappedlibc_private.h
+@@ -1,3 +1,4 @@
++#include "config-host.h"
+ #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA) && defined(GOS))
+ #error Meh...
+ #endif
+diff --git a/target/i386/latx/latx-config.c b/target/i386/latx/latx-config.c
+index 5a6d98f..aadcc68 100644
+--- a/target/i386/latx/latx-config.c
++++ b/target/i386/latx/latx-config.c
+@@ -1,3 +1,4 @@
++#include "config-host.h"
+ #include "common.h"
+ #include "diStorm/distorm.h"
+ #include "ir1.h"