Skip to content

Commit

Permalink
8303412: Update linux_x64-to-linux_aarch64 cross compilation devkit a…
Browse files Browse the repository at this point in the history 
…t Oracle

Reviewed-by: dholmes
  • Loading branch information
@vidmik
vidmik committed Mar 1, 2023
1 parent 7e47d51 commit 65da2c5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion make/conf/jib-profiles.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,7 @@ var getJibProfilesDependencies = function (input, common) {
linux_x64: "gcc11.2.0-OL6.4+1.0",
macosx: "Xcode12.4+1.1",
windows_x64: "VS2022-17.1.0+1.1",
linux_aarch64: "gcc11.2.0-OL7.6+1.0",
linux_aarch64: input.build_cpu == "x64" ? "gcc11.2.0-OL7.6+1.1" : "gcc11.2.0-OL7.6+1.0",
linux_arm: "gcc8.2.0-Fedora27+1.0",
linux_ppc64le: "gcc8.2.0-Fedora27+1.0",
linux_s390x: "gcc8.2.0-Fedora27+1.0",
Expand Down

3 comments on commit 65da2c5

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@vidmik
Copy link
Contributor Author

@vidmik vidmik commented on 65da2c5 Mar 1, 2023

Choose a reason for hiding this comment

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

/backport jdk20u

@openjdk
Copy link

@openjdk openjdk bot commented on 65da2c5 Mar 1, 2023

Choose a reason for hiding this comment

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

@vidmik Could not automatically backport 65da2c5d to openjdk/jdk20u due to conflicts in the following files:

  • make/conf/jib-profiles.js

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk20u. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk20u master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b vidmik-backport-65da2c5d

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk 65da2c5d2dfea30e7d00b8f907f7abb5f6f887df

# Backport the commit
$ git cherry-pick --no-commit 65da2c5d2dfea30e7d00b8f907f7abb5f6f887df
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 65da2c5d2dfea30e7d00b8f907f7abb5f6f887df'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk20u with the title Backport 65da2c5d2dfea30e7d00b8f907f7abb5f6f887df.

Please sign in to comment.