Skip to content

Override license paths instead of resetting them when merging#45

Merged
astolcenburg merged 1 commit into
rdkcentral:mainfrom
astolcenburg:main
Jun 22, 2026
Merged

Override license paths instead of resetting them when merging#45
astolcenburg merged 1 commit into
rdkcentral:mainfrom
astolcenburg:main

Conversation

@astolcenburg

Copy link
Copy Markdown
Contributor

This avoids generating .wh.* files by umoci that are unreadable by rsync.

Copilot AI review requested due to automatic review settings June 17, 2026 13:17

Copilot AI left a comment

Copy link
Copy Markdown

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 updates how PackageBuilder merges root filesystems to avoid producing OCI whiteout entries (.wh.*) during repacks, which can later cause issues when syncing/extracting with rsync.

Changes:

  • Replace the “reset paths” deletion step with an “override paths” resync approach during merge.
  • Switch the primary rsync call from shell-string execution to argv-based execution (execv).
  • Add a resync() helper that re-copies specified subtrees with different rsync strategies.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread bolt/src/PackageBuilder.cjs
Comment thread bolt/src/PackageBuilder.cjs Outdated
Comment thread bolt/src/PackageBuilder.cjs Outdated

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 2 comments.

Comment thread bolt/src/PackageBuilder.cjs
Comment thread bolt/src/PackageBuilder.cjs Outdated
Comment thread bolt/src/PackageBuilder.cjs Outdated
BunioFH added a commit to rdkcentral/meta-bolt-wpe that referenced this pull request Jun 19, 2026
to be removed after
rdkcentral/bolt-tools#45
is resolved

Change-Id: I59bee9260b3515aafdad77fccd0ecdbb233fb1d5
BunioFH added a commit to rdkcentral/meta-bolt-wpe that referenced this pull request Jun 22, 2026
to be removed after
rdkcentral/bolt-tools#45
is resolved

Change-Id: I5b2fb0900f8dd32d4b39cbf9ba7f2982dab90ca5
@astolcenburg astolcenburg requested a review from Copilot June 22, 2026 11:24

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

Comment thread bolt/src/PackageBuilder.cjs Outdated
Comment thread bolt/src/PackageBuilder.cjs
This avoids generating .wh.* files by umoci that are unreadable by rsync.

Ref: #RDKEAPPRT-861

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

@astolcenburg astolcenburg merged commit 0dba320 into rdkcentral:main Jun 22, 2026
4 checks passed
@github-actions github-actions Bot locked and limited conversation to collaborators Jun 22, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants