Skip to content

Update package script #2

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
wangyitian89 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update package script #2

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
bd5e826
fixed: rpm install error by conflicts
Jul 9, 2021
745e97f
fmt rpm release name, like safe-mpic-0.1.0.102-1.el7.x86_64.rpm
Jul 9, 2021
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
5 changes: 4 additions & 1 deletion cmake/packages.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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})
Expand All @@ -52,5 +53,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")


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 | awk -F '.' '{print $2}').$(uname -m)