Merge pull request #74 from prydom/update-bluebuild-action

Update bluebuild to v0.7.17+ and conform to how the current modules want things laid out
prydom · Sep 30, 2024 · 0b62bf2 · 0b62bf2
2 parents cce2aa4 + f2af7a1
commit 0b62bf2
Show file tree

Hide file tree

Showing 44 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,7 +39,7 @@ jobs:
           registry_token: ${{ github.token }}
           pr_event_number: ${{ github.event.number }}
           use_unstable_cli: true
-          cli_version: ":v0.8.4-installer"
+          cli_version: ":20d1950530218118c6c0fff1fe5ff6b37e5d1586-installer"
   rpm-ostree-rechunk:
     name: rpm-ostree re-encapsulate
     runs-on: ubuntu-latest

diff --git a/config/containerfiles/copyrpms/Containerfile → containerfiles/copyrpms/Containerfile b/config/containerfiles/copyrpms/Containerfile → containerfiles/copyrpms/Containerfile
diff --git a/config/scripts/regen-initramfs.sh → files/scripts/regen-initramfs.sh b/config/scripts/regen-initramfs.sh → files/scripts/regen-initramfs.sh
diff --git a/...les/etc/dracut.conf.d/70-enable-zstd.conf → ...tem/etc/dracut.conf.d/70-enable-zstd.conf b/...les/etc/dracut.conf.d/70-enable-zstd.conf → ...tem/etc/dracut.conf.d/70-enable-zstd.conf
diff --git a/...etc/dracut.conf.d/80-enable-pcrphase.conf → ...etc/dracut.conf.d/80-enable-pcrphase.conf b/...etc/dracut.conf.d/80-enable-pcrphase.conf → ...etc/dracut.conf.d/80-enable-pcrphase.conf
diff --git a/config/files/etc/locale.conf → files/system/etc/locale.conf b/config/files/etc/locale.conf → files/system/etc/locale.conf
diff --git a/config/files/etc/localtime → files/system/etc/localtime b/config/files/etc/localtime → files/system/etc/localtime
diff --git a/...pg/RPM-GPG-KEY-rpmfusion-free-fedora-2020 → ...pg/RPM-GPG-KEY-rpmfusion-free-fedora-2020 b/...pg/RPM-GPG-KEY-rpmfusion-free-fedora-2020 → ...pg/RPM-GPG-KEY-rpmfusion-free-fedora-2020
diff --git a/...-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-40 → ...-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-40 b/...-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-40 → ...-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-40
diff --git a/...-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-41 → ...-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-41 b/...-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-41 → ...-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-41
diff --git a/...-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-42 → ...-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-42 b/...-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-42 → ...-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-42
diff --git a/.../RPM-GPG-KEY-rpmfusion-free-fedora-latest → .../RPM-GPG-KEY-rpmfusion-free-fedora-latest b/.../RPM-GPG-KEY-rpmfusion-free-fedora-latest → .../RPM-GPG-KEY-rpmfusion-free-fedora-latest
diff --git a/...RPM-GPG-KEY-rpmfusion-free-fedora-rawhide → ...RPM-GPG-KEY-rpmfusion-free-fedora-rawhide b/...RPM-GPG-KEY-rpmfusion-free-fedora-rawhide → ...RPM-GPG-KEY-rpmfusion-free-fedora-rawhide
diff --git a/...RPM-GPG-KEY-rpmfusion-nonfree-fedora-2020 → ...RPM-GPG-KEY-rpmfusion-nonfree-fedora-2020 b/...RPM-GPG-KEY-rpmfusion-nonfree-fedora-2020 → ...RPM-GPG-KEY-rpmfusion-nonfree-fedora-2020
diff --git a/...g/RPM-GPG-KEY-rpmfusion-nonfree-fedora-40 → ...g/RPM-GPG-KEY-rpmfusion-nonfree-fedora-40 b/...g/RPM-GPG-KEY-rpmfusion-nonfree-fedora-40 → ...g/RPM-GPG-KEY-rpmfusion-nonfree-fedora-40
diff --git a/...g/RPM-GPG-KEY-rpmfusion-nonfree-fedora-41 → ...g/RPM-GPG-KEY-rpmfusion-nonfree-fedora-41 b/...g/RPM-GPG-KEY-rpmfusion-nonfree-fedora-41 → ...g/RPM-GPG-KEY-rpmfusion-nonfree-fedora-41
diff --git a/...g/RPM-GPG-KEY-rpmfusion-nonfree-fedora-42 → ...g/RPM-GPG-KEY-rpmfusion-nonfree-fedora-42 b/...g/RPM-GPG-KEY-rpmfusion-nonfree-fedora-42 → ...g/RPM-GPG-KEY-rpmfusion-nonfree-fedora-42
diff --git a/...M-GPG-KEY-rpmfusion-nonfree-fedora-latest → ...M-GPG-KEY-rpmfusion-nonfree-fedora-latest b/...M-GPG-KEY-rpmfusion-nonfree-fedora-latest → ...M-GPG-KEY-rpmfusion-nonfree-fedora-latest
diff --git a/...-GPG-KEY-rpmfusion-nonfree-fedora-rawhide → ...-GPG-KEY-rpmfusion-nonfree-fedora-rawhide b/...-GPG-KEY-rpmfusion-nonfree-fedora-rawhide → ...-GPG-KEY-rpmfusion-nonfree-fedora-rawhide
diff --git a/config/files/etc/sddm.conf.d/hidpi.conf → files/system/etc/sddm.conf.d/hidpi.conf b/config/files/etc/sddm.conf.d/hidpi.conf → files/system/etc/sddm.conf.d/hidpi.conf
diff --git a/...e-finalize-staged.service.d/override.conf → ...e-finalize-staged.service.d/override.conf b/...e-finalize-staged.service.d/override.conf → ...e-finalize-staged.service.d/override.conf
diff --git a/...systemd/system/tailscaled-restart.service → ...systemd/system/tailscaled-restart.service b/...systemd/system/tailscaled-restart.service → ...systemd/system/tailscaled-restart.service
diff --git a/config/files/etc/vconsole.conf → files/system/etc/vconsole.conf b/config/files/etc/vconsole.conf → files/system/etc/vconsole.conf
diff --git a/config/files/etc/yum.repos.d/1password.repo → files/system/etc/yum.repos.d/1password.repo b/config/files/etc/yum.repos.d/1password.repo → files/system/etc/yum.repos.d/1password.repo
diff --git a/...les/etc/yum.repos.d/fedora-40-kernel.repo → ...tem/etc/yum.repos.d/fedora-40-kernel.repo b/...les/etc/yum.repos.d/fedora-40-kernel.repo → ...tem/etc/yum.repos.d/fedora-40-kernel.repo
diff --git a/...files/etc/yum.repos.d/fedora-rawhide.repo → ...ystem/etc/yum.repos.d/fedora-rawhide.repo b/...files/etc/yum.repos.d/fedora-rawhide.repo → ...ystem/etc/yum.repos.d/fedora-rawhide.repo
diff --git a/.../files/etc/yum.repos.d/google-chrome.repo → ...system/etc/yum.repos.d/google-chrome.repo b/.../files/etc/yum.repos.d/google-chrome.repo → ...system/etc/yum.repos.d/google-chrome.repo
diff --git a/config/files/etc/yum.repos.d/koji.repo → files/system/etc/yum.repos.d/koji.repo b/config/files/etc/yum.repos.d/koji.repo → files/system/etc/yum.repos.d/koji.repo
diff --git a/config/files/etc/yum.repos.d/local-rpms.repo → files/system/etc/yum.repos.d/local-rpms.repo b/config/files/etc/yum.repos.d/local-rpms.repo → files/system/etc/yum.repos.d/local-rpms.repo
diff --git a/...c/yum.repos.d/rpmfusion-free-rawhide.repo → ...c/yum.repos.d/rpmfusion-free-rawhide.repo b/...c/yum.repos.d/rpmfusion-free-rawhide.repo → ...c/yum.repos.d/rpmfusion-free-rawhide.repo
diff --git a/...pos.d/rpmfusion-free-updates-testing.repo → ...pos.d/rpmfusion-free-updates-testing.repo b/...pos.d/rpmfusion-free-updates-testing.repo → ...pos.d/rpmfusion-free-updates-testing.repo
diff --git a/...c/yum.repos.d/rpmfusion-free-updates.repo → ...c/yum.repos.d/rpmfusion-free-updates.repo b/...c/yum.repos.d/rpmfusion-free-updates.repo → ...c/yum.repos.d/rpmfusion-free-updates.repo
diff --git a/...files/etc/yum.repos.d/rpmfusion-free.repo → ...ystem/etc/yum.repos.d/rpmfusion-free.repo b/...files/etc/yum.repos.d/rpmfusion-free.repo → ...ystem/etc/yum.repos.d/rpmfusion-free.repo
diff --git a/...os.d/rpmfusion-nonfree-nvidia-driver.repo → ...os.d/rpmfusion-nonfree-nvidia-driver.repo b/...os.d/rpmfusion-nonfree-nvidia-driver.repo → ...os.d/rpmfusion-nonfree-nvidia-driver.repo
diff --git a/...um.repos.d/rpmfusion-nonfree-rawhide.repo → ...um.repos.d/rpmfusion-nonfree-rawhide.repo b/...um.repos.d/rpmfusion-nonfree-rawhide.repo → ...um.repos.d/rpmfusion-nonfree-rawhide.repo
diff --git a/.../yum.repos.d/rpmfusion-nonfree-steam.repo → .../yum.repos.d/rpmfusion-nonfree-steam.repo b/.../yum.repos.d/rpmfusion-nonfree-steam.repo → .../yum.repos.d/rpmfusion-nonfree-steam.repo
diff --git a/....d/rpmfusion-nonfree-updates-testing.repo → ....d/rpmfusion-nonfree-updates-testing.repo b/....d/rpmfusion-nonfree-updates-testing.repo → ....d/rpmfusion-nonfree-updates-testing.repo
diff --git a/...um.repos.d/rpmfusion-nonfree-updates.repo → ...um.repos.d/rpmfusion-nonfree-updates.repo b/...um.repos.d/rpmfusion-nonfree-updates.repo → ...um.repos.d/rpmfusion-nonfree-updates.repo
diff --git a/...es/etc/yum.repos.d/rpmfusion-nonfree.repo → ...em/etc/yum.repos.d/rpmfusion-nonfree.repo b/...es/etc/yum.repos.d/rpmfusion-nonfree.repo → ...em/etc/yum.repos.d/rpmfusion-nonfree.repo
diff --git a/config/files/etc/yum.repos.d/tailscale.repo → files/system/etc/yum.repos.d/tailscale.repo b/config/files/etc/yum.repos.d/tailscale.repo → files/system/etc/yum.repos.d/tailscale.repo
diff --git a/config/files/rpms/.gitkeep → files/system/rpms/.gitkeep b/config/files/rpms/.gitkeep → files/system/rpms/.gitkeep
diff --git a/config/files/usr/sbin/finalize-ostree-uki.py → files/system/usr/sbin/finalize-ostree-uki.py b/config/files/usr/sbin/finalize-ostree-uki.py → files/system/usr/sbin/finalize-ostree-uki.py
diff --git a/config/files/usr/sbin/ostree-dnf-upgrade.py → files/system/usr/sbin/ostree-dnf-upgrade.py b/config/files/usr/sbin/ostree-dnf-upgrade.py → files/system/usr/sbin/ostree-dnf-upgrade.py
diff --git a/recipes/fedora-kinoite-laptop.yml b/recipes/fedora-kinoite-laptop.yml
@@ -20,11 +20,16 @@ modules:
   # copy only files needed by rpm and dracut
   - type: files
     files:
-      - etc/yum.repos.d: /etc/yum.repos.d
-      - etc/pki: /etc/pki
-      - etc/dracut.conf.d: /etc/dracut.conf.d
-      - usr/sbin: /usr/sbin
-      - rpms: /usr/share/local-rpm-repo
+      - source: system/etc/yum.repos.d
+        destination: /etc/yum.repos.d
+      - source: system/etc/pki
+        destination: /etc/pki
+      - source: system/etc/dracut.conf.d
+        destination: /etc/dracut.conf.d
+      - source: system/usr/sbin
+        destination: /usr/sbin
+      - source: system/rpms
+        destination: /usr/share/local-rpm-repo
 
   - type: containerfile
     containerfiles:
@@ -164,8 +169,10 @@ modules:
   # copy rest of customizations
   - type: files
     files:
-      - usr: /usr
-      - etc: /etc
+      - source: system/usr
+        destination: /usr
+      - source: system/etc
+        destination: /etc
 
   - type: systemd
     system: