Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

boost/1.87.0 package update #36440

Merged
merged 3 commits into from
Dec 13, 2024

Conversation

octo-sts[bot]
Copy link
Contributor

@octo-sts octo-sts bot commented Dec 11, 2024

Automated package update - patches were failing to apply.
These changes look to be in the latest release, so we don't need to cherry-pick them anymore.


@octo-sts octo-sts bot added request-version-update request for a newer version of a package automated pr labels Dec 11, 2024
Copy link
Contributor Author

octo-sts bot commented Dec 11, 2024

Gen AI suggestions to solve the build error:

Based on the build error output, I can provide a specific analysis and solution:

• Detected Error: "Reversed (or previously applied) patch detected! [...] Skipping patch. 4 out of 4 hunks ignored -- saving rejects to file add_path.cpp.rej"

• Error Category: Build Configuration

• Failure Point: Patch application step in the pipeline, specifically when trying to patch ./tools/bcp/add_path.cpp

• Root Cause Analysis: The patch is being rejected because either:

  1. The patch has already been applied
  2. The patch is in reverse format
  3. The patch doesn't match the source code version

• Suggested Fix:

  1. Remove or update the patch application section in the pipeline:
  # Comment out or remove the existing patch section
  # - runs: |
  #     cd ./tools/bcp
  #     patch -p1 < ../../c98516b5b76e9132eba78a399af9c95ec8d23bd4.patch
  #     patch -p1 < ../../cd21e9b4a749a77c24facf2da44f01e032c40842.patch
  1. If the patches are still needed, update them for Boost 1.87.0:
  - runs: |
      cd ./tools/bcp
      patch -p1 --force < ../../c98516b5b76e9132eba78a399af9c95ec8d23bd4.patch || true
      patch -p1 --force < ../../cd21e9b4a749a77c24facf2da44f01e032c40842.patch || true

• Explanation: The patches were likely created for an older version of Boost and are no longer compatible with version 1.87.0. Since Boost 1.87.0 is a recent release, the fixes from these patches may have already been incorporated upstream.

• Additional Notes:

• References:

@mamccorm mamccorm force-pushed the wolfictl-950533c4-a0d4-4d46-bb86-ff4861f900ff branch from adcf70a to da4c08c Compare December 12, 2024 01:33
Copy link
Contributor Author

octo-sts bot commented Dec 12, 2024

Gen AI suggestions to solve the build error:

• Detected Error: "Reversed (or previously applied) patch detected! Assume -R? [n]" followed by "4 out of 4 hunks ignored -- saving rejects to file add_path.cpp.rej"

• Error Category: Build Configuration

• Failure Point: Patch application step in the pipeline

• Root Cause Analysis: The patch file for add_path.cpp appears to be either:

  1. Already applied to the source
  2. In reverse order
  3. No longer compatible with the current version

• Suggested Fix:

  1. Remove or modify the patch application step:
  - runs: |
      cd ./tools/bcp
      # Comment out or remove problematic patch
      # patch -p1 < ../../c98516b5b76e9132eba78a399af9c95ec8d23bd4.patch
      patch -p1 < ../../cd21e9b4a749a77c24facf2da44f01e032c40842.patch
  1. Or update the patch file for version 1.87.0:
  • Get the current version of add_path.cpp
  • Generate a new patch against 1.87.0
  • Update the patch file reference in the melange.yaml

• Explanation: The error indicates that the patch system detected the changes may have already been incorporated into the source code in version 1.87.0, or the patch needs to be updated for compatibility. Since Boost 1.87.0 is a recent release, it's likely that the original fixes have been merged upstream.

• Additional Notes:

  • The original patch was likely created for an older Boost version
  • Worth checking the Boost 1.87.0 changelog to see if these changes were incorporated
  • Consider reviewing the bcp tool's changes in the 1.87.0 release
  • May need to generate new patches if the fixes are still needed

• References:

…ures. These changes look to be in the latest release

Signed-off-by: Mark McCormick <[email protected]>
@octo-sts octo-sts bot added the bincapz/pass bincapz/pass Bincapz (aka. malcontent) scan didn't detect any CRITICALs on the scanned packages. label Dec 12, 2024
@mamccorm mamccorm requested a review from a team December 12, 2024 14:51
@mamccorm mamccorm enabled auto-merge (squash) December 12, 2024 14:51
boost.yaml Show resolved Hide resolved
@mamccorm mamccorm self-assigned this Dec 12, 2024
@mamccorm mamccorm merged commit 12c2c3c into main Dec 13, 2024
14 checks passed
@mamccorm mamccorm deleted the wolfictl-950533c4-a0d4-4d46-bb86-ff4861f900ff branch December 13, 2024 17:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automated pr bincapz/pass bincapz/pass Bincapz (aka. malcontent) scan didn't detect any CRITICALs on the scanned packages. manual/review-needed request-version-update request for a newer version of a package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants