From f65aa477d90ab7fbbc50ba05c55180213d5992e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Mon, 28 Aug 2023 18:22:43 +0300
Subject: [PATCH] ukify: move to /usr/bin and mark as non non-experimental

The notice in the man page is removed and the tool is moved into the $PATH.
A compat symlink is provided.

It is fairly widely used now, and realistically we need to keep backwards
compat or people will be very unhappy.
---
 man/ukify.xml                          | 13 +++++--------
 meson.build                            |  6 +++++-
 src/kernel-install/60-ukify.install.in |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/man/ukify.xml b/man/ukify.xml
index 40544502f1..5a94339e6f 100644
--- a/man/ukify.xml
+++ b/man/ukify.xml
@@ -22,7 +22,7 @@
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>/usr/lib/systemd/ukify</command>
+      <command>ukify</command>
       <arg choice="opt" rep="repeat">OPTIONS</arg>
       <arg choice="plain">build</arg>
     </cmdsynopsis>
@@ -44,9 +44,6 @@
   <refsect1>
     <title>Description</title>
 
-    <para>Note: this command is experimental for now. While it is intended to become a regular component of
-    systemd, it might still change in behaviour and interface.</para>
-
     <para><command>ukify</command> is a tool whose primary purpose is to combine components (usually a
     kernel, an initrd, and a UEFI boot stub) to create a
     <ulink url="https://uapi-group.org/specifications/specs/unified_kernel_image/">Unified Kernel Image (UKI)</ulink>
@@ -493,7 +490,7 @@
     <example>
       <title>All the bells and whistles</title>
 
-      <programlisting>$ /usr/lib/systemd/ukify build \
+      <programlisting>$ ukify build \
       --linux=/lib/modules/6.0.9-300.fc37.x86_64/vmlinuz \
       --initrd=early_cpio \
       --initrd=/some/path/initramfs-6.0.9-300.fc37.x86_64.img \
@@ -552,7 +549,7 @@ Phases=enter-initrd:leave-initrd
        enter-initrd:leave-initrd:sysinit
        enter-initrd:leave-initrd:sysinit:ready
 
-$ /usr/lib/systemd/ukify -c ukify.conf build \
+$ ukify -c ukify.conf build \
         --linux=/lib/modules/6.0.9-300.fc37.x86_64/vmlinuz \
         --initrd=/some/path/initramfs-6.0.9-300.fc37.x86_64.img
       </programlisting>
@@ -588,7 +585,7 @@ $ /usr/lib/systemd/ukify -c ukify.conf build \
 <xi:include href="uki.conf.example" parse="text" />EOF</programlisting>
 
       <para>Next, we can generate the certificate and keys:</para>
-      <programlisting># /usr/lib/systemd/ukify genkey --config=/etc/kernel/uki.conf
+      <programlisting># ukify genkey --config=/etc/kernel/uki.conf
 Writing SecureBoot private key to /etc/kernel/secure-boot.key.pem
 Writing SecureBoot certificate to /etc/kernel/secure-boot.cert.pem
 Writing private key for PCR signing to /etc/kernel/pcr-initrd.key.pem
@@ -601,7 +598,7 @@ Writing public key for PCR signing to /etc/kernel/pcr-system.pub.pem
       to <filename>/etc/kernel/</filename>.)</para>
 
       <para>Subsequent invocations of using the config file
-      (<command>/usr/lib/systemd/ukify build --config=/etc/kernel/uki.conf</command>)
+      (<command>ukify build --config=/etc/kernel/uki.conf</command>)
       will use this certificate and key files. Note that the
       <citerefentry><refentrytitle>kernel-install</refentrytitle><manvolnum>8</manvolnum></citerefentry>
       plugin <filename>60-ukify.install</filename> uses <filename>/etc/kernel/uki.conf</filename>
diff --git a/meson.build b/meson.build
index 910e06c783..d90af73d52 100644
--- a/meson.build
+++ b/meson.build
@@ -2417,9 +2417,13 @@ ukify = custom_target(
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
         install : want_ukify,
         install_mode : 'rwxr-xr-x',
-        install_dir : libexecdir)
+        install_dir : bindir)
 if want_ukify
         public_programs += ukify
+
+        meson.add_install_script(sh, '-c',
+                                 ln_s.format(bindir / 'ukify',
+                                             libexecdir / 'ukify'))
 endif
 
 ############################################################
diff --git a/src/kernel-install/60-ukify.install.in b/src/kernel-install/60-ukify.install.in
index 2ab0305e91..01146467d1 100755
--- a/src/kernel-install/60-ukify.install.in
+++ b/src/kernel-install/60-ukify.install.in
@@ -34,7 +34,7 @@ except (KeyError, ValueError):
     VERBOSE = False
 
 # Override location of ukify and the boot stub for testing and debugging.
-UKIFY = os.getenv('KERNEL_INSTALL_UKIFY', '/usr/lib/systemd/ukify')
+UKIFY = os.getenv('KERNEL_INSTALL_UKIFY', 'ukify')
 BOOT_STUB = os.getenv('KERNEL_INSTALL_BOOT_STUB')