- Properly order tasks to create app image and config files for DEB to correctly calculate image size

 - Don't set category property on RPM if not explicitly specified.

Author: alexeysemenyukoracle

src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java

@@ -346,7 +346,7 @@ protected Map<String, String> createReplacementData(BuildEnv env, LinuxPackage p
         String licenseText = pkg.licenseFile().map(toFunction(Files::readString)).orElse("Unknown");
 
         data.put("APPLICATION_MAINTAINER", ((LinuxDebPackage) pkg).maintainer());
-        data.put("APPLICATION_SECTION", pkg.category());
+        data.put("APPLICATION_SECTION", pkg.category().orElseThrow());
         data.put("APPLICATION_COPYRIGHT", pkg.app().copyright());
         data.put("APPLICATION_LICENSE_TEXT", licenseText);
         data.put("APPLICATION_ARCH", pkg.arch());

src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebPackageBuilder.java

@@ -37,6 +37,9 @@ final class LinuxDebPackageBuilder {
     }
 
     LinuxDebPackage create() throws ConfigException {
+        if (pkgBuilder.category().isEmpty()) {
+            pkgBuilder.category(DEFAULTS.category());
+        }
         var pkg = pkgBuilder.create();
         return LinuxDebPackage.create(pkg, new LinuxDebPackageMixin.Stub(
                 Optional.ofNullable(maintainerEmail).orElseGet(
@@ -48,12 +51,12 @@ LinuxDebPackageBuilder maintainerEmail(String v) {
         return this;
     }
 
-    private record Defaults(String maintainerEmail) {
+    private record Defaults(String maintainerEmail, String category) {
     }
 
     private String maintainerEmail;
 
     private final LinuxPackageBuilder pkgBuilder;
 
-    private static final Defaults DEFAULTS = new Defaults("Unknown");
+    private static final Defaults DEFAULTS = new Defaults("Unknown", "misc");
 }

src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBuilder.java

@@ -71,7 +71,7 @@ private LinuxPackage create(Package pkg, AppImageLayout pkgLayout) throws Config
         return LinuxPackage.create(pkg, new LinuxPackageMixin.Stub(
                 pkgLayout,
                 Optional.ofNullable(menuGroupName).orElseGet(DEFAULTS::menuGroupName),
-                Optional.ofNullable(category).orElseGet(DEFAULTS::category),
+                Optional.ofNullable(category),
                 Optional.ofNullable(additionalDependencies),
                 Optional.ofNullable(release),
                 pkg.asStandardPackageType().map(LinuxPackageArch::getValue).orElseThrow()));
@@ -92,6 +92,10 @@ LinuxPackageBuilder category(String v) {
         return this;
     }
 
+    Optional<String> category() {
+        return Optional.ofNullable(category);
+    }
+
     LinuxPackageBuilder additionalDependencies(String v) {
         additionalDependencies = v;
         return this;
@@ -164,7 +168,7 @@ private static void validatePackageName(String packageName,
         }
     }
 
-    private record Defaults(String menuGroupName, String category) {
+    private record Defaults(String menuGroupName) {
     }
 
     private String literalName;
@@ -176,6 +180,6 @@ private record Defaults(String menuGroupName, String category) {
     private final PackageBuilder pkgBuilder;
 
     private static final Defaults DEFAULTS = new Defaults(I18N.getString(
-            "param.menu-group.default"), "misc");
+            "param.menu-group.default"));
 
 }

src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java

@@ -35,8 +35,11 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 import jdk.jpackage.internal.PackagingPipeline.PackageBuildEnv;
+import jdk.jpackage.internal.PackagingPipeline.PackageTaskID;
+import jdk.jpackage.internal.PackagingPipeline.PrimaryTaskID;
 import jdk.jpackage.internal.model.AppImageLayout;
 import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.LinuxDebPackage;
 import jdk.jpackage.internal.model.LinuxPackage;
 import jdk.jpackage.internal.model.Package;
 import jdk.jpackage.internal.model.PackagerException;
@@ -105,15 +108,25 @@ public final Path execute(Map<String, ? super Object> params,
         final LinuxPackage pkg = pkgParam.fetchFrom(params);
         final var env = BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
 
-        LinuxPackagingPipeline.build()
+        final var pipelineBuilder = LinuxPackagingPipeline.build()
                 .excludeDirFromCopying(outputParentDir)
-                .task(PackagingPipeline.PackageTaskID.CREATE_CONFIG_FILES)
-                        .packageAction(this::buildConfigFiles)
-                        .add()
-                .task(PackagingPipeline.PackageTaskID.CREATE_PACKAGE_FILE)
+                .task(PackageTaskID.CREATE_PACKAGE_FILE)
                         .packageAction(this::buildPackage)
-                        .add()
-                .create().execute(env, pkg, outputParentDir);
+                        .add();
+
+        final var createConfigFilesTaskBuilder = pipelineBuilder
+                .task(PackageTaskID.CREATE_CONFIG_FILES)
+                .packageAction(this::buildConfigFiles);
+
+        if (pkg instanceof LinuxDebPackage) {
+            // Build deb config files after app image contents are ready because
+            // it calculates the size of the image and saves the value in one of the config files.
+            createConfigFilesTaskBuilder.addDependencies(PrimaryTaskID.BUILD_APPLICATION_IMAGE, PrimaryTaskID.COPY_APP_IMAGE);
+        }
+
+        createConfigFilesTaskBuilder.add();
+
+        pipelineBuilder.create().execute(env, pkg, outputParentDir);
 
         return outputParentDir.resolve(pkg.packageFileNameWithSuffix()).toAbsolutePath();
     }

src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java

@@ -123,14 +123,14 @@ protected Map<String, String> createReplacementData(BuildEnv env, LinuxPackage p
         data.put("APPLICATION_RELEASE", pkg.release().orElseThrow());
         data.put("APPLICATION_PREFIX", installPrefix(pkg).toString());
         data.put("APPLICATION_DIRECTORY", Path.of("/").resolve(pkg.relativeInstallDir()).toString());
-        data.put("APPLICATION_SUMMARY", pkg.packageName());
+        data.put("APPLICATION_SUMMARY", pkg.app().name());
         data.put("APPLICATION_LICENSE_TYPE", ((LinuxRpmPackage)pkg).licenseType());
 
         String licenseFile = pkg.licenseFile().map(v -> {
             return v.toAbsolutePath().normalize().toString();
         }).orElse(null);
         data.put("APPLICATION_LICENSE_FILE", licenseFile);
-        data.put("APPLICATION_GROUP", pkg.category());
+        data.put("APPLICATION_GROUP", pkg.category().orElse(""));
 
         data.put("APPLICATION_URL", pkg.aboutURL().orElse(""));
 

src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxPackageMixin.java

@@ -52,7 +52,7 @@ public interface LinuxPackageMixin {
      *
      * @return the category of this package
      */
-    String category();
+    Optional<String> category();
 
     /**
      * Gets a string with the additional dependencies of this package. Returns an
@@ -89,7 +89,7 @@ public interface LinuxPackageMixin {
      * Default implementation of {@link LinuxPackageMixin} interface.
      */
     record Stub(AppImageLayout packageLayout, String menuGroupName,
-            String category, Optional<String> additionalDependencies,
+            Optional<String> category, Optional<String> additionalDependencies,
             Optional<String> release, String arch) implements LinuxPackageMixin {
     }
 }