--- jdk-10/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java.orig	2022-04-04 11:18:52.760626467 +0200
+++ jdk-10/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java	2022-04-04 12:03:40.645325687 +0200
@@ -105,6 +105,7 @@
 import jdk.internal.module.ModuleTarget;
 import jdk.internal.module.Resources;
 import jdk.tools.jlink.internal.Utils;
+import java.util.TreeSet;
 
 import static java.util.stream.Collectors.joining;
 
@@ -768,6 +769,7 @@
         void processSection(JmodOutputStream out, Section section, Path path)
             throws IOException
         {
+            TreeSet<Path> paths = new TreeSet<>();
             Files.walkFileTree(path, Set.of(FileVisitOption.FOLLOW_LINKS),
                 Integer.MAX_VALUE, new SimpleFileVisitor<Path>() {
                     @Override
@@ -781,20 +783,24 @@
 
                         if (!relPath.toString().equals(MODULE_INFO)
                                 && !matches(relPath, excludes)) {
-                            try (InputStream in = Files.newInputStream(file)) {
-                                out.writeEntry(in, section, relPath.toString());
-                            } catch (IOException x) {
-                                if (x.getMessage().contains("duplicate entry")) {
-                                    warning("warn.ignore.duplicate.entry",
-                                            relPath.toString(), section);
-                                    return FileVisitResult.CONTINUE;
-                                }
-                                throw x;
-                            }
+                            paths.add(file);
                         }
                         return FileVisitResult.CONTINUE;
                     }
                 });
+            for (Path file : paths) {
+                Path relPath = path.relativize(file);
+                try (InputStream in = Files.newInputStream(file)) {
+                    out.writeEntry(in, section, relPath.toString());
+                } catch (IOException x) {
+                    if (x.getMessage().contains("duplicate entry")) {
+                        warning("warn.ignore.duplicate.entry",
+                                  relPath.toString(), section);
+                        continue;
+                    }
+                    throw x;
+                }
+            }
         }
 
         boolean matches(Path path, List<PathMatcher> matchers) {
/guix/commit/.gitignore?id=4cf4dcb8b31274a8dfba6bae3a6826a1b521da3f'>teams: Adjust shebang to use 'guix repl'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This ensures the correct Guix dependencies are always available for the
script.

* etc/teams.scm.in: Rename to...
* etc/teams.scm: ... this.  Adjust shebang.
* .gitignore: No longer ignore it.
* configure.ac: Do not process it with AC_CONFIG_FILES.

Reported-by: Clément Lassieur &lt;clement@lassieur.org&gt;
Fixes: https://issues.guix.gnu.org/66605
Change-Id: I7a01750c6c5f0696b6c36b1e6caa9389d9e6822c
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2023-04-24 15:32:54 +0100'>2023-04-24</span></td><td><a href='/guix/commit/.gitignore?id=23f11afacdfe755ffa514a8cbf93ba1121b9db0d'>Add mumi config.</a><span class='msg-avail'>...<span class='msg-tooltip'>* .mumi/config: New file.
* .gitignore: Add .mumi/current-issue.
</span></span></td><td>Arun Isaac</td></tr>
<tr><td><span title='2022-07-03 14:12:32 +0200'>2022-07-03</span></td><td><a href='/guix/commit/.gitignore?id=4eaf90470f466b3fdab87f6961cb18bb348d433f'>etc: Add teams.scm.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/teams.scm.in: New file.
* configure.ac: Generate executable.
* .gitignore: Ignore generated file.
</span></span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2022-06-05 21:27:53 +0200'>2022-06-05</span></td><td><a href='/guix/commit/.gitignore?id=4d47c2c723927ad4ad4142bd517c6ccc03c27528'>gitignore: Add .DS_Store.</a><span class='msg-avail'>...<span class='msg-tooltip'>Ignore MacOS specific file: https://en.wikipedia.org/wiki/.DS_Store

Signed-off-by: Mathieu Othacehe &lt;othacehe@gnu.org&gt;
</span></span></td><td>Pavel Shlyak</td></tr>
td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-12-23 10:54:00 +0100'>2021-12-23</span></td><td><a href='/guix/commit/tests/modules.scm?id=05a9d1f378e2e13e8f759be926ea368358afc27c'>Remove VM generation dead-code.</a><span class='msg-avail'>...<span class='msg-tooltip'>This code duplicates the (gnu system image) and (gnu build image) code. Using
VM for image generation is not needed, not portable and really slow. Remove
all the VM image generation code to make sure that only the image API is used.

* gnu/build/vm.scm: Remove it. Move the qemu-command procedure to ...
* gnu/build/marionette.scm: ... here.
* gnu/local.mk (GNU_SYSTEM_MODULES): Adapt it.
* tests/modules.scm: Ditto.
* gnu/tests/install.scm: Ditto.
* gnu/system/vm.scm: Adapt it and remove expression-&gt;derivation-in-linux-vm,
qemu-img, system-qemu-image/shared-store and system-docker-image procedures.
* doc/guix.texi (G-Expressions): Adapt it.
</span></span></td><td>Mathieu Othacehe</td></tr>