From fb5a7f0b1f075edf7535b28c7726ef0b58e598ac Mon Sep 17 00:00:00 2001
From: Itxaka <itxaka.garcia@spectrocloud.com>
Date: Sat, 17 Feb 2024 12:09:23 +0100
Subject: [PATCH] Copy lib in several other places, so it gets into the LD PATH
  (#692)

---
 packages/system/systemd/build.yaml      | 18 +++++++++++++++---
 packages/system/systemd/collection.yaml |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/system/systemd/build.yaml b/packages/system/systemd/build.yaml
index 0ef5a6f..10bb279 100644
--- a/packages/system/systemd/build.yaml
+++ b/packages/system/systemd/build.yaml
@@ -3,7 +3,7 @@ image: {{ .Values.image }}
 package_dir: /package
 
 prelude:
-  - dnf update -y && dnf install -y gcc meson git ninja-build gperf libpcap libcap libcap-devel cmake libmount-devel python3-jinja2 rsync diffutils python3-pyelftools openssl-devel tpm2-*
+  - dnf update -y && dnf install -y gcc meson git ninja-build gperf libpcap libcap libcap-devel cmake libmount-devel python3-jinja2 rsync diffutils python3-pyelftools openssl-devel tpm2-* python3-pip python3-cryptography python3-pefile
   - mkdir -p src/
   - PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && cd src/ && git clone --branch v${PACKAGE_VERSION} https://github.com/systemd/systemd.git
 
@@ -30,12 +30,24 @@ steps:
   {{end}}
 {{else if eq .Values.name "systemd-ukify"}}
   - mkdir -p /package/usr/lib/systemd/
+  - mkdir -p /package/usr/lib64/systemd/
+  - mkdir -p /package/lib64
+  - mkdir -p /package/lib
   - mkdir -p /package/usr/bin/
   # ukify calls systemd-measure to measure and sign
   - cp src/systemd/build/systemd-measure /package/usr/lib/systemd/
+  - cp src/systemd/build/systemd-measure /package/usr/lib64/systemd/
+  - cp src/systemd/build/systemd-measure /package/lib/
+  - cp src/systemd/build/systemd-measure /package/lib64/
   - PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && cp src/systemd/build/src/shared/libsystemd-shared-${PACKAGE_VERSION}-kairos.so /package/usr/lib/systemd/
   # ukify is copied in two places according to upstream, I guess to maintain backwards compatibility
-  - cp src/systemd/build/ukify /package/usr/bin/
-  - cp src/systemd/build/ukify /package/usr/lib/systemd/
+  # use of pyinstaller to create a single binary with all deps bundled
+  - src/systemd/build/ukify --version
+  - pip install pyinstaller
+  - pyinstaller src/systemd/build/ukify -F
+  - chmod +x dist/ukify
+  - dist/ukify --version
+  - cp dist/ukify /package/usr/bin/
+  - cp dist/ukify /package/usr/lib/systemd/
 {{end}}
   - ls -ltra /package
diff --git a/packages/system/systemd/collection.yaml b/packages/system/systemd/collection.yaml
index eed8141..2234bf8 100644
--- a/packages/system/systemd/collection.yaml
+++ b/packages/system/systemd/collection.yaml
@@ -9,7 +9,7 @@ packages:
       github.owner: "systemd"
   - name: "systemd-ukify"
     category: "system"
-    version: "255+1"
+    version: "255+2"
     image: "fedora:39"
     labels:
       github.repo: "systemd"