--- orig/jdk-6fa770f9f8ab/make/GenerateLinkOptData.gmk	2022-04-04 17:16:29.365930149 +0200
+++ jdk-6fa770f9f8ab/make/GenerateLinkOptData.gmk	2022-04-04 17:16:54.954624358 +0200
@@ -61,11 +61,12 @@
 	$(call MakeDir, $(LINK_OPT_DIR))
 	$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $@))
 	$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
-	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@ \
+	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.tmp \
 	    -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
 	    build.tools.classlist.HelloClasslist \
 	    $(LOG_DEBUG) 2>&1 > $(JLI_TRACE_FILE)
+	sort $@.tmp > $@
 
 # The jli trace is created by the same recipe as classlist. By declaring these
 # dependencies, make will correctly rebuild both jli trace and classlist
--- orig/jdk-6fa770f9f8ab/make/gendata/Gendata-jdk.compiler.gmk	2022-04-13 19:24:10.191682716 +0200
+++ jdk-6fa770f9f8ab/make/gendata/Gendata-jdk.compiler.gmk	2022-04-13 20:58:57.891368216 +0200
@@ -83,6 +83,8 @@
 	    $(CT_MODULESOURCEPATH) \
 	    $(CT_MODULES) \
 	    >$(@D)/A/system-modules
+	# Make files reproducible
+	find $(@D) -exec $(TOUCH) -h -c -t 197001010000.01 {} \;
 	$(TOUCH) $@
 
 # Can't generate ct.sym directly into modules libs as the SetupJarArchive macro
alstatedir.sh?id=59b33cbe062cf774582871038f7bec7e9c7bd703'>commit</a><a href='/guix/diff/tests/guix-pack-localstatedir.sh?id=59b33cbe062cf774582871038f7bec7e9c7bd703'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/guix-pack-localstatedir.sh'>
<input type='hidden' name='id' value='59b33cbe062cf774582871038f7bec7e9c7bd703'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=59b33cbe062cf774582871038f7bec7e9c7bd703'>root</a>/<a href='/guix/log/tests?id=59b33cbe062cf774582871038f7bec7e9c7bd703'>tests</a>/<a href='/guix/log/tests/guix-pack-localstatedir.sh?id=59b33cbe062cf774582871038f7bec7e9c7bd703'>guix-pack-localstatedir.sh</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/guix-pack-localstatedir.sh?id=59b33cbe062cf774582871038f7bec7e9c7bd703&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-05-18 12:23:31 +0200'>2019-05-18</span></td><td><a href='/guix/commit/tests/guix-pack-localstatedir.sh?id=baab87ac49e3f0f873e17eb16db9781189b1f2d1'>pack: '--localstatedir' and '-R' tests gracefully handle missing /gnu/store.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/35776&gt;.
Reported by Ting-Wei Lan &lt;lantw44@gmail.com&gt;.

* tests/guix-pack-localstatedir.sh: Set 'storedir' before
'NIX_STORE_DIR'.
* tests/guix-pack-relocatable.sh: Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-11-23 15:42:01 +0100'>2018-11-23</span></td><td><a href='/guix/commit/tests/guix-pack-localstatedir.sh?id=08f410834bffbe1e55633a0a4c87caba69d7fa92'>pack: Add '--profile-name'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/scripts/pack.scm (self-contained-tarball): Add #:profile-name and
honor it.
(squashfs-image, docker-image): Add #:profile-name.
(%default-options): Add 'profile-name'.
(%options, show-help): Add "--profile-name".
(guix-pack): Honor it.
* tests/guix-pack-localstatedir.sh: New file.
* Makefile.am (SH_TESTS): Add it.
* doc/guix.texi (Invoking guix pack): Document "--profile-name".
</span></span></td><td>Ludovic Courtès</td></tr>