Backport #1798 to infer types/formats for new FEX backing images
(cherry picked from commit 92d7921cf1bbf816217e2c4945dc8f6ae7881a39)
This commit is contained in:
parent
cc5b039197
commit
1fb0c8aa16
28
1798.patch
Normal file
28
1798.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From eb4ba5f637153f0037f05981adea8b35fc0f6b25 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Williamson <awilliam@redhat.com>
|
||||
Date: Nov 20 2024 00:49:30 +0000
|
||||
Subject: kiwibuild: extend productmd type/format detection for FEX images
|
||||
|
||||
|
||||
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
||||
|
||||
---
|
||||
|
||||
diff --git a/pungi/phases/kiwibuild.py b/pungi/phases/kiwibuild.py
|
||||
index 15732ce..400ea6a 100644
|
||||
--- a/pungi/phases/kiwibuild.py
|
||||
+++ b/pungi/phases/kiwibuild.py
|
||||
@@ -19,6 +19,12 @@ KIWIEXTENSIONS = [
|
||||
# so 'boot' is just a default guess. 'iso' is not a valid
|
||||
# productmd image type
|
||||
("boot", [".iso"], "iso"),
|
||||
+ ("fex", ["erofs.xz"], "erofs.xz"),
|
||||
+ ("fex", ["erofs.gz"], "erofs.gz"),
|
||||
+ ("fex", ["erofs"], "erofs"),
|
||||
+ ("fex", ["squashfs.xz"], "squashfs.xz"),
|
||||
+ ("fex", ["squashfs.gz"], "squashfs.gz"),
|
||||
+ ("fex", ["squashfs"], "squashfs"),
|
||||
]
|
||||
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
Name: pungi
|
||||
Version: 4.7.0
|
||||
Release: 7%{?dist}.alma.1
|
||||
Release: 8%{?dist}.alma.1
|
||||
Summary: Distribution compose tool
|
||||
|
||||
License: GPL-2.0-only
|
||||
@ -14,6 +14,7 @@ Patch: https://pagure.io/pungi/pull-request/1788.patch
|
||||
Patch: https://pagure.io/pungi/pull-request/1789.patch
|
||||
Patch: https://pagure.io/pungi/pull-request/1790.patch
|
||||
Patch: https://pagure.io/pungi/pull-request/1796.patch
|
||||
Patch: https://pagure.io/pungi/pull-request/1798.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: python3-pytest
|
||||
@ -180,6 +181,9 @@ rm %{buildroot}%{_bindir}/pungi
|
||||
%{_bindir}/%{name}-cache-cleanup
|
||||
|
||||
%changelog
|
||||
* Tue Nov 19 2024 Adam Williamson <awilliam@redhat.com> - 4.7.0-8
|
||||
- Backport #1798 to infer types/formats for new FEX backing images
|
||||
|
||||
* Tue Nov 19 2024 Adam Williamson <awilliam@redhat.com> - 4.7.0-7
|
||||
- Backport #1796 to speed up compose some more
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user