From bc2b1a247e1a48d25250118d91f651050a8542f0 Mon Sep 17 00:00:00 2001 From: Torsten Wierschin Date: Fri, 9 Oct 2026 15:26:07 +0000 Subject: [PATCH] Fix: Pass RELEASE_BUILD=ON to CMake in debian/rules for release scope builds - Modified create_debian_rules() to accept cmake_flags parameter - Updated build_deb() to pass -DRELEASE_BUILD=ON when release_scope=True - This ensures LtsUtilsGuiDds is properly excluded from release builds Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- make_rpm_ubuntu26.py | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/make_rpm_ubuntu26.py b/make_rpm_ubuntu26.py index 21f64ca..7b6090c 100755 --- a/make_rpm_ubuntu26.py +++ b/make_rpm_ubuntu26.py @@ -241,14 +241,24 @@ def create_debian_changelog(deb_dir, project_name, version, build_number): info(f"Created {changelog_file}") -def create_debian_rules(deb_dir): - """Create debian/rules file""" - rules_content = """#!/usr/bin/make -f +def create_debian_rules(deb_dir, cmake_flags=""): + """Create debian/rules file + + Args: + deb_dir: debian directory path + cmake_flags: Additional CMake flags to pass + """ + # Build CMake flags string + cmake_opts = "-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr" + if cmake_flags: + cmake_opts = f"{cmake_opts} {cmake_flags}" + + rules_content = f"""#!/usr/bin/make -f %: dh $@ --buildsystem=cmake --builddirectory=build override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr + dh_auto_configure -- {cmake_opts} override_dh_auto_build: dh_auto_build --parallel @@ -302,7 +312,16 @@ def build_deb(source_dir, output_dir, project_name, version, build_number, cmake # Create debian control files create_debian_control(deb_dir, project_name, version, build_number, cmake_flags) create_debian_changelog(deb_dir, project_name, version, build_number) - create_debian_rules(deb_dir) + + # Add RELEASE_BUILD=ON for release scope builds + deb_cmake_flags = cmake_flags + if release_scope: + if deb_cmake_flags: + deb_cmake_flags = f"{deb_cmake_flags} -DRELEASE_BUILD=ON" + else: + deb_cmake_flags = "-DRELEASE_BUILD=ON" + + create_debian_rules(deb_dir, deb_cmake_flags) # Create debian/source/format source_dir_path = os.path.join(deb_dir, "source")