Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.1 -> main] before reading /etc/os-release make sure it exists #481

Merged
merged 3 commits into from
Jun 21, 2022
Merged

[3.1 -> main] before reading /etc/os-release make sure it exists #481

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b2da68
before reading /etc/os-release make sure it exists
spoonincode Jun 17, 2022
fc7e063
Merge pull request #417 from eosnetworkfoundation/check_os_release_ex…
spoonincode Jun 21, 2022
9dd0ff9
Merge remote-tracking branch 'origin/release/3.1.x' into check_os_rel…
spoonincode Jun 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ endif()

set(CPACK_PACKAGE_VERSION "${VERSION_FULL}")
set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${VERSION_FULL}")
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.9")
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.9" AND EXISTS /etc/os-release)
#if we're doing the build on Ubuntu or RHELish, add the platform version in to the package name
file(READ /etc/os-release OS_RELEASE LIMIT 4096)
if(OS_RELEASE MATCHES "\n?ID=\"?ubuntu" AND OS_RELEASE MATCHES "\n?VERSION_ID=\"?([0-9.]+)")
Expand Down