diff --git a/cmake/packages.cmake b/cmake/packages.cmake index 6543c3f..dd25f7c 100644 --- a/cmake/packages.cmake +++ b/cmake/packages.cmake @@ -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 @@ -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}") @@ -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") diff --git a/cmake/release.sh b/cmake/release.sh new file mode 100644 index 0000000..3d12412 --- /dev/null +++ b/cmake/release.sh @@ -0,0 +1 @@ +echo -n "$(/usr/lib/rpm/redhat/dist.sh)" diff --git a/cmake/rpm_kernel_release.sh b/cmake/rpm_kernel_release.sh index bcd1fb0..df8c4ef 100755 --- a/cmake/rpm_kernel_release.sh +++ b/cmake/rpm_kernel_release.sh @@ -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)