Skip to content

Makefile: use $LIBEXECDIR when installing bootupd - #1161

Merged
Rolv-Apneseth merged 1 commit into
coreos:mainfrom
Rolv-Apneseth:libexecdir
Sep 21, 2026
Merged

Rolv-Apneseth merged 1 commit into
coreos:mainfrom
Rolv-Apneseth:libexecdir

Conversation

@Rolv-Apneseth

Copy link
Copy Markdown
Member

The symlink creation used a hardcoded ../libexec/bootupd path, potentially breaking installs where LIBEXECDIR differs from ${PREFIX}/libexec. Use ln -srf with $(LIBEXECDIR) to compute the correct relative path.

Suggested by coderabbit in #1138 (review), seems reasonable but was unrelated to the change there.

@openshift-ci

openshift-ci Bot commented Sep 21, 2026

Copy link
Copy Markdown

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@coderabbitai

coderabbitai Bot commented Sep 21, 2026 •

Copy link
Copy Markdown

Review Change StackReview Change Stack

Understand this PR’s impact

Explore downstream dependencies and potential security impact with Blast Radius.

View blast radius →

Important

Review skipped

The saved review base belongs to an older reviewed commit. This saved history cannot establish the base for an incremental review. Comment @coderabbitai full review to establish a new review baseline. No full review was started, and the last reviewed checkpoint was preserved.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository: coreos/bootupd/.coderabbit.yaml

Review profile: CHILL

Plan: Advanced

Run ID: a73ea968-cdf5-4424-b035-1b67c071b0f8

📥 Commits

Reviewing files that changed from the base of the PR and between 0b4bebc and 04b2cc5.

📒 Files selected for processing (1)
  • .github/workflows/ci.yml

Included review availability: Your plan provides up to 2 included reviews per hour; 0 remain after this review.

📜 Recent review details
⏰ Context from checks skipped due to timeout. (27)
  • GitHub Check: testing-farm:fedora-rawhide-x86_64
  • GitHub Check: testing-farm:centos-stream-10-x86_64
  • GitHub Check: rpm-build:fedora-rawhide-x86_64
  • GitHub Check: rpm-build:centos-stream-10-x86_64
  • GitHub Check: testing-farm:fedora-rawhide-x86_64
  • GitHub Check: testing-farm:centos-stream-10-x86_64
  • GitHub Check: rpm-build:fedora-rawhide-x86_64
  • GitHub Check: rpm-build:centos-stream-10-x86_64
  • GitHub Check: rpm-build:fedora-rawhide-x86_64
  • GitHub Check: rpm-build:centos-stream-10-x86_64
  • GitHub Check: testing-farm:fedora-rawhide-x86_64
  • GitHub Check: bootc-e2e (ubuntu-24.04-arm, 0, 9)
  • GitHub Check: bootc-e2e (ubuntu-24.04, 0, 10)
  • GitHub Check: bootc-e2e (ubuntu-24.04-arm, 0, 10)
  • GitHub Check: bootc-e2e (ubuntu-24.04-arm, 1)
  • GitHub Check: bootc-e2e (ubuntu-24.04, 1)
  • GitHub Check: bootc-e2e (ubuntu-24.04, 0, 9)
  • GitHub Check: Build on ppc64le
  • GitHub Check: Tests, unstable toolchain (nightly)
  • GitHub Check: tmt-tests
  • GitHub Check: Tests (release), minimum supported toolchain
  • GitHub Check: Tests (release), stable toolchain
  • GitHub Check: Tests, unstable toolchain (beta)
  • GitHub Check: Lints, pinned toolchain
  • GitHub Check: Build on s390x
  • GitHub Check: Tests, stable toolchain
  • GitHub Check: testing-farm:centos-stream-10-x86_64
🔇 Additional comments (1)
.github/workflows/ci.yml (1)

47-48: LGTM!


📝 Walkthrough

Walkthrough

The install target now creates the bootupctl symlink with absolute paths. The CI VM boot-test setup now uses explicit apt-get commands to install its dependencies.

Changes

Build and CI updates

Layer / File(s) Summary
Create absolute bootupctl symlink
Makefile
The install target uses ln -srf with absolute paths derived from ${DESTDIR}$(LIBEXECDIR)/bootupd and ${DESTDIR}$(PREFIX)/bin/bootupctl.
Install VM boot-test dependencies
.github/workflows/ci.yml
The workflow uses apt-get update and apt-get install -y to install QEMU utilities, KVM, and OVMF.

Priority: ⬇️ Low

Estimated code review effort: 1 (Trivial) | ~2 minutes

Change: Bug fix

Suggested reviewers: johan-liebert1

🚥 Pre-merge checks | ✅ 5 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Title check ⚠️ Warning The title describes the main Makefile change and uses imperative mood without a trailing period. It does not fully follow the required format because the subsystem name Makefile is not lowercase. Use a lowercase subsystem name, such as makefile: use $LIBEXECDIR when installing bootupd. Keep the description lowercase and imperative.
✅ Passed checks (5 passed)
Check name Status Explanation
Description check ✅ Passed The description explains the hardcoded symlink path and the change to use LIBEXECDIR. It is related to the changeset and satisfies the lenient description requirement.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0…
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Commit Message Convention ✅ Passed Both commits in the reviewed range are non-merge commits and follow the required format. Their subjects are Makefile: use $LIBEXECDIR when installing bootupctl and `ci: apt-get update before trying …
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create a new PR

Comment @coderabbitai help to get the list of available commands.

@Rolv-Apneseth

Copy link
Copy Markdown
Member Author

bootc-e2e CI should be fixed by #1162

The symlink creation used a hardcoded ../libexec/bootupd path,
potentially breaking installs where LIBEXECDIR differs from
${PREFIX}/libexec. Use ln -srf with $(LIBEXECDIR) to compute the correct
relative path.
@Rolv-Apneseth
Rolv-Apneseth enabled auto-merge (rebase) September 21, 2026 17:53
@Rolv-Apneseth
Rolv-Apneseth merged commit 3ca1f3d into coreos:main Sep 21, 2026
19 of 22 checks passed
@Rolv-Apneseth
Rolv-Apneseth deleted the libexecdir branch September 22, 2026 08:03
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.

2 participants