diff options
| -rw-r--r-- | cmake/cpack.cmake | 7 | ||||
| -rw-r--r-- | cmake/debian/debian.cmake | 12 | ||||
| -rwxr-xr-x | contrib/debian/accel-ppp-init | 4 | ||||
| -rw-r--r-- | drivers/ipoe/CMakeLists.txt | 6 |
4 files changed, 17 insertions, 12 deletions
diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake index a7606e8c..5b180bf5 100644 --- a/cmake/cpack.cmake +++ b/cmake/cpack.cmake @@ -1,7 +1,7 @@ INCLUDE(InstallRequiredSystemLibraries) SET(CPACK_PACKAGE_VERSION_MAJOR "1") -SET(CPACK_PACKAGE_VERSION_MINOR "9") +SET(CPACK_PACKAGE_VERSION_MINOR "10") SET(CPACK_PACKAGE_VERSION_PATCH "0") SET(CPACK_PACKAGE_NAME "accel-ppp") @@ -27,4 +27,9 @@ IF(CPACK_TYPE STREQUAL Debian7) INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake) ENDIF(CPACK_TYPE STREQUAL Debian7) +IF(CPACK_TYPE STREQUAL Debian8) + SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.19), libssl1.0.0 (>= 1.0.1k), libpcre3 (>= 8.35)") + INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake) +ENDIF(CPACK_TYPE STREQUAL Debian8) + INCLUDE(CPack) diff --git a/cmake/debian/debian.cmake b/cmake/debian/debian.cmake index c02a4a41..858f053b 100644 --- a/cmake/debian/debian.cmake +++ b/cmake/debian/debian.cmake @@ -27,13 +27,13 @@ if (BUILD_DRIVER_ONLY) else (BUILD_DRIVER_ONLY) SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/conffiles") - if (CPACK_TYPE STREQUAL Debian7) - INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/accel-pppd/accel-ppp.conf DESTINATION /etc RENAME accel-ppp.conf.dist) - INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-ppp-init DESTINATION /etc/init.d RENAME accel-ppp) - INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-ppp-default DESTINATION /etc/default RENAME accel-ppp) - else (CPACK_TYPE STREQUAL Debian7) + if (CPACK_TYPE STREQUAL Debian6) INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/accel-pppd/accel-ppp.conf DESTINATION ${CMAKE_BINARY_DIR}/_CPack_Packages/Linux/DEB/${CPACK_PACKAGE_FILE_NAME}/etc RENAME accel-ppp.conf.dist) INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-ppp-init DESTINATION ${CMAKE_BINARY_DIR}/_CPack_Packages/Linux/DEB/${CPACK_PACKAGE_FILE_NAME}/etc/init.d RENAME accel-ppp) INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-ppp-default DESTINATION ${CMAKE_BINARY_DIR}/_CPack_Packages/Linux/DEB/${CPACK_PACKAGE_FILE_NAME}/etc/default RENAME accel-ppp) - endif (CPACK_TYPE STREQUAL Debian7) + else (CPACK_TYPE STREQUAL Debian6) + INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/accel-pppd/accel-ppp.conf DESTINATION /etc RENAME accel-ppp.conf.dist) + INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-ppp-init DESTINATION /etc/init.d RENAME accel-ppp) + INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-ppp-default DESTINATION /etc/default RENAME accel-ppp) + endif (CPACK_TYPE STREQUAL Debian6) endif (BUILD_DRIVER_ONLY) diff --git a/contrib/debian/accel-ppp-init b/contrib/debian/accel-ppp-init index cc625256..a7e2bc0d 100755 --- a/contrib/debian/accel-ppp-init +++ b/contrib/debian/accel-ppp-init @@ -2,8 +2,8 @@ # /etc/init.d/accel-pppd: set up the accel-ppp server ### BEGIN INIT INFO # Provides: accel-ppp -# Required-Start: $networking -# Required-Stop: $networking +# Required-Start: $remote_fs $syslog $network $time +# Required-Stop: $remote_fs $syslog $network # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 ### END INIT INFO diff --git a/drivers/ipoe/CMakeLists.txt b/drivers/ipoe/CMakeLists.txt index 14ac12eb..6f4f043a 100644 --- a/drivers/ipoe/CMakeLists.txt +++ b/drivers/ipoe/CMakeLists.txt @@ -14,6 +14,6 @@ ADD_CUSTOM_TARGET(ipoe_drv ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/driver/ipoe.ko ) - -INSTALL(CODE "EXECUTE_PROCESS(COMMAND make -C ${KDIR} M=${CMAKE_CURRENT_BINARY_DIR}/drivers/ipoe modules_install)") - +IF (NOT DEFINED CPACK_TYPE) + INSTALL(CODE "EXECUTE_PROCESS(COMMAND make -C ${KDIR} M=${CMAKE_CURRENT_BINARY_DIR}/drivers/ipoe modules_install)") +ENDIF() |