diff options
| author | Kozlov Dmitry <dima@server> | 2011-05-30 16:21:30 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <dima@server> | 2011-05-30 16:21:30 +0400 |
| commit | 4497c1bae58e5920a250df95abb959d4b3d980b4 (patch) | |
| tree | 2d33ee7b4ae7dd1ba59be80220db3232ea1f736c /cmake | |
| parent | 6dd6ad03bb7d9a9b687f2c3468dfdc2d102a0dda (diff) | |
| download | accel-ppp-4497c1bae58e5920a250df95abb959d4b3d980b4.tar.gz accel-ppp-4497c1bae58e5920a250df95abb959d4b3d980b4.zip | |
1.3.6 release
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/cpack.cmake | 12 | ||||
| -rw-r--r-- | cmake/debian/debian.cmake | 3 | ||||
| -rwxr-xr-x | cmake/debian/postinst | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake index 10b8e32f..24060530 100644 --- a/cmake/cpack.cmake +++ b/cmake/cpack.cmake @@ -2,7 +2,7 @@ INCLUDE(InstallRequiredSystemLibraries) SET(CPACK_PACKAGE_VERSION_MAJOR "1") SET(CPACK_PACKAGE_VERSION_MINOR "3") -SET(CPACK_PACKAGE_VERSION_PATCH "5") +SET(CPACK_PACKAGE_VERSION_PATCH "6") SET(CPACK_PACKAGE_NAME "accel-ppp") SET(CPACK_PACKAGE_CONTACT "Dmitry Kozlov <xeb@mail.ru>") @@ -12,14 +12,14 @@ SET(CPACK_PACKAGE_VENDOR "Dmitry Kozlov") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") -IF(CPACK_TYPE STREQUAL Debian) +IF(CPACK_TYPE STREQUAL Debian5) SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.7), libssl0.9.8 (>= 0.9.8), libpcre3 (>= 7.6)") INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake) -ENDIF(CPACK_TYPE STREQUAL Debian) +ENDIF(CPACK_TYPE STREQUAL Debian5) -IF(CPACK_TYPE STREQUAL Ubuntu) - SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.12.1), libssl0.9.8 (>= 0.9.8), libpcre3 (>= 8.02), libnl2 (>= 1.99)") +IF(CPACK_TYPE STREQUAL Debian6) + SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.11.2), libssl0.9.8 (>= 0.9.8), libpcre3 (>= 8.02), libnl2 (>= 1.99)") INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake) -ENDIF(CPACK_TYPE STREQUAL Ubuntu) +ENDIF(CPACK_TYPE STREQUAL Debian6) INCLUDE(CPack) diff --git a/cmake/debian/debian.cmake b/cmake/debian/debian.cmake index b7bd0291..0fcc2d55 100644 --- a/cmake/debian/debian.cmake +++ b/cmake/debian/debian.cmake @@ -10,7 +10,7 @@ if (BUILD_DRIVER_ONLY) SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "accel-pptp kernel module") SET(CPACK_DEBIAN_PACKAGE_DEPENDS "") SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian-kmod/postinst") - INSTALL(DIRECTORY lib/modules/${DEBIAN_KDIR}/extra) + #INSTALL(DIRECTORY lib/modules/${DEBIAN_KDIR}/extra) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/driver/driver/pptp.ko DESTINATION lib/modules/${DEBIAN_KDIR}/extra) #SET(CPACK_DEBIAN_PACKAGE_DEPENDS "linux-image (= ${LINUX_IMAGE})") else (BUILD_DRIVER_ONLY) @@ -21,4 +21,5 @@ else (BUILD_DRIVER_ONLY) 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 (BUILD_DRIVER_ONLY) diff --git a/cmake/debian/postinst b/cmake/debian/postinst index a039b4f4..5d516cd2 100755 --- a/cmake/debian/postinst +++ b/cmake/debian/postinst @@ -2,7 +2,7 @@ chmod +x /etc/init.d/accel-ppp -mkdir /var/log/accel-ppp &> /dev/null -mkdir /var/run/accel-ppp &> /dev/null +mkdir /var/log/accel-ppp > /dev/null 2>&1 +mkdir /var/run/accel-ppp > /dev/null 2>&1 exit 0 |