Skip to content

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Dec 9, 2024

I would like to backport this fix for the mac build.

I had to move the code to another file, the code is the same, though.
"8326947: Minimize MakeBase.gmk" is not in 21, which moved the code to
a new file.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8342858 needs maintainer approval
  • JDK-8336498 needs maintainer approval

Issues

  • JDK-8336498: [macos] [build]: install-file macro may run into permission denied error (Bug - P4 - Approved)
  • JDK-8342858: Make target mac-jdk-bundle fails on chmod command (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/1210/head:pull/1210
$ git checkout pull/1210

Update a local copy of the PR:
$ git checkout pull/1210
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/1210/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1210

View PR using the GUI difftool:
$ git pr show -t 1210

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/1210.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 9, 2024

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Dec 9, 2024

@GoeLin This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8336498: [macos] [build]: install-file macro may run into permission denied error
8342858: Make target mac-jdk-bundle fails on chmod command

Reviewed-by: lucy

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 17 new commits pushed to the master branch:

  • 7b2a675: 8341820: Check return value of hcreate_r
  • 21b76f3: 8345296: AArch64: VM crashes with SIGILL when prctl is disallowed
  • 29c1188: 8314909: tools/jpackage/windows/Win8282351Test.java fails with java.lang.AssertionError: Expected [0]. Actual [1618]:
  • a021113: 8320916: jdk/jfr/event/gc/stacktrace/TestParallelMarkSweepAllocationPendingStackTrace.java failed with "OutOfMemoryError: GC overhead limit exceeded"
  • e7111b2: 8346108: [21u][BACKOUT] 8337994: [REDO] Native memory leak when not recording any events
  • 814566b: 8343100: Consolidate EmptyFolderTest and EmptyFolderPackageTest jpackage tests into single java file
  • c02fd22: 8343102: Remove --compress from jlink command lines from jpackage tests
  • 8600d8e: 8333116: test/jdk/tools/jpackage/share/ServiceTest.java test fails
  • d554f2b: 8316885: jcmd: Compiler.CodeHeap_Analytics cmd does not inform about missing aggregate
  • 990859c: 8341194: [REDO] Implement C2 VectorizedHashCode on AArch64
  • ... and 7 more: https://git.openjdk.org/jdk21u-dev/compare/a0ed69d5a380c41546d6e0c9dbaa235adfe7f237...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot changed the title Backport 715fa8f9fe7242e86b985aece3d078b226f53fb9 8336498: [macos] [build]: install-file macro may run into permission denied error Dec 9, 2024
@openjdk
Copy link

openjdk bot commented Dec 9, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Dec 9, 2024
@mlbridge
Copy link

mlbridge bot commented Dec 9, 2024

Webrevs

Copy link
Contributor

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

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

Hi @RealLucy, thanks for making a comment in an OpenJDK project!

All comments and discussions in the OpenJDK Community must be made available under the OpenJDK Terms of Use. If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please Use "Add GitHub user RealLucy" for the summary.

If you are not an OpenJDK Author, Committer or Reviewer, simply check the box below to accept the OpenJDK Terms of Use for your comments.

Your comment will be automatically restored once you have accepted the OpenJDK Terms of Use.

@GoeLin
Copy link
Member Author

GoeLin commented Dec 10, 2024

GAH failure: well known wget issue, unrelated.

@openjdk
Copy link

openjdk bot commented Dec 10, 2024

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Dec 10, 2024
@RealCLanger
Copy link
Contributor

Maybe you want to inline https://bugs.openjdk.org/browse/JDK-8342858 in here?

@GoeLin
Copy link
Member Author

GoeLin commented Dec 12, 2024

Good point, thanks for catching this!

@GoeLin
Copy link
Member Author

GoeLin commented Dec 12, 2024

/issue JDK-8342858

@openjdk
Copy link

openjdk bot commented Dec 12, 2024

@GoeLin
Adding additional issue to issue list: 8342858: Make target mac-jdk-bundle fails on chmod command.

@openjdk openjdk bot removed the approval Requires approval; will be removed when approval is received label Dec 12, 2024
Copy link
Contributor

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

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

Hi @RealLucy, thanks for making a comment in an OpenJDK project!

All comments and discussions in the OpenJDK Community must be made available under the OpenJDK Terms of Use. If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please Use "Add GitHub user RealLucy" for the summary.

If you are not an OpenJDK Author, Committer or Reviewer, simply check the box below to accept the OpenJDK Terms of Use for your comments.

Your comment will be automatically restored once you have accepted the OpenJDK Terms of Use.

@openjdk openjdk bot added approval Requires approval; will be removed when approval is received ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Dec 16, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Dec 16, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Dec 16, 2024

Going to push as commit b682b1f.
Since your change was applied there have been 17 commits pushed to the master branch:

  • 7b2a675: 8341820: Check return value of hcreate_r
  • 21b76f3: 8345296: AArch64: VM crashes with SIGILL when prctl is disallowed
  • 29c1188: 8314909: tools/jpackage/windows/Win8282351Test.java fails with java.lang.AssertionError: Expected [0]. Actual [1618]:
  • a021113: 8320916: jdk/jfr/event/gc/stacktrace/TestParallelMarkSweepAllocationPendingStackTrace.java failed with "OutOfMemoryError: GC overhead limit exceeded"
  • e7111b2: 8346108: [21u][BACKOUT] 8337994: [REDO] Native memory leak when not recording any events
  • 814566b: 8343100: Consolidate EmptyFolderTest and EmptyFolderPackageTest jpackage tests into single java file
  • c02fd22: 8343102: Remove --compress from jlink command lines from jpackage tests
  • 8600d8e: 8333116: test/jdk/tools/jpackage/share/ServiceTest.java test fails
  • d554f2b: 8316885: jcmd: Compiler.CodeHeap_Analytics cmd does not inform about missing aggregate
  • 990859c: 8341194: [REDO] Implement C2 VectorizedHashCode on AArch64
  • ... and 7 more: https://git.openjdk.org/jdk21u-dev/compare/a0ed69d5a380c41546d6e0c9dbaa235adfe7f237...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 16, 2024
@openjdk openjdk bot closed this Dec 16, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 16, 2024
@openjdk
Copy link

openjdk bot commented Dec 16, 2024

@GoeLin Pushed as commit b682b1f.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@GoeLin GoeLin deleted the goetz_backport_8336498 branch January 8, 2025 07:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants