Merge branch 'revert' into 'master'

Revert "Add configuration for building manticore-extra meta package" See merge request manticoresearch/columnar!14
manticoresoftware · Oct 4, 2022 · a372193 · a372193
2 parents ffea83e + 7277109
commit a372193
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 35 deletions.
diff --git a/cmake/CommonInfo.cmake b/cmake/CommonInfo.cmake
@@ -27,10 +27,3 @@ set ( CPACK_RPM_PACKAGE_VERSION "${PROJECT_VERSION}_${GIT_TIMESTAMP_ID}.${GIT_CO
 
 set ( CPACK_PACKAGE_NAME "manticore-columnar-lib" )
 set ( CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}" )
-
-set ( CPACK_META_PACKAGE_NAME "manticore-extra")
-set ( CPACK_EXECUTOR_PACKAGE_NAME "manticore-executor")
-set ( CPACK_EXECUTOR_PACKAGE_VERSION "0.1.0")
-set ( CPACK_COMPONENT_GROUP_META_DISPLAY_NAME "Metapackage" )
-set ( CPACK_COMPONENT_META_DISPLAY_NAME "${CPACK_META_PACKAGE_NAME} meta-package" )
-set ( CPACK_COMPONENT_META_DESCRIPTION "${CPACK_META_PACKAGE_NAME} is a group package that installs Manticore Columnar Lib and Manticore Executor." )
diff --git a/cmake/builds/CommonDeb.cmake b/cmake/builds/CommonDeb.cmake
@@ -4,7 +4,7 @@ cmake_minimum_required ( VERSION 3.17 )
 set ( CPACK_PACKAGING_INSTALL_PREFIX "/usr" )
 set ( CPACK_GENERATOR DEB )
 set ( CPACK_DEBIAN_FILE_NAME DEB-DEFAULT )
-set ( CPACK_DEB_COMPONENT_INSTALL ON )
+set ( CPACK_DEB_COMPONENT_INSTALL OFF )
 set ( CPACK_DEBIAN_DEBUGINFO_PACKAGE ON )
 set ( CPACK_DEBIAN_PACKAGE_SECTION misc )
 set ( CPACK_DEBIAN_PACKAGE_PRIORITY optional )
@@ -14,16 +14,3 @@ set ( CPACK_DEBIAN_PACKAGE_SUGGESTS "manticore (>= 3.6.1)" )
 if (NOT disable_shlideps)
 	set ( CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON )
 endif ()
-
-set ( CPACK_DEBIAN_COLUMNAR_PACKAGE_NAME "${CPACK_PACKAGE_NAME}" )
-set ( CPACK_DEBIAN_COLUMNAR_PACKAGE_DEPENDS "")
-set ( CPACK_DEBIAN_COLUMNAR_PACKAGE_SECTION common )
-
-set ( CPACK_DEBIAN_META_PACKAGE_NAME "${CPACK_META_PACKAGE_NAME}" )
-set ( CPACK_DEBIAN_META_PACKAGE_DEPENDS "${CPACK_PACKAGE_NAME} (= ${CPACK_PACKAGE_VERSION}), ${CPACK_EXECUTOR_PACKAGE_NAME} (= ${CPACK_EXECUTOR_PACKAGE_VERSION})" )
-#set ( CPACK_DEBIAN_META_PACKAGE_ARCHITECTURE all )
-set ( CPACK_DEBIAN_META_PACKAGE_DEBUG OFF )
-set ( CPACK_DEBIAN_META_PACKAGE_SECTION metapackages )
-
-get_cmake_property ( CPACK_COMPONENTS_ALL COMPONENTS )
-list ( APPEND CPACK_COMPONENTS_ALL "columnar" "meta" )
diff --git a/cmake/builds/CommonRpm.cmake b/cmake/builds/CommonRpm.cmake
@@ -19,20 +19,7 @@ set ( CPACK_RPM_PACKAGE_GROUP "Applications/Internet" )
 set ( CPACK_RPM_PACKAGE_AUTOREQ ON )
 set ( CPACK_RPM_PACKAGE_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR} )
 
-set ( CPACK_RPM_COMPONENT_INSTALL ON )
+set ( CPACK_RPM_COMPONENT_INSTALL OFF )
 set ( CPACK_RPM_INSTALL_WITH_EXEC ON )
 set ( CPACK_RPM_DEBUGINFO_PACKAGE ON )
 set ( CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX "/tmp" )
-
-set ( CPACK_RPM_COLUMNAR_PACKAGE_NAME "${CPACK_PACKAGE_NAME}" )
-set ( CPACK_RPM_COLUMNAR_PACKAGE_DEPENDS "")
-set ( CPACK_RPM_COLUMNAR_PACKAGE_SECTION common )
-
-set ( CPACK_RPM_META_PACKAGE_NAME "${CPACK_META_PACKAGE_NAME}" )
-set ( CPACK_RPM_META_PACKAGE_REQUIRES "${CPACK_PACKAGE_NAME} = ${MYVER}, ${CPACK_EXECUTOR_PACKAGE_NAME} = ${CPACK_EXECUTOR_PACKAGE_VERSION}" )
-set ( CPACK_RPM_META_PACKAGE_OBSOLETES "manticore-all" )
-set ( CPACK_RPM_META_BUILD_SOURCE_DIRS_PREFIX OFF )
-set ( CPACK_RPM_META_DEBUGINFO_PACKAGE OFF )
-
-get_cmake_property ( CPACK_COMPONENTS_ALL COMPONENTS )
-list ( APPEND CPACK_COMPONENTS_ALL "columnar" "meta" )