From bd5e8269493027c2a0a2e74a1cb34cf9de277f3d Mon Sep 17 00:00:00 2001 From: wangyitian Date: Fri, 9 Jul 2021 14:49:26 +0800 Subject: [PATCH 1/2] fixed: rpm install error by conflicts --- cmake/packages.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/packages.cmake b/cmake/packages.cmake index 6543c3f..55749ae 100644 --- a/cmake/packages.cmake +++ b/cmake/packages.cmake @@ -52,5 +52,7 @@ set (CPACK_OUTPUT_FILE_PREFIX packages) set (CPACK_GENERATOR "RPM;TGZ;DEB") set (CPACK_PACKAGING_INSTALL_PREFIX "/home/s/safe") +set (CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST "/home/s" "/home/s/include" "/home/s/lib" "/home/s/safe" + "/home/s/safe/bin" "/home/s/safe/lib" "/home/s/safe/include") From 745e97feedcf7caec9dd20f36d12cbfd35e0c3fe Mon Sep 17 00:00:00 2001 From: wangyitian Date: Fri, 9 Jul 2021 14:50:59 +0800 Subject: [PATCH 2/2] fmt rpm release name, like safe-mpic-0.1.0.102-1.el7.x86_64.rpm --- cmake/packages.cmake | 3 ++- cmake/rpm_kernel_release.sh | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmake/packages.cmake b/cmake/packages.cmake index 55749ae..f03d179 100644 --- a/cmake/packages.cmake +++ b/cmake/packages.cmake @@ -24,6 +24,7 @@ endif () set (PACKAGE_NAME "${CMAKE_PROJECT_NAME}") set (PACKAGE_VERSION "0.1.0.${GIT_CHECKIN_COUNT}") +set (PACKAGE_RELEASE "1") set (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set (PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") set (PACKAGE_BUGREPORT "https://github.com/Qihoo360/mpic/issues") @@ -43,7 +44,7 @@ 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) #message(STATUS "XXXXXXXXXXXXXXX PACKAGE_SOVERSION=" ${PACKAGE_SOVERSION}) diff --git a/cmake/rpm_kernel_release.sh b/cmake/rpm_kernel_release.sh index bcd1fb0..96d878a 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 | awk -F '.' '{print $2}').$(uname -m)