支持上传yum源(https://repo.geedge.net/pulp/content/7/x86_64/stable/tsg)

rpm中增加changelog信息

3 files changed, 52 insertions, 20 deletions

diff --git a/cmake/Package.cmake b/cmake/Package.cmake
index 69bc509..edb4258 100644
--- a/cmake/Package.cmake
+++ b/cmake/Package.cmake
@@ -1,41 +1,59 @@
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(CPACK_PACKAGE_NAME "${PROJECT_NAME}-debug")
+    set(MY_RPM_NAME_PREFIX "${lib_name}-debug")
 else()
-    set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
+    set(MY_RPM_NAME_PREFIX "${lib_name}")
 endif()
 
-message(STATUS "Package: ${CPACK_PACKAGE_NAME}")
+message(STATUS "Package: ${MY_RPM_NAME_PREFIX}")
 
 set(CPACK_PACKAGE_VECDOR "MESA")
 set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}.${VERSION_BUILD}")
 set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+set(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_BUILD}")
+execute_process(COMMAND bash -c "echo -ne \"`uname -r | awk -F'.' '{print $5\".\"$6\".\"$7}'`\"" OUTPUT_VARIABLE SYSTEM_VERSION)
 
-set(CPACK_COMPONENTS_ALL devel)
-set(CPACK_RPM_PACKAGE_DEBUG 1)
-set(CPACK_RPM_COMPONENT_INSTALL OFF)
-set(CPACK_RPM_DEVEL_FILE_NAME "${PROJECT_NAME}-devel.rpm")
-set(CPACK_RPM_DEVEL_DEBUGINFO_FILE_NAME "${PROJECT_NAME}-devel-debuginfo.rpm")
+execute_process(COMMAND sh changelog.sh WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/cmake)
+SET(CPACK_RPM_CHANGELOG_FILE ${PROJECT_SOURCE_DIR}/cmake/changelog.txt)
 
 # RPM Build
 set(CPACK_GENERATOR "RPM")
-set(CPACK_RPM_AUTO_GENERATED_FILE_NAME ON)
-set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
 set(CPACK_RPM_PACKAGE_VENDOR "MESA")
-set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
-set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
-set(CPACK_RPM_DEBUGINFO_PACKAGE ON)
+set(CPACK_RPM_PACKAGE_AUTOREQPROV "yes")
+set(CPACK_RPM_PACKAGE_RELEASE_LIBRARY "on")
+set(CPACK_RPM_DEBUGINFO_PACKAGE "on")
+set(CPACK_RPM_PACKAGE_DEBUG 1)
+
+set(CPACK_RPM_COMPONENT_INSTALL ON)
+set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
+set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP)
+set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop")
+
+set(CPACK_COMPONENT_LIBRARY_REQUIRED TRUE)
+set(CPACK_RPM_LIBRARY_PACKAGE_NAME ${MY_RPM_NAME_PREFIX})
+set(CPACK_RPM_LIBRARY_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+set(CPACK_RPM_LIBRARY_DEBUGINFO_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+
+set(CPACK_COMPONENT_LIBRARY_GROUP "library")
+set(CPACK_COMPONENT_PROFILE_GROUP "library")
+
+set(CPACK_COMPONENT_HEADER_REQUIRED TRUE)
+set(CPACK_RPM_HEADER_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-devel")
+set(CPACK_RPM_HEADER_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+set(CPACK_RPM_HEADER_DEBUGINFO_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+set(CPACK_COMPONENT_HEADER_GROUP "header")
+
+set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARY_PACKAGE_NAME})
+set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME})
+
+set(CPACK_COMPONENTS_ALL LIBRARY HEADER PROFILE)
 
 
 set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}")
 
 # Must uninstall the debug package before install release package
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(CPACK_RPM_PACKAGE_CONFLICTS "${PROJECT_NAME}-debug")
-else()
-    set(CPACK_RPM_PACKAGE_CONFLICTS ${PROJECT_NAME})
-    #    set(CPACK_STRIP_FILES TRUE)
-endif()
+set(CPACK_RPM_PACKAGE_CONFLICTS ${MY_RPM_NAME_PREFIX})
 
+#    set(CPACK_STRIP_FILES TRUE)
 include(CPack)
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index b7d6110..752f20f 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -1,3 +1,4 @@
+
 # Using autorevision.sh to generate version information
 
 set(__SOURCE_AUTORESIVISION ${CMAKE_SOURCE_DIR}/autorevision.sh)
@@ -37,7 +38,16 @@ set(VERSION_BUILD "${VCS_SHORT_HASH}")
 # print information
 message(STATUS "Version: ${VERSION}-${VERSION_BUILD}")
 
+if(NOT DEFINE_GIT_VERSION)
+    option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to OFF" OFF)
+
 set(GIT_VERSION
     "${VERSION}-${CMAKE_BUILD_TYPE}-${VERSION_BUILD}-${VCS_BRANCH}-${VCS_TAG}-${VCS_DATE}")
 string(REGEX REPLACE "[-:+/\\.]" "_" GIT_VERSION ${GIT_VERSION})
-add_definitions(-DGIT_VERSION=${GIT_VERSION})
+
+if(DEFINE_GIT_VERSION)
+    add_definitions(-DGIT_VERSION=${GIT_VERSION})
+    option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to OFF" ON)
+endif()
+
+endif()
diff --git a/cmake/changelog.sh b/cmake/changelog.sh
new file mode 100644
index 0000000..7d8bf7f
--- /dev/null
+++ b/cmake/changelog.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+branch=`git status | grep branch | awk '{print $NF}'`
+git log --branches=$branch --no-merges --date=local --show-signature --pretty="* %ad %an %ae %nhash: %H%ncommit:%n%B"  | awk -F"-" '{print "- "$0}' | sed 's/- \*/\*/g' | sed 's/- $//g' | sed 's/-/  -/g' | sed 's/[0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\}//g' > changelog.txt