bugfix in linux RPM package generation

RenderKit · Mar 13, 2019 · e766297 · e766297
1 parent 59e474e
commit e766297
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/common/cmake/package.cmake b/common/cmake/package.cmake
@@ -254,15 +254,16 @@ ELSE()
     SET(CPACK_RPM_lib_POST_UNINSTALL_SCRIPT_FILE ${PROJECT_SOURCE_DIR}/common/cmake/rpm_ldconfig.sh)
     IF (EMBREE_TESTING_PACKAGE)
       ADD_TEST(NAME "BuildPackage" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PROJECT_SOURCE_DIR}/scripts/package_linux.sh
-        ${EMBREE_LIBRARY_NAME} ${EMBREE_VERSION} ${EMBREE_VERSION_MAJOR} ${EMBREE_SIGN_FILE})
+        ${EMBREE_ZIP_MODE} ${EMBREE_LIBRARY_NAME} ${EMBREE_VERSION} ${EMBREE_VERSION_MAJOR} ${EMBREE_SIGN_FILE})
     ENDIF()
   ELSE()
 
     SET(CPACK_GENERATOR TGZ)
     SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}.x86_64.linux")
     SET(CPACK_MONOLITHIC_INSTALL 1)
     IF (EMBREE_TESTING_PACKAGE)
-      ADD_TEST(NAME "BuildPackage" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PROJECT_SOURCE_DIR}/scripts/package_linux.sh ${EMBREE_ZIP_MODE} ${EMBREE_VERSION} ${EMBREE_SIGN_FILE})
+      ADD_TEST(NAME "BuildPackage" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PROJECT_SOURCE_DIR}/scripts/package_linux.sh
+        ${EMBREE_ZIP_MODE} ${EMBREE_LIBRARY_NAME} ${EMBREE_VERSION} ${EMBREE_VERSION_MAJOR} ${EMBREE_SIGN_FILE})
     ENDIF()
   ENDIF()
 

diff --git a/scripts/package_linux.sh b/scripts/package_linux.sh
@@ -40,10 +40,11 @@ function check_symbols
 }
 
 # read embree version
-EMBREE_LIBRARY_NAME=$1
-EMBREE_VERSION=$2
-EMBREE_VERSION_MAJOR=$3
-EMBREE_SIGN_FILE=$4
+EMBREE_ZIP_MODE=$1
+EMBREE_LIBRARY_NAME=$2
+EMBREE_VERSION=$3
+EMBREE_VERSION_MAJOR=$4
+EMBREE_SIGN_FILE=$5
 
 # create package
 make -j 16 preinstall
@@ -52,10 +53,10 @@ check_symbols lib${EMBREE_LIBRARY_NAME}.so GLIBCXX 3 4 11
 check_symbols lib${EMBREE_LIBRARY_NAME}.so CXXABI 1 3 0
 make -j 16 package
 
-if [ "$1" == "OFF" ]; then
+if [ "$EMBREE_ZIP_MODE" == "OFF" ]; then
 
   # sign all RPM files
-  if [ $# -eq 4 ]; then
+  if [ $# -eq 5 ]; then
     ${EMBREE_SIGN_FILE} embree${EMBREE_VERSION_MAJOR}-*-${EMBREE_VERSION}-*.rpm
   fi