Skip to content

8379348: jpackage will use wrong arch suffix for RPM bundle when running on Debian Linux#30085

Closed
alexeysemenyukoracle wants to merge 7 commits intoopenjdk:masterfrom
alexeysemenyukoracle:fix-rpm+deb-bundling
Closed

8379348: jpackage will use wrong arch suffix for RPM bundle when running on Debian Linux#30085
alexeysemenyukoracle wants to merge 7 commits intoopenjdk:masterfrom
alexeysemenyukoracle:fix-rpm+deb-bundling

Conversation

@alexeysemenyukoracle
Copy link
Member

@alexeysemenyukoracle alexeysemenyukoracle commented Mar 5, 2026

Fix jpackage to use the correct arch for DEB bundles when running on RPM-based Linux, and vice versa.

The bug was in jdk.jpackage.internal.LinuxBundlingEnvironment class.

Additionally:

  • Add missing single quote escape to error.unexpected-default-package-property.advice l10n string
  • Reworded error.unexpected-package-property l10n string
  • JPackageStringBundle: add cannedFormattedStringAsPattern(); throw when the number of format arguments doesn't match the number of format fields; add unit tests; ErrorTest, InstallDirTest: follow-up bugfixes
  • LinuxHelper: fix unexpected java.lang.AssertionError: Failed: Check [libc] package is in the list of required packages [/bin/sh, /bin/sh, /bin/sh, rpmlib(CompressedFileNames) <= 3.0.4-1, rpmlib(PayloadFilesHavePrefix) <= 4.0-1] of [simplepackagetest] package error when bundling RPM package on Ubuntu; Make getDefaultPackageArch() thread-safe

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

Warning

 ⚠️ Found leading lowercase letter in issue title for 8379348: jpackage will use wrong arch suffix for RPM bundle when running on Debian Linux

Issue

  • JDK-8379348: jpackage will use wrong arch suffix for RPM bundle when running on Debian Linux (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/30085/head:pull/30085
$ git checkout pull/30085

Update a local copy of the PR:
$ git checkout pull/30085
$ git pull https://git.openjdk.org/jdk.git pull/30085/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 30085

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/30085.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 5, 2026

👋 Welcome back asemenyuk! 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 Mar 5, 2026

@alexeysemenyukoracle 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:

8379348: jpackage will use wrong arch suffix for RPM bundle when running on Debian Linux

Reviewed-by: almatvee

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 44 new commits pushed to 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.

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

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Mar 5, 2026
@openjdk
Copy link

openjdk bot commented Mar 5, 2026

@alexeysemenyukoracle The following label will be automatically applied to this pull request:

  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@alexeysemenyukoracle alexeysemenyukoracle changed the title LinuxBundlingEnvironment: fix jpackage correctly pick package arch on… 8379348: jpackage will use wrong arch suffix for RPM bundle when running on Debian Linux Mar 5, 2026
…thread-safe; JPackageCommand: add fullVersion() and improve version(); don't validate dependencies of alien (non-native) packages; Fix "java.lang.AssertionError: Failed: Check [libc] package is in the list of required packages [/bin/sh, /bin/sh, /bin/sh, rpmlib(CompressedFileNames) <= 3.0.4-1, rpmlib(PayloadFilesHavePrefix) <= 4.0-1] of [simplepackagetest] package" error when bundling RPM package on Ubuntu
…n the number of format arguments doesn't match the number of format fields; add unit tests; ErrorTest: follow-up bugfix
… system where both RPM and DEB packaging is enabled.
… "error.unexpected-package-property"; Add missing single quote escape to the "error.unexpected-default-package-property.advice" message
@alexeysemenyukoracle alexeysemenyukoracle marked this pull request as ready for review March 5, 2026 23:30
@alexeysemenyukoracle
Copy link
Member Author

@sashamatveev PTAL

@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 5, 2026
@mlbridge
Copy link

mlbridge bot commented Mar 5, 2026

Webrevs

@openjdk
Copy link

openjdk bot commented Mar 5, 2026

@alexeysemenyukoracle Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

error.unexpected-package-property=Expected value of "{0}" property is [{1}]. Actual value in output package is [{2}]. Looks like the value of "{0}" property is hardcoded in "{3}" file in the resource directory
error.unexpected-package-property.advice=Use [{0}] pattern string instead of hard coded value [{1}] of {2} property in custom "{3}" file
error.unexpected-default-package-property.advice=Don't explicitly set value of {0} property in custom "{1}" file
error.unexpected-default-package-property.advice=Don''t explicitly set value of "{0}" property in custom "{1}" file
Copy link
Member

Choose a reason for hiding this comment

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

Why two '' in Don''t?

Copy link
Member Author

Choose a reason for hiding this comment

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

Because the first quote escapes the second one. See https://docs.oracle.com/en/java/javase/25/docs/api/java.base/java/text/MessageFormat.html#quoting-rules-in-patterns-heading.

Without quoting, the format string is printed as Dont explicitly set value of {0} property in custom "{1}" file and format arguments are ignored. Note how Don't turns into Dont and formatting elements ({0}, and {1}) printed as is without being replaced by the arguments.

Copy link
Member

@sashamatveev sashamatveev left a comment

Choose a reason for hiding this comment

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

Looks good.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 6, 2026
@alexeysemenyukoracle
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 6, 2026

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 6, 2026

@alexeysemenyukoracle Pushed as commit c532dff.

💡 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

core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants