Skip to content

Add release version and Modify how to get kernel info #1

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

Open
Hanfee wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add release version and Modify how to get kernel info #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84dd6a4
Add release version and Modify how to get kernel info
Dec 17, 2019
9f49187
Fix rpm can't rpm release version
Dec 18, 2019
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
20 changes: 16 additions & 4 deletions cmake/packages.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,16 @@ set (KERNEL_RELEASE ${CENTOS_VERSION})
else ()
set (KERNEL_RELEASE "unknown-arch")
endif ()

execute_process (
COMMAND ${CMAKE_MODULE_PATH}/release.sh
RESULT_VARIABLE RV
OUTPUT_VARIABLE OS_VERSION
)
if (RV EQUAL 0)
set (OS_RELEASE ${OS_VERSION})
else ()
set (OS_RELEASE "unknown")
endif ()
execute_process (
COMMAND ${CMAKE_MODULE_PATH}/git_checkin_count.sh
RESULT_VARIABLE RV
Expand All @@ -21,7 +30,7 @@ if (RV EQUAL 0)
else ()
set (GIT_CHECKIN_COUNT "1")
endif ()

set (PACKAGE_RELEASE "1")
set (PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
set (PACKAGE_VERSION "0.1.0.${GIT_CHECKIN_COUNT}")
set (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
Expand All @@ -43,13 +52,16 @@ set (CPACK_PACKAGE_ARCHITECTURE "${KERNEL_RELEASE}")
set (CPACK_PACKAGE_VERSION_MAJOR "${PACKAGE_VERSION_MAJOR}")
set (CPACK_PACKAGE_VERSION_MINOR "${PACKAGE_VERSION_MINOR}")
set (CPACK_PACKAGE_VERSION_PATCH "${PACKAGE_VERSION_PATCH}")
set (CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}-${PACKAGE_VERSION}-${CPACK_PACKAGE_ARCHITECTURE}")
set (CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}-${PACKAGE_VERSION}-${PACKAGE_RELEASE}${CPACK_PACKAGE_ARCHITECTURE}")
set (CPACK_OUTPUT_FILE_PREFIX packages)
set (CPACK_PACKAGE_VERSION "${PACKAGE_VERSION}")
set (CPACK_RPM_PACKAGE_RELEASE "${PACKAGE_RELEASE}${OS_VERSION}")

#message(STATUS "XXXXXXXXXXXXXXX PACKAGE_SOVERSION=" ${PACKAGE_SOVERSION})
#message(STATUS "XXXXXXXXXXXXXXX PACKAGE_NAME=" ${PACKAGE_NAME})
#message(STATUS "XXXXXXXXXXXXXXX CPACK_PACKAGE_FILE_NAME=" ${CPACK_PACKAGE_FILE_NAME})

#set (CPACK_PACKAGE_RELEASE "${PACKAGE_VERSION}-${PACKAGE_RELEASE}${OS_VERSION}")
set (CPACK_PACKAGE_VENDOR "WUHAN")
set (CPACK_GENERATOR "RPM;TGZ;DEB")
set (CPACK_PACKAGING_INSTALL_PREFIX "/home/s/safe")

Expand Down
1 change: 1 addition & 0 deletions cmake/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
echo -n "$(/usr/lib/rpm/redhat/dist.sh)"
4 changes: 1 addition & 3 deletions cmake/rpm_kernel_release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
EL=`uname -r | awk -F. '{print $4}'`
ARCH=`uname -r | awk -F. '{print $5}'`
echo -n ${EL}.${ARCH}
echo -n $(/usr/lib/rpm/redhat/dist.sh --dist).$(uname -m)