From 09ec374eec19ccad84362824367ca47728f9c65d Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 11 Sep 2025 10:22:03 -0700 Subject: [PATCH] CMake: Remove CPack, completely unused --- CMakeLists.txt | 43 -------------------------------- Data/CMake/CPack/Description.txt | 3 --- Data/CMake/CPack/postinst | 18 ------------- Data/CMake/CPack/prerm | 17 ------------- Data/CMake/CPack/triggers | 1 - 5 files changed, 82 deletions(-) delete mode 100644 Data/CMake/CPack/Description.txt delete mode 100755 Data/CMake/CPack/postinst delete mode 100755 Data/CMake/CPack/prerm delete mode 100644 Data/CMake/CPack/triggers diff --git a/CMakeLists.txt b/CMakeLists.txt index a9369f574..651f06027 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -607,46 +607,3 @@ if (OVERRIDE_VERSION STREQUAL "detect") else() set(GIT_DESCRIBE_STRING "FEX-${OVERRIDE_VERSION}") endif() - -# Parse the version here -# Change something like `FEX-2106.1-76-` in to a list -string(REPLACE "-" ";" DESCRIBE_LIST ${GIT_DESCRIBE_STRING}) - -# Extract the `2106.1` element -list(GET DESCRIBE_LIST 1 DESCRIBE_LIST) - -# Change `2106.1` in to a list -string(REPLACE "." ";" DESCRIBE_LIST ${DESCRIBE_LIST}) - -# Calculate list size -list(LENGTH DESCRIBE_LIST LIST_SIZE) - -# Pull out the major version -list(GET DESCRIBE_LIST 0 FEX_VERSION_MAJOR) - -# Minor version only exists if there is a .1 at the end -# eg: 2106 versus 2106.1 -if (LIST_SIZE GREATER 1) - list(GET DESCRIBE_LIST 1 FEX_VERSION_MINOR) -endif() - -# Package creation -set (CPACK_GENERATOR "DEB") -set (CPACK_PACKAGE_NAME fex-emu) -set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${GIT_DESCRIBE_STRING}_${CMAKE_SYSTEM_PROCESSOR}") -set (CPACK_PACKAGE_CONTACT "FEX-Emu Maintainers ") -set (CPACK_PACKAGE_VERSION_MAJOR "${FEX_VERSION_MAJOR}") -set (CPACK_PACKAGE_VERSION_MINOR "${FEX_VERSION_MINOR}") -set (CPACK_PACKAGE_VERSION_PATCH "${FEX_VERSION_PATCH}") -set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/Data/CMake/CPack/Description.txt") - -# Debian defines -set (CPACK_DEBIAN_PACKAGE_DEPENDS "libc6, libstdc++6, libepoxy0, libsdl2-2.0-0, libegl1, libx11-6, squashfuse") -set (CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA - "${CMAKE_CURRENT_SOURCE_DIR}/Data/CMake/CPack/postinst;${CMAKE_CURRENT_SOURCE_DIR}/Data/CMake/CPack/prerm;${CMAKE_CURRENT_SOURCE_DIR}/Data/CMake/CPack/triggers") -if (CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64") - # binfmt_misc conflicts with qemu-user-static - # We also only install binfmt_misc on aarch64 hosts - set (CPACK_DEBIAN_PACKAGE_CONFLICTS "${CPACK_DEBIAN_PACKAGE_CONFLICTS}, qemu-user-static") -endif() -include (CPack) diff --git a/Data/CMake/CPack/Description.txt b/Data/CMake/CPack/Description.txt deleted file mode 100644 index 24f731362..000000000 --- a/Data/CMake/CPack/Description.txt +++ /dev/null @@ -1,3 +0,0 @@ -x86 and x86-64 Linux emulator - -FEX allows you to run x86 applications on ARM64 Linux devices. It offers broad compatibility with both 32-bit and 64-bit binaries, and it can be used alongside Wine/Proton to play Windows games. diff --git a/Data/CMake/CPack/postinst b/Data/CMake/CPack/postinst deleted file mode 100755 index cf3afe986..000000000 --- a/Data/CMake/CPack/postinst +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -set -e -update_binfmt() { - # Check for update-binfmts - command -v update-binfmts >/dev/null || return 0 - - # Setup binfmt_misc - update-binfmts --import FEX-x86 - update-binfmts --import FEX-x86_64 -} - -# Install FEXInterpreter hardlink -# Needs to be done before setting up binfmt_misc -ln -f /usr/bin/FEXLoader /usr/bin/FEXInterpreter - -if [ $(uname -m) = 'aarch64' ]; then - update_binfmt -fi diff --git a/Data/CMake/CPack/prerm b/Data/CMake/CPack/prerm deleted file mode 100755 index bea875cea..000000000 --- a/Data/CMake/CPack/prerm +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -set -e -update_binfmt() { - # Check for update-binfmts - command -v update-binfmts >/dev/null || return 0 - - # Uninstall - update-binfmts --unimport FEX-x86 - update-binfmts --unimport FEX-x86_64 -} - -if [ $(uname -m) = 'aarch64' ]; then - update_binfmt -fi - -# Remove FEXInterpreter hardlink -unlink /usr/bin/FEXInterpreter diff --git a/Data/CMake/CPack/triggers b/Data/CMake/CPack/triggers deleted file mode 100644 index dd8660367..000000000 --- a/Data/CMake/CPack/triggers +++ /dev/null @@ -1 +0,0 @@ -activate-noawait ldconfig