Skip to content

HTCONDOR-3712 cmake should only set -DLINUX=1, not the full kernel#4500

Merged
timtheisen merged 1 commit into
mainfrom
V25_12-HTCONDOR-3712-dash-d-linux-reproducibility
May 25, 2026
Merged

HTCONDOR-3712 cmake should only set -DLINUX=1, not the full kernel#4500
timtheisen merged 1 commit into
mainfrom
V25_12-HTCONDOR-3712-dash-d-linux-reproducibility

Conversation

@GregThain

Copy link
Copy Markdown
Member

version We don't use the kernl version, and it breaks repoduciility.

<Insert PR description here, and leave checklist below for code review.>

HTCondor Pull Request Checklist for internal reviewers

  • Verify that (GitHub thinks) the merge is clean. If it isn't, and you're confident you can resolve the conflicts, do so. Otherwise, send it back to the original developer.
  • Verify that the related Jira ticket exists and has a target version number and that it is correct.
  • Verify that the Jira ticket is in review status and is assigned to the reviewer.
  • Verify that the Jira ticket (HTCONDOR-xxx) is mentioned at the beginning of the title. Edit it, if not
  • Verify that the branch destination of the PR matches the target version of the ticket
  • Check for correctness of change
  • Check for regression test(s) of new features and bugfixes (if the feature doesn't require root)
  • Check for documentation, if needed (documentation build logs)
  • Check for version history, if needed
  • Check BaTLab dashboard for successful build (https://batlab-ap2001.chtc.wisc.edu/results/workspace.php) and test for either the PR or a workspace build by the developer that has the Jira ticket as a comment.
  • Check that each commit message references the Jira ticket (HTCONDOR-xxx)

After the above

  • Hit the merge button if the pull request is approved and it is not a security patch (security changes require 2 additional reviews)
  • If the pull request is approved, take the ticket out of review state
  • Assign JIRA Ticket back to the developer

version We don't use the kernl version, and it breaks repoduciility.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR improves build reproducibility by stopping CMake from embedding the host kernel version into the OS preprocessor definition (e.g., avoiding -DLINUX="LINUX_6.8.0-...") and instead defining only the OS macro as enabled (e.g., -DLINUX=1).

Changes:

  • Replace the OS preprocessor definition from a kernel-version string to a simple numeric define (1) in the CMake configuration step.

@timtheisen timtheisen left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Thank you!

@timtheisen timtheisen merged commit 24bff6a into main May 25, 2026
28 checks passed
@timtheisen timtheisen deleted the V25_12-HTCONDOR-3712-dash-d-linux-reproducibility branch May 25, 2026 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants