Skip to content

Commit

Permalink
Fix armv6l packages naming
Browse files Browse the repository at this point in the history
  • Loading branch information
awawa-dev committed Feb 8, 2025
1 parent a68987c commit 2c2fa78
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
4 changes: 4 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ elif [[ "$CI_NAME" == 'linux' ]]; then
BUILD_OPTION="-DUSE_CCACHE_CACHING=OFF ${ARCHIVE_OPTION}"
cache_env="true"
fi

if [[ $DOCKER_IMAGE == *"armv6l"* ]] && [[ $CI_TYPE == "github_action" ]]; then
BUILD_OPTION="-DOVERRIDE_ARCHITECTURE=armv6l ${BUILD_OPTION}"
fi

echo "Build option: ${BUILD_OPTION}, ccache: ${cache_env}"

Expand Down
9 changes: 7 additions & 2 deletions cmake/packages.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,12 @@ endif()
SET ( CPACK_PACKAGE_NAME "HyperHDR" )
SET ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "HyperHDR is an open source ambient light implementation" )
SET ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md" )
SET ( CPACK_PACKAGE_FILE_NAME "HyperHDR-${HYPERHDR_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
if (OVERRIDE_ARCHITECTURE)
SET ( TARGET_CPU_ARCHITECTURE "${OVERRIDE_ARCHITECTURE}")
else()
SET ( TARGET_CPU_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}")
endif(OVERRIDE_ARCHITECTURE)
SET ( CPACK_PACKAGE_FILE_NAME "HyperHDR-${HYPERHDR_VERSION}-${CMAKE_SYSTEM_NAME}-${TARGET_CPU_ARCHITECTURE}")

SET ( CPACK_PACKAGE_CONTACT "[email protected]")
SET ( CPACK_PACKAGE_VENDOR "HyperHDR")
Expand All @@ -81,7 +86,7 @@ if(USE_STANDARD_INSTALLER_NAME AND UNIX AND NOT APPLE)
if (foundTag EQUAL -1)
string(CONCAT CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}" "~${DEBIAN_NAME_TAG}")
endif()
SET ( CPACK_PACKAGE_FILE_NAME "HyperHDR-${HYPERHDR_VERSION_MAJOR}.${HYPERHDR_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${CMAKE_SYSTEM_PROCESSOR}")
SET ( CPACK_PACKAGE_FILE_NAME "HyperHDR-${HYPERHDR_VERSION_MAJOR}.${HYPERHDR_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${TARGET_CPU_ARCHITECTURE}")
message("Package name: ${CPACK_PACKAGE_FILE_NAME}" )
endif()
endif()
Expand Down

0 comments on commit 2c2fa78

Please sign in to comment.