--- jdk14-bc54620a3848/make/autoconf/basics.m4	2020-02-07 04:40:54.000000000 +1030
+++ jdk14-bc54620a3848-new/make/autoconf/basics.m4	2020-04-24 10:59:33.056098506 +0930
@@ -583,7 +583,7 @@
   BASIC_SETUP_TOOL($1, [AC_PATH_PROGS($1, $2, , $3)])
   if test "x[$]$1" = x; then
     AC_MSG_NOTICE([Required tool $2 not found in PATH, checking built-in])
-    if help $2 > /dev/null 2>&1; then
+    if command -v $2 > /dev/null 2>&1; then
       AC_MSG_NOTICE([Found $2 as shell built-in. Using it])
       $1="$2"
     else
'><a href='/'>index</a> : <a href='/guix/'>guix</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='89513b8ed3d9d3287decc4e5e4fbe74d3d0605a2'/><select name='h' onchange='this.form.submit();'>
<option value='koszko' selected='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=89513b8ed3d9d3287decc4e5e4fbe74d3d0605a2'>refs</a><a class='active' href='/guix/log/gnu/system/linux-initrd.scm'>log</a><a href='/guix/tree/gnu/system/linux-initrd.scm?id=89513b8ed3d9d3287decc4e5e4fbe74d3d0605a2'>tree</a><a href='/guix/commit/gnu/system/linux-initrd.scm?id=89513b8ed3d9d3287decc4e5e4fbe74d3d0605a2'>commit</a><a href='/guix/diff/gnu/system/linux-initrd.scm?id=89513b8ed3d9d3287decc4e5e4fbe74d3d0605a2'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/system/linux-initrd.scm'>
<input type='hidden' name='id' value='89513b8ed3d9d3287decc4e5e4fbe74d3d0605a2'/><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=89513b8ed3d9d3287decc4e5e4fbe74d3d0605a2'>root</a>/<a href='/guix/log/gnu?id=89513b8ed3d9d3287decc4e5e4fbe74d3d0605a2'>gnu</a>/<a href='/guix/log/gnu/system?id=89513b8ed3d9d3287decc4e5e4fbe74d3d0605a2'>system</a>/<a href='/guix/log/gnu/system/linux-initrd.scm?id=89513b8ed3d9d3287decc4e5e4fbe74d3d0605a2'>linux-initrd.scm</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/gnu/system/linux-initrd.scm?id=89513b8ed3d9d3287decc4e5e4fbe74d3d0605a2&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-11-18 15:44:38 +0100'>2022-11-18</span></td><td><a href='/guix/commit/gnu/system/linux-initrd.scm?id=a6da50d60a2cc3d0f218e38cbc197011b8151554'>linux-initrd: raw-initrd: Add keyword argument #:pre-mount.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/system/linux-initrd.scm (raw-initrd): Add keyword argument #:pre-mount.
Document it.
* doc/guix.texi (initial RAM disk): Likewise.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Hilton Chain</td></tr>
<tr><td><span title='2022-03-01 10:30:17 -0500'>2022-03-01</span></td><td><a href='/guix/commit/gnu/system/linux-initrd.scm?id=0dc019e19a23fea614be5623360849ab9bc35e74'>initrd: Use non-hyphenated kernel command-line parameter names.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is to make it less surprising, given the common convention sets forth by
the kernel Linux command-line parameters.

* gnu/build/linux-boot.scm (boot-system): Rename '--load', '--repl', '--root'
and '--system' to 'gnu.load', 'gnu.repl', 'root' and 'gnu.system',
respectively.  Adjust doc.
(find-long-option): Adjust doc.
* gnu/installer/parted.scm (installer-root-partition-path): Adjust accordingly.
* gnu/system.scm (bootable-kernel-arguments): Add a VERSION argument and
update doc.  Use VERSION to conditionally return old style vs new style initrd
arguments.
(%boot-parameters-version): Increment to 1.
(operating-system-boot-parameters): Adjust doc.
(operating-system-boot-parameters-file): Likewise.
* gnu/system/linux-initrd.scm (raw-initrd, base-initrd): Likewise.
* doc/guix.texi: Adjust doc.
* gnu/build/activation.scm (boot-time-system): Adjust accordingly.
* gnu/build/hurd-boot.scm (boot-hurd-system): Likewise.
* gnu/packages/commencement.scm (%final-inputs-riscv64): Adjust comment.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2022-02-09 01:38:51 -0500'>2022-02-09</span></td><td><a href='/guix/commit/gnu/system/linux-initrd.scm?id=fd6cfbc05ac093a6b9497e6c38bb4678f33ac14d'>Revert kernel modules changes to support the Coreboot framebuffer</a><span class='msg-avail'>...<span class='msg-tooltip'>These changes broke the creation of the 'linux-modules-database' for all kernel
series besides 5.15, 5.4, and 5.10, like this:

------
gnu/build/linux-modules.scm:257:5: kernel module not found "framebuffer_coreboot" "/gnu/store/yff45fr6q93mw44zdql9ffr95zcvwxcn-linux-libre-4.9.299/lib/modules"
------

We should support the coreboot framebuffer, but we need to test that change more
completely before deploying it.

This effectively reverts the following commits:
1dfe8c372163d481ebebb97dd3b4cafa49906b28 "gnu: linux-libre: Build simplefb into all x86{,_64} kernels."
bc09e7ab569d5306ce99c5525150695c9d539ef0 "gnu: linux-libre: Support the Coreboot framebuffer."

Fixes &lt;https://issues.guix.gnu.org/52667&gt; "System reconfiguration fails to build
linux-modules.drv".
</span></span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2021-12-25 07:20:00 +0100'>2021-12-25</span></td><td><a href='/guix/commit/gnu/system/linux-initrd.scm?id=1dfe8c372163d481ebebb97dd3b4cafa49906b28'>gnu: linux-libre: Build simplefb into all x86{,_64} kernels.</a><span class='msg-avail'>...<span class='msg-tooltip'>This attempts to mitigate &lt;https://issues.guix.gnu.org/52667&gt;.

It makes linux-libre@5.15 consistent with older versions which do not
support a modular simplefb, allowing a single %base-initrd-modules
simple list for all of them.

Unlike CONFIG_FB_SIMPLE=m, CONFIG_FB_SIMPLE=y conflicts with
CONFIG_DRM_SIMPLEDRM, so the latter is now disabled.  Let us hope it is
not missed.

* gnu/packages/aux-files/linux-libre/5.15-i686.conf,
gnu/packages/aux-files/linux-libre/5.15-x86_64.conf:
Unset CONFIG_DRM_SIMPLEDRM to build in CONFIG_FB_SIMPLE=y.
* gnu/system/linux-initrd.scm (default-initrd-modules):
Remove "simplefb".
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>