diff --git a/bedrock-entry.sh b/bedrock-entry.sh index 1d789b0..67c6bc5 100755 --- a/bedrock-entry.sh +++ b/bedrock-entry.sh @@ -579,9 +579,10 @@ fi echo "Starting Bedrock server..." if [[ -f /usr/local/bin/box64 ]] && isTrue "${USE_BOX64:=false}" ; then exec mc-server-runner "${mcServerRunnerArgs[@]}" box64 ./"$SERVER" -elif [[ -x /usr/bin/FEXInterpreter ]] && isTrue "${USE_FEX:=true}" ; then +elif [[ -x /usr/bin/FEX ]] && isTrue "${USE_FEX:=true}" ; then # FEX-Emu (x86_64 on arm64): RootFS and emulator are baked into the image. # FEX_EMU_DIR holds the JIT/AOT caches — keep it on a volume for warm starts. + # FEX >= 2611: unified launcher is /usr/bin/FEX (FEXInterpreter was removed). export FEX_ROOTFS="${FEX_ROOTFS:-/opt/fex-emu-rootfs/rootfs}" export FEX_EMU_DIR="${FEX_EMU_DIR:-$HOME/.fex-emu}" mkdir -p "$FEX_EMU_DIR" diff --git a/build/setup-arm64 b/build/setup-arm64 index 8dd0b6f..320e857 100755 --- a/build/setup-arm64 +++ b/build/setup-arm64 @@ -9,18 +9,8 @@ fi EMULATOR="${EMULATOR:-fex}" apt-get update -if [ "$EMULATOR" = "box64" ] ; then - DEBIAN_FRONTEND=noninteractive apt-get install -y debian-keyring - - curl -L https://ryanfortner.github.io/box64-debs/box64.list -o /etc/apt/sources.list.d/box64.list - curl -L https://ryanfortner.github.io/box64-debs/KEY.gpg | gpg --dearmor | tee /etc/apt/trusted.gpg.d/box64-debs-archive-keyring.gpg - - apt-get update - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - "$BOX64_PACKAGE" \ - libjemalloc2 -else - # FEX-Emu: comes from the official PPA (arm64 builds), Ubuntu base required +if [ "$EMULATOR" = "fex" ] ; then + # FEX-Emu: official PPA (arm64 builds), Ubuntu base required DEBIAN_FRONTEND=noninteractive apt-get install -y \ software-properties-common \ squashfs-tools \ @@ -29,9 +19,12 @@ else add-apt-repository -y ppa:fex-emu/fex apt-get update - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - fex-emu \ - libjemalloc2 + + # fex-emu is a virtual package; pick the explicit variant matching the CPU. + # RK3588 (Cortex-A76) has ARMv8.2 features; fall back to armv8.0. + FEX_PKG="fex-emu-armv8.2" + apt-get install -y --no-install-recommends "$FEX_PKG" || FEX_PKG="fex-emu-armv8.0" + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends "$FEX_PKG" libjemalloc2 # Thunks are optional but speed up glibc-heavy servers DEBIAN_FRONTEND=noninteractive apt-get install -y fex-emu-thunks 2>/dev/null || true @@ -47,7 +40,18 @@ else mkdir -p /opt/fex-emu-rootfs unsquashfs -q -d /opt/fex-emu-rootfs/rootfs /tmp/fex-rootfs.sqsh rm -f /tmp/fex-rootfs.sqsh +else + # Box64 fallback + DEBIAN_FRONTEND=noninteractive apt-get install -y debian-keyring + + curl -L https://ryanfortner.github.io/box64-debs/box64.list -o /etc/apt/sources.list.d/box64.list + curl -L https://ryanfortner.github.io/box64-debs/KEY.gpg | gpg --dearmor | tee /etc/apt/trusted.gpg.d/box64-debs-archive-keyring.gpg + + apt-get update + DEBIAN_FRONTEND=noninteractive apt-get install -y \ + "$BOX64_PACKAGE" \ + libjemalloc2 fi apt-get clean -rm -rf /var/lib/apt/lists/* \ No newline at end of file +rm -rf /var/lib/apt/lists/*