deb: distro-specific parameters for dpkg-deb

asherikov · Nov 27, 2024 · 86baf5b · 86baf5b
1 parent 29ace23
commit 86baf5b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/ccws/make/install.mk b/ccws/make/install.mk
@@ -54,6 +54,9 @@ install_ccws_deps_jammy: install_ccws_deps_ros2
 		python3-rosdep \
 		python3-rospkg
 
+install_ccws_deps_noble: install_ccws_deps_jammy
+	#ubuntu24
+
 
 bp_install_build:
 	echo "CCWS/bp_install_build: ${BUILD_PROFILE}"

diff --git a/ccws/profiles/build/deb/targets.mk b/ccws/profiles/build/deb/targets.mk
@@ -36,9 +36,21 @@ private_deb_pack: assert_PKG_arg_must_be_specified private_dep_resolve private_d
 	# generate package
 	mkdir -p "${CCWS_ARTIFACTS_DIR}"
 	rm -f "${CCWS_ARTIFACTS_DIR}/${CCWS_PKG_FULL_NAME}.deb"
-	# TODO: --threads-max= (since 1.21.9)
+	time ${MAKE} private_dpkg_deb_${OS_DISTRO_BUILD}
+
+private_dpkg_deb_bionic:
+	time dpkg-deb --root-owner-group --build "${CCWS_INSTALL_DIR_BUILD_ROOT}" "${CCWS_ARTIFACTS_DIR}/${CCWS_PKG_FULL_NAME}.deb"
+
+private_dpkg_deb_focal: private_dpkg_deb_bionic
+	#
+
+private_dpkg_deb_jammy:
 	time dpkg-deb -Zzstd -z9 --root-owner-group --build "${CCWS_INSTALL_DIR_BUILD_ROOT}" "${CCWS_ARTIFACTS_DIR}/${CCWS_PKG_FULL_NAME}.deb"
 
+private_dpkg_deb_noble: private_dpkg_deb_jammy
+	# TODO: --threads-max= (since 1.21.9)
+
+
 private_deb_version_hash: assert_PKG_arg_must_be_specified
 	mkdir -p ${WORKSPACE_DIR}/build/version_hash
 	${MAKE_QUIET} private_info_with_deps \