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

8247589: Implementation of Alpine Linux/x64 Port #910

Closed
wants to merge 3 commits into from

Conversation

voitylov
Copy link

@voitylov voitylov commented Mar 17, 2022

JDK-8247589 is in the main issue in the third batch of a chain of backports for Alpine support to 11u as discussed in the mailing list. For the full set of anticipated changes please refer to the jdk-updates mailing list [1].

Original changeset does not apply cleanly because of:

8244224: Implementation of JEP 381: Remove the Solaris and SPARC Ports,
8215445: Enable building for Windows in WSL
8257913: Add more known library locations to simplify Linux cross-compilation
8244592: Start supporting SOURCE_DATE_EPOCH
8244752: Enable Linux support for multiple huge page sizes -XX:LargePageSizeInBytes

Testing: JCK + JTreg on Windows, Linux, Solaris, Mac without regressions.

[1] https://mail.openjdk.java.net/pipermail/jdk-updates-dev/2022-February/012271.html


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/910/head:pull/910
$ git checkout pull/910

Update a local copy of the PR:
$ git checkout pull/910
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/910/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 910

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/910.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 17, 2022

👋 Welcome back avoitylov! 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 openjdk bot changed the title Backport 63009f90ec7df053c936226663b463b8584364a9 8247589: Implementation of Alpine Linux/x64 Port Mar 17, 2022
@openjdk
Copy link

openjdk bot commented Mar 17, 2022

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Mar 17, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 17, 2022

Webrevs

@jerboaa
Copy link
Contributor

jerboaa commented Mar 21, 2022

@voitylov Could you please resolve conflicts? Thanks!

@voitylov
Copy link
Author

@jerboaa merge conflict with 8246494 is now resolved.

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

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

This looks OK to me.

@openjdk
Copy link

openjdk bot commented Mar 22, 2022

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

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

8247589: Implementation of Alpine Linux/x64 Port

Reviewed-by: sgehwolf, clanger

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 5 new commits pushed to the master branch:

  • b6f4e3e: 8210732: remove jdk.testlibrary.Utils
  • c2e43f7: Merge
  • 487c334: 8283778: 11u GHA: Fix GCC 9 ubuntu package names
  • 0413680: 8283018: 11u GHA: Update GCC 9 minor versions
  • af99bc3: 8275082: Update XML Security for Java to 2.3.0

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@jerboaa, @RealCLanger) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 22, 2022
@RealCLanger
Copy link
Contributor

I'll run this patch through SAP's testing tonight. I'm going to approve it when we don't see regressions.

@voitylov
Copy link
Author

Thanks Christoph!

@MBaesken
Copy link
Member

Hi, we noticed a small issue in test/jdk/tools/launcher/Test7029048.java .
test/jdk/tools/launcher/Test7029048.java now has private static void printSkipMessage(String description) twice ,
this leads to the error

test/jdk/tools/launcher/Test7029048.java:215: error: method printSkipMessage(String) is already defined in class Test7029048
private static void printSkipMessage(String description) {
^

@voitylov
Copy link
Author

@MBaesken thanks for spotting this. GHA gives "E: Version '9.4.0-1ubuntu1~20.04' for 'gcc-9' was not found" which is unrelated to this change.

@RealCLanger
Copy link
Contributor

@MBaesken thanks for spotting this. GHA gives "E: Version '9.4.0-1ubuntu1~20.04' for 'gcc-9' was not found" which is unrelated to this change.

Yes, about to fix this with openjdk/jdk11u#36 JDK-8283778

@voitylov
Copy link
Author

@MBaesken I'd like to play it safe and kindly ask you to rerun the SAP nightly testing, if possible.

@voitylov
Copy link
Author

@RealCLanger I see my ask to Matthias crossed with your review. Can I assume SAP is happy with the updated version?

@RealCLanger
Copy link
Contributor

@RealCLanger I see my ask to Matthias crossed with your review. Can I assume SAP is happy with the updated version?

Yes, the patch is running in our nightlies for days now - no further issues. 😄

@voitylov
Copy link
Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Mar 30, 2022
@openjdk
Copy link

openjdk bot commented Mar 30, 2022

@voitylov
Your change (at version b725105) is now ready to be sponsored by a Committer.

@AlexanderScherbatiy
Copy link

/sponsor

@openjdk
Copy link

openjdk bot commented Mar 30, 2022

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

  • 19761f5: 8247591: Document Alpine Linux build steps in OpenJDK build guide
  • b6f4e3e: 8210732: remove jdk.testlibrary.Utils
  • c2e43f7: Merge
  • 487c334: 8283778: 11u GHA: Fix GCC 9 ubuntu package names
  • 0413680: 8283018: 11u GHA: Update GCC 9 minor versions
  • af99bc3: 8275082: Update XML Security for Java to 2.3.0

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 30, 2022
@openjdk openjdk bot closed this Mar 30, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Mar 30, 2022
@openjdk
Copy link

openjdk bot commented Mar 30, 2022

@AlexanderScherbatiy @voitylov Pushed as commit 2faa216.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

5 participants