From e2fa5aad061531d1b5fa694b6dcf3fbfaa348f52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Stensg=C3=A5rd?= Date: Tue, 23 Sep 2025 13:19:04 +0200 Subject: [PATCH 1/5] .github/workflows/build-debian: install lsb-release for cmake --- .github/workflows/build-debian.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-debian.yml b/.github/workflows/build-debian.yml index 8caa558a5..e706d197d 100644 --- a/.github/workflows/build-debian.yml +++ b/.github/workflows/build-debian.yml @@ -66,7 +66,8 @@ jobs: glslang-dev \ glslang-tools \ spirv-tools \ - glslc + glslc \ + lsb-release - name: Install Docs Dependencies if: ${{ matrix.docs }} From 93eb5abc742d4ffbd3f176b35781d3cf5767aba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Stensg=C3=A5rd?= Date: Tue, 23 Sep 2025 13:41:31 +0200 Subject: [PATCH 2/5] CMakeLists: execute lsb_release correctly --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d511950b3..2246da368 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -324,10 +324,10 @@ set(CPACK_STRIP_FILES TRUE) # Figure out what distro version we're on if(LINUX) find_program(LSB_RELEASE_EXEC lsb_release) - execute_process(COMMAND ${LSB_RELEASE_EXEC} -is 2>&1 + execute_process(COMMAND ${LSB_RELEASE_EXEC} -is OUTPUT_VARIABLE DISTRO_NAME OUTPUT_STRIP_TRAILING_WHITESPACE) - execute_process(COMMAND ${LSB_RELEASE_EXEC} -rs 2>&1 + execute_process(COMMAND ${LSB_RELEASE_EXEC} -rs OUTPUT_VARIABLE DISTRO_VER OUTPUT_STRIP_TRAILING_WHITESPACE) From eed317b83d4de66b7a54ed6ce50c71663a5f633e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Stensg=C3=A5rd?= Date: Tue, 23 Sep 2025 14:24:58 +0200 Subject: [PATCH 3/5] .github/workflows/build-arch: install lsb-release for cmake --- .github/workflows/build-arch.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-arch.yml b/.github/workflows/build-arch.yml index 00204330b..4b61e9deb 100644 --- a/.github/workflows/build-arch.yml +++ b/.github/workflows/build-arch.yml @@ -54,7 +54,8 @@ jobs: hidapi \ ccache \ ninja \ - vulkan-swrast + vulkan-swrast \ + lsb-release - name: Install Docs Dependencies if: ${{ matrix.docs }} From 1b87c916a22219990086f1c1650eff6794f58a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Stensg=C3=A5rd?= Date: Tue, 23 Sep 2025 14:29:04 +0200 Subject: [PATCH 4/5] .github/workflows/build-fedora: install lsb-release for cmake --- .github/workflows/build-fedora.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-fedora.yml b/.github/workflows/build-fedora.yml index a67aa429c..97dc50aa6 100644 --- a/.github/workflows/build-fedora.yml +++ b/.github/workflows/build-fedora.yml @@ -53,7 +53,8 @@ jobs: ninja-build \ fedora-packager \ rpmdevtools \ - mesa-vulkan-drivers + mesa-vulkan-drivers \ + lsb-release - name: Install Docs Dependencies if: ${{ matrix.docs }} From f871b0e66f05556f30698918326790458076b9fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Stensg=C3=A5rd?= Date: Tue, 23 Sep 2025 14:56:24 +0200 Subject: [PATCH 5/5] CMakeLists: fail loudly on lsb_release errors --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2246da368..c2222f6cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -323,13 +323,15 @@ set(CPACK_STRIP_FILES TRUE) # Figure out what distro version we're on if(LINUX) - find_program(LSB_RELEASE_EXEC lsb_release) + find_program(LSB_RELEASE_EXEC lsb_release REQUIRED) execute_process(COMMAND ${LSB_RELEASE_EXEC} -is OUTPUT_VARIABLE DISTRO_NAME - OUTPUT_STRIP_TRAILING_WHITESPACE) + OUTPUT_STRIP_TRAILING_WHITESPACE + COMMAND_ERROR_IS_FATAL ANY) execute_process(COMMAND ${LSB_RELEASE_EXEC} -rs OUTPUT_VARIABLE DISTRO_VER - OUTPUT_STRIP_TRAILING_WHITESPACE) + OUTPUT_STRIP_TRAILING_WHITESPACE + COMMAND_ERROR_IS_FATAL ANY) message(STATUS "Linux distribution target for packaging: name ${DISTRO_NAME}, version ${DISTRO_VER}")