From 65bf2ef09f861f6aa9565178d430ed84b84755b8 Mon Sep 17 00:00:00 2001
From: Gerald Pinder <4626052+gmpinder@users.noreply.github.com>
Date: Sun, 15 Dec 2024 12:04:35 -0500
Subject: [PATCH] Use custom inintramfs script

---
 .gitlab-ci.yml                | 13 ++++---------
 files/scripts/initramfs.sh    |  2 +-
 recipes/common/post-build.yml |  6 ++++--
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5550431..acdbfd6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,18 +20,11 @@ build-image:
     - docker:dind
   parallel:
     matrix:
-      - RECIPE:
-          - jp-desktop-nvidia.yml
-          - jp-laptop.yml
-        BB_BUILD_RECHUNK:
-          - "true"
       - RECIPE:
           - cp-laptop.yml
           - jp-truenas.yml
-        BB_BUILD_RECHUNK:
-          - "true"
-        BB_BUILD_RECHUNK_CLEAR_PLAN:
-          - "true"
+          - jp-desktop-nvidia.yml
+          - jp-laptop.yml
   variables:
     DOCKER_HOST: tcp://docker:2376
     DOCKER_TLS_CERTDIR: /certs
@@ -39,6 +32,8 @@ build-image:
     DOCKER_CERT_PATH: $DOCKER_TLS_CERTDIR/client
     RUST_LOG_STYLE: always
     CLICOLOR_FORCE: 1
+    BB_BUILD_RECHUNK: "true"
+    BB_BUILD_RECHUNK_CLEAR_PLAN: "true"
   before_script:
     - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
     - export COSIGN_PRIVATE_KEY=$(cat .secure_files/cosign.key)
diff --git a/files/scripts/initramfs.sh b/files/scripts/initramfs.sh
index 3bc4b82..e9abfdc 100644
--- a/files/scripts/initramfs.sh
+++ b/files/scripts/initramfs.sh
@@ -14,5 +14,5 @@ else
 fi
 
 QUALIFIED_KERNEL="$(rpm -qa | grep -P '^kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')"
-/usr/libexec/rpm-ostree/wrapped/dracut --no-hostonly --kver "${QUALIFIED_KERNEL}" --reproducible --zstd -v --add ostree -f "/lib/modules/${QUALIFIED_KERNEL}/initramfs.img"
+/usr/libexec/rpm-ostree/wrapped/dracut --no-hostonly --kver "${QUALIFIED_KERNEL}" --reproducible -v --add ostree -f "/lib/modules/${QUALIFIED_KERNEL}/initramfs.img"
 chmod 0600 "/lib/modules/${QUALIFIED_KERNEL}/initramfs.img"
diff --git a/recipes/common/post-build.yml b/recipes/common/post-build.yml
index 29bff77..fab4e21 100644
--- a/recipes/common/post-build.yml
+++ b/recipes/common/post-build.yml
@@ -1,3 +1,5 @@
 modules:
-  - type: initramfs
-    source: ghcr.io/blue-build/modules/initramfs:feat-initramfs
+  # - type: initramfs
+  - type: script
+    scripts:
+      - initramfs.sh