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 }} 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 }} 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 }} diff --git a/CMakeLists.txt b/CMakeLists.txt index d511950b3..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) - execute_process(COMMAND ${LSB_RELEASE_EXEC} -is 2>&1 + find_program(LSB_RELEASE_EXEC lsb_release REQUIRED) + execute_process(COMMAND ${LSB_RELEASE_EXEC} -is OUTPUT_VARIABLE DISTRO_NAME - OUTPUT_STRIP_TRAILING_WHITESPACE) - execute_process(COMMAND ${LSB_RELEASE_EXEC} -rs 2>&1 + 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}")