build: [FIX] Debian packaging

Author: martinspinler

CMakeLists.txt

@@ -43,7 +43,6 @@ add_subdirectory(utils)
 add_subdirectory(pynfb)
 add_subdirectory(python/nfb-tools)
 
-include(python/nfb-tools/nfb-tools.cmake)
 
 configure_file(package/preinst.in package/preinst @ONLY)
 configure_file(package/postinst.in package/postinst @ONLY)
@@ -132,12 +131,20 @@ set(CPACK_DEBIAN_PACKAGE_VERSION        "${CPACK_PACKAGE_VERSION}")
 set(CPACK_DEBIAN_PACKAGE_RELEASE        "${GIT_VERSION_DEBRELEASE}")
 set(CPACK_DEBIAN_FILE_NAME              "${CPACK_DEBIAN_PACKAGE_NAME}-${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}.deb")
 
+set(CPACK_DEBIAN_MAIN_PACKAGE_NAME      "${CPACK_PACKAGE_NAME}")
+set(CPACK_DEBIAN_MAIN_PACKAGE_VERSION   "${CPACK_PACKAGE_VERSION}")
+set(CPACK_DEBIAN_MAIN_PACKAGE_NAME      "${CPACK_PACKAGE_NAME}")
+set(CPACK_DEBIAN_MAIN_FILE_NAME         "${CPACK_DEBIAN_PACKAGE_NAME}-${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}.deb")
+
 set(CPACK_DEBIAN_DEBUGTOOLS_PACKAGE_NAME "nfb-framework-debug")
 set(CPACK_DEBIAN_DEBUGTOOLS_FILE_NAME "nfb-framework-debug-${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}.deb")
 set(CPACK_DEBIAN_PYTHON_PACKAGE_NAME "python3-nfb")
 set(CPACK_DEBIAN_PYTHON_FILE_NAME "python3-nfb-${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}.deb")
 string(JOIN ", " CPACK_DEBIAN_PACKAGE_DEPENDS ${DEB_DEP_LIST})
 string(JOIN ", " CPACK_DEBIAN_PYTHON_PACKAGE_DEPENDS ${DEB_PYTHON_DEP_LIST})
+
+include(python/nfb-tools/nfb-tools.cmake)
+
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS      ON)
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
 	"${CMAKE_CURRENT_BINARY_DIR}/package/preinst"

pynfb/CMakeLists.txt

@@ -27,11 +27,14 @@ add_custom_command(
 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/setup_timestamp
 	COMMAND ${Python_EXECUTABLE} ARGS ${SETUP_PY} install --root ${SETUP_OUTPUT}
 	COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/setup_timestamp
-	DEPENDS ${SETUP_DEPS})
+	DEPENDS ${SETUP_DEPS}
+)
 
-add_custom_target(target ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setup_timestamp)
+add_custom_target(python_nfb ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setup_timestamp)
 
 install(
 	DIRECTORY ${SETUP_OUTPUT}/
 	DESTINATION "/" # FIXME may cause issues with other cpack generators
-	COMPONENT python)
+	COMPONENT python
+	USE_SOURCE_PERMISSIONS
+)

python/nfb-tools/nfb-tools.cmake

@@ -1,20 +1,23 @@
-set(RPM_PYTHON_DEP_LIST
+set(RPM_PYTHONTOOLS_DEP_LIST
 	python3-fdt
 	python3-nfb
 	python3-yaml
 #    python3-ofm
 )
 
-set(DEB_PYTHON_DEP_LIST
-#	python3-nfb
-#	python3-yaml
+set(DEB_PYTHONTOOLS_DEP_LIST
+	python3-nfb
+	python3-yaml
 #    python-ofm
 )
 
 set(CPACK_RPM_pythontools_PACKAGE_NAME  "python3-nfb-tools")
 
-string(JOIN " " CPACK_RPM_pythontools_PACKAGE_REQUIRES ${RPM_PYTHON_DEP_LIST})
-string(JOIN ", " CPACK_DEBIAN_pythontools_PACKAGE_DEPENDS ${DEB_PYTHON_DEP_LIST})
+string(JOIN " " CPACK_RPM_pythontools_PACKAGE_REQUIRES ${RPM_PYTHONTOOLS_DEP_LIST})
+
+string(JOIN ", " CPACK_DEBIAN_PYTHONTOOLS_PACKAGE_DEPENDS ${DEB_PYTHONTOOLS_DEP_LIST})
+set(CPACK_DEBIAN_PYTHONTOOLS_PACKAGE_NAME "python3-nfb-tools")
+set(CPACK_DEBIAN_PYTHONTOOLS_FILE_NAME "python3-nfb-tools-${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}.deb")
 #set(RPM_PYTHON_DEP_LIST
 #	ofm
 #)