Makefile: add another build for deb package

[sergei-lb]

Add another build target for deb packages to fix the package naming issue when we use alien to convert from rpm to deb.

Issue: LBM1-41980

[coderabbitai]

📝 Walkthrough

Walkthrough

The pull request consolidates the Makefile's discovery client build process by merging the distribution-specific pattern rule discovery-client-debs-% into a single discovery-client-debs target. This unified target defines a VERSION variable internally and executes a single RPM build, followed by DEB conversion using version-aware filenames. Dependencies for discovery-packages-el8 and discovery-packages-el9 are updated to reference the generic discovery-client-debs target instead of their distribution-specific counterparts. The RPM selection in the install-discovery-client-packages-% rule is also refined to match only el-versioned RPM files rather than capturing all discovery-client RPMs.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 inconclusive)

Check name	Status	Explanation	Resolution
Title check	❓ Inconclusive	The title 'Makefile: add another build for deb package' is vague and generic, lacking specificity about the actual issue being fixed or the nature of the build target changes.	We should consider a more descriptive title such as 'Makefile: fix DEB package naming to remove mixed EL labels' to better communicate the core issue we're addressing.

✅ Passed checks (4 passed)

Check name	Status	Explanation
Description check	✅ Passed	The description directly addresses the changeset by referencing the package naming issue when using alien to convert RPM to DEB, and cites the linked issue LBM1-41980.
Linked Issues check	✅ Passed	The changes successfully address the core objective of fixing mixed EL labels in Debian packages by consolidating the build process into a single versioned target that ensures consistent naming.
Out of Scope Changes check	✅ Passed	All changes in the Makefile are directly related to fixing the DEB package naming issue described in LBM1-41980; no unrelated modifications are present.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment
• Commit unit tests in branch sergei/fix_deb_package_name

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[coderabbitai]

Actionable comments posted: 1

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)

Makefile (1)

170-170: Update .PHONY declaration to reference the new target.

The .PHONY declaration still references discovery-client-debs-% which was removed in this PR. We should update it to reference discovery-client-debs instead.

🔧 Proposed fix

-.PHONY: discovery-rpms-% discovery-client-debs-%\
+.PHONY: discovery-rpms-% discovery-client-debs\
 	discovery-packages-el8 \
 	discovery-packages-el9 \
 	install-discovery-client-packages-% \

🤖 Fix all issues with AI agents

In @Makefile:
- Around line 145-148: The Makefile references WORKSPACE_TOP in the
discovery-client-debs target (and earlier at line ~118) but never defines it;
add a safe default fallback such as setting WORKSPACE_TOP ?= $(shell pwd) near
the top of the Makefile (or explicitly document WORKSPACE_TOP as a required env
var in your README/build docs) so RPMOUT_DIR and the chown invocation in the
discovery-client-debs target operate on correct paths; update the Makefile to
use the fallback and/or add a brief comment explaining the env requirement.

🧹 Nitpick comments (2)

Makefile (2)

150-152: Consider parallel build safety for the shared discovery-client-debs target.

Both discovery-packages-el8 and discovery-packages-el9 now depend on the same discovery-client-debs target. If we invoke make -j discovery-packages-el8 discovery-packages-el9 (parallel builds), both could execute discovery-client-debs concurrently, potentially causing race conditions with rpmbuild and alien operating on the same output files.

We might want to add an order-only prerequisite or document that these targets shouldn't be built in parallel.

---

154-158: Consider making the RPM pattern more specific to prevent cross-version contamination.

Line 158 uses discovery-client*el*.rpm which would match both el8 and el9 RPMs if both somehow exist in the directory. While discovery-rpms-% cleans before building, we could be more explicit by using the $* variable (which expands to el8 or el9):

-	$(Q)cp ${RPMOUT_DIR}/x86_64/discovery-client*el*.rpm $(COMPONENT_PATH)/
+	$(Q)cp ${RPMOUT_DIR}/x86_64/discovery-client*$*.rpm $(COMPONENT_PATH)/

This ensures we copy only the RPM matching the specific target we're building, reducing the risk of cross-version contamination.

♻️ Proposed change

-	$(Q)cp ${RPMOUT_DIR}/x86_64/discovery-client*el*.rpm $(COMPONENT_PATH)/
+	$(Q)cp ${RPMOUT_DIR}/x86_64/discovery-client*$*.rpm $(COMPONENT_PATH)/

📜 Review details

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

• Jira integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 18b6767 and 2e2b88a.

📒 Files selected for processing (1)

• Makefile

[coderabbitai]

⚠️ Potential issue | 🟠 Major

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Search for WORKSPACE_TOP definition or export across the codebase

echo "=== Searching for WORKSPACE_TOP variable definitions ==="
echo ""

# Search in Makefiles and related build files
echo "1. Make variable assignments (Makefiles, *.mk):"
rg -n 'WORKSPACE_TOP\s*[:?]?=' --type=make || echo "No matches found"

echo ""
echo "2. Shell exports:"
rg -n 'export\s+WORKSPACE_TOP' || echo "No matches found"

echo ""
echo "3. Any WORKSPACE_TOP references (to understand usage pattern):"
rg -n 'WORKSPACE_TOP' --type=make -B 2 -A 2 | head -50

echo ""
echo "4. Check root Makefile for variable definitions:"
head -100 Makefile | grep -E 'WORKSPACE|VERSION|RELEASE' || echo "No matches in first 100 lines"

Repository: LightBitsLabs/discovery-client

Length of output: 1219

---

WORKSPACE_TOP variable must be defined or documented as an environment requirement.

We should ensure that WORKSPACE_TOP is either defined within the Makefile or clearly documented as an environment variable requirement. Currently, this variable is referenced in two places (lines 118 and 148) but is never defined in the Makefile itself. Without it being set in the build environment, the RPMOUT_DIR path and the chown command will operate on incorrect paths, causing the build to fail or produce unintended results.

Consider either:

• Adding WORKSPACE_TOP ?= $(shell pwd) or similar fallback definition to the Makefile, or
• Documenting this as a required environment variable in the build instructions/README

🤖 Prompt for AI Agents

In @Makefile around lines 145 - 148, The Makefile references WORKSPACE_TOP in
the discovery-client-debs target (and earlier at line ~118) but never defines
it; add a safe default fallback such as setting WORKSPACE_TOP ?= $(shell pwd)
near the top of the Makefile (or explicitly document WORKSPACE_TOP as a required
env var in your README/build docs) so RPMOUT_DIR and the chown invocation in the
discovery-client-debs target operate on correct paths; update the Makefile to
use the fallback and/or add a brief comment explaining the env requirement.