diff options
| author | Denys Fedoryshchenko <denys.f@collabora.com> | 2026-10-28 20:47:22 +0200 |
|---|---|---|
| committer | Denys Fedoryshchenko <denys.f@collabora.com> | 2026-10-28 20:50:54 +0200 |
| commit | 2fa7676c2d01f5757db99463a7ae4ab28841570d (patch) | |
| tree | 535c9b8a3ec2cec5e368d2b1e0aba08c96b004d4 /cmake | |
| parent | 69cfe9cc7c03f663bcbc430291bc3a9460e433ba (diff) | |
| download | accel-ppp-2fa7676c2d01f5757db99463a7ae4ab28841570d.tar.gz accel-ppp-2fa7676c2d01f5757db99463a7ae4ab28841570d.zip | |
cmake: include PPPoSEQ in Debian and RPM package installs
Add the missing PPPoSEQ install rules and standalone driver metadata. Supply the running kernel release as the default RPM module destination. Extend the rootless install regression to verify Debian/CentOS packaging names, staged module paths, and exclusion after disabling the build flag.
Validation: CTest passes; generated full and standalone DEBs contain ppposeq.ko and have the expected package names. RPM install rules were staged and checked; an RPM archive was not built because rpmbuild is unavailable.
Signed-off-by: Denys Fedoryshchenko <denys.f@collabora.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/centos/centos.cmake | 18 | ||||
| -rw-r--r-- | cmake/debian/debian.cmake | 11 |
2 files changed, 29 insertions, 0 deletions
diff --git a/cmake/centos/centos.cmake b/cmake/centos/centos.cmake index a0dcd279..00cd0c6a 100644 --- a/cmake/centos/centos.cmake +++ b/cmake/centos/centos.cmake @@ -1,6 +1,14 @@ SET(CPACK_PACKAGING_INSTALL_PREFIX "/usr") SET(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}) +if (NOT DEFINED CENTOS_KDIR) + execute_process( + COMMAND uname -r + OUTPUT_VARIABLE CENTOS_KDIR + OUTPUT_STRIP_TRAILING_WHITESPACE + ) +endif () + if (BUILD_DRIVER_ONLY) if (BUILD_IPOE_DRIVER) SET(CPACK_PACKAGING_INSTALL_PREFIX "/") @@ -22,3 +30,13 @@ else (BUILD_DRIVER_ONLY) INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/accel-pppd/accel-ppp.conf DESTINATION /etc RENAME accel-ppp.conf.dist) endif (BUILD_DRIVER_ONLY) +if (BUILD_PPPOSEQ_DRIVER) + if (BUILD_DRIVER_ONLY) + SET(CPACK_PACKAGING_INSTALL_PREFIX "/") + SET(CPACK_PACKAGE_NAME "accel-ppp-ppposeq-kmod") + SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "accel-ppp PPPoSEQ kernel module") + SET(CPACK_RPM_PACKAGE_REQUIRES "") + endif () + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/drivers/ppposeq/driver/ppposeq.ko DESTINATION /lib/modules/${CENTOS_KDIR}/extra) +endif (BUILD_PPPOSEQ_DRIVER) + diff --git a/cmake/debian/debian.cmake b/cmake/debian/debian.cmake index 89ab9993..1b6ab8ce 100644 --- a/cmake/debian/debian.cmake +++ b/cmake/debian/debian.cmake @@ -31,6 +31,17 @@ if (BUILD_VLAN_MON_DRIVER) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/drivers/vlan_mon/driver/vlan_mon.ko DESTINATION /lib/modules/${MODULES_KDIR}/extra) endif (BUILD_VLAN_MON_DRIVER) +if (BUILD_PPPOSEQ_DRIVER) + if (BUILD_DRIVER_ONLY) + SET(CPACK_PACKAGING_INSTALL_PREFIX "/") + SET(CPACK_PACKAGE_NAME "accel-ppp-ppposeq-kmod") + SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "accel-ppp PPPoSEQ kernel module") + SET(CPACK_DEBIAN_PACKAGE_DEPENDS "") + SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian-kmod/postinst") + endif () + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/drivers/ppposeq/driver/ppposeq.ko DESTINATION /lib/modules/${MODULES_KDIR}/extra) +endif (BUILD_PPPOSEQ_DRIVER) + if (NOT BUILD_DRIVER_ONLY) SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/conffiles") |