Skip to content

Commit c4439f7

Browse files
committed
Fix armv6l packages naming 3
1 parent 90f38b1 commit c4439f7

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.github/workflows/push-master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
- name: Wake-up docker
8383
if: matrix.runner == 'ubuntu-24.04-arm'
8484
run: |
85-
(sudo systemctl start docker) || (echo "Retrying docker" && sleep 5 && sudo systemctl start docker)
85+
(sudo systemctl start docker) || (echo "Retrying docker" && sleep 5 && sudo systemctl start docker && sleep 5)
8686
8787
# checkout
8888
- uses: actions/checkout@v4.2.2

.github/workflows/upload-to-github-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
- name: Wake-up docker
8080
if: matrix.runner == 'ubuntu-24.04-arm'
8181
run: |
82-
(sudo systemctl start docker) || (echo "Retrying docker" && sleep 5 && sudo systemctl start docker)
82+
(sudo systemctl start docker) || (echo "Retrying docker" && sleep 5 && sudo systemctl start docker && sleep 5)
8383
8484
# checkout
8585
- uses: actions/checkout@v4.2.2

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ message( STATUS "CMake Version: ${CMAKE_VERSION}" )
99

1010
PROJECT(HyperHdr)
1111

12+
if (OVERRIDE_ARCHITECTURE)
13+
SET ( CMAKE_SYSTEM_PROCESSOR "${OVERRIDE_ARCHITECTURE}")
14+
endif(OVERRIDE_ARCHITECTURE)
1215

1316
set(OUR_CMAKE_MODULES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_modules)
1417
set(CMAKE_MODULE_PATH ${OUR_CMAKE_MODULES} ${CMAKE_MODULE_PATH})

cmake/packages.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ endif()
5656
SET ( CPACK_PACKAGE_NAME "HyperHDR" )
5757
SET ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "HyperHDR is an open source ambient light implementation" )
5858
SET ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md" )
59-
if (OVERRIDE_ARCHITECTURE)
60-
SET ( CMAKE_SYSTEM_PROCESSOR "${OVERRIDE_ARCHITECTURE}")
61-
endif(OVERRIDE_ARCHITECTURE)
6259
SET ( CPACK_PACKAGE_FILE_NAME "HyperHDR-${HYPERHDR_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
6360

6461
SET ( CPACK_PACKAGE_CONTACT "see_me_at@hyperhdr.eu")

0 commit comments

Comments
 (0)