Skip to content

Commit

Permalink
Add Leap,Leap-PXE flavors (agama-project#1734)
Browse files Browse the repository at this point in the history
## Problem

*openSUSE section is not really applicable to Leap*
Leap is rather a mix of SLE and openSUSE profiles (e.g. ruby version),
with a custom branding.
As of now I have to do a bunch manual edits on our agama-insatller-Leap
every time we want to rebase . With this we might just need to edit
multibuild flavors, and override version.


https://build.opensuse.org/package/show/home:lkocman:branches:systemsmanagement:Agama:Devel/agama-installer
  • Loading branch information
imobachgs authored Nov 11, 2024
2 parents 197be56 + 946e7d9 commit 65939ce
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 7 deletions.
7 changes: 7 additions & 0 deletions live/src/agama-installer.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Nov 7 11:32:09 UTC 2024 - Lubos Kocman <[email protected]>

- Add Leap,Leap-PXE profiles
The openSUSE profile is basically Tumbleweed
Leap has ruby version from SLE profile, and Leap specific branding

-------------------------------------------------------------------
Tue Nov 5 12:41:19 UTC 2024 - Eugenio Paolantonio <[email protected]>

Expand Down
31 changes: 24 additions & 7 deletions live/src/agama-installer.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
<specification>Agama Live ISO</specification>
</description>
<profiles>
<profile name="Leap" description="openSUSE Leap image" import="true" />
<profile name="openSUSE" description="openSUSE multiproduct image" import="true" />
<profile name="SLE" description="SLE-based image" import="true" />
<profile name="openSUSE-PXE" description="openSUSE OEM image for remote instalaltion" import="true" />
<profile name="Leap-PXE" description="openSUSE Leap OEM image for remote installation" import="true" />
</profiles>
<preferences>
<version>10.0.0</version>
Expand All @@ -24,22 +26,22 @@
<bootsplash-theme>bgrt</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
</preferences>
<preferences arch="ppc64le" profiles="openSUSE,SLE">
<preferences arch="ppc64le" profiles="openSUSE,SLE,Leap">
<type image="iso" flags="dmsquash" firmware="ofw" mediacheck="true" volid="agama" editbootconfig="fix_bootconfig">
<bootloader name="grub2" console="serial" timeout="10"/>
</type>
</preferences>
<preferences arch="aarch64,x86_64" profiles="openSUSE,SLE">
<preferences arch="aarch64,x86_64" profiles="openSUSE,SLE,Leap">
<type image="iso" flags="dmsquash" firmware="uefi" mediacheck="true" volid="agama" editbootconfig="fix_bootconfig">
<bootloader name="grub2" timeout="10"/>
</type>
</preferences>
<preferences arch="s390x" profiles="openSUSE,SLE">
<preferences arch="s390x" profiles="openSUSE,SLE,Leap">
<type image="iso" flags="dmsquash" mediacheck="true" volid="agama" editbootconfig="fix_bootconfig">
<bootloader name="custom" />
</type>
</preferences>
<preferences arch="ppc64le" profiles="openSUSE-PXE">
<preferences arch="ppc64le" profiles="openSUSE-PXE,Leap-PXE">
<!-- For some reason the compression results on ppc64le are not as good as on the other archs -->
<type image="oem" filesystem="btrfs" fsmountoptions="compress=zstd:15" firmware="ofw" installpxe="true" installboot="install" kernelcmdline="rd.kiwi.ramdisk ramdisk_size=3174400" volid="agama">
<bootloader name="grub2" console="serial" timeout="1"/>
Expand All @@ -53,7 +55,7 @@
<size unit="M">3000</size>
</type>
</preferences>
<preferences arch="s390x" profiles="openSUSE-PXE">
<preferences arch="s390x" profiles="openSUSE-PXE,Leap-PXE">
<type image="oem" filesystem="btrfs" fsmountoptions="compress=zstd:15" installpxe="true" installboot="install" kernelcmdline="rd.kiwi.ramdisk ramdisk_size=2097152" volid="agama">
<bootloader name="custom"/>
<oemconfig>
Expand All @@ -66,7 +68,7 @@
<size unit="M">1900</size>
</type>
</preferences>
<preferences arch="aarch64,x86_64" profiles="openSUSE-PXE">
<preferences arch="aarch64,x86_64" profiles="openSUSE-PXE,Leap-PXE">
<type image="oem" filesystem="btrfs" fsmountoptions="compress=zstd:15" firmware="uefi" installiso="true" installpxe="true" installboot="install" kernelcmdline="rd.kiwi.ramdisk ramdisk_size=2097152" volid="agama">
<bootloader name="grub2" timeout="1"/>
<oemconfig>
Expand All @@ -86,7 +88,7 @@
<repository type="rpm-md">
<source path="obsrepositories:/"/>
</repository>
<packages type="image" profiles="openSUSE-PXE">
<packages type="image" profiles="openSUSE-PXE,Leap-PXE">
<package name="dracut-kiwi-oem-repart"/>
<package name="dracut-kiwi-oem-dump"/>
<archive name="root-openSUSE-PXE.tar.xz"/>
Expand Down Expand Up @@ -158,6 +160,18 @@
<package name="qrencode"/>
<archive name="root.tar.xz"/>
</packages>
<!-- additional packages for the Leap distributions -->
<packages type="image" profiles="Leap,Leap-PXE">
<package name="agama-products-opensuse"/>
<package name="grub2-branding-openSUSE" arch="aarch64,x86_64"/>
<package name="openSUSE-repos-Leap"/>
<package name="patterns-openSUSE-base"/>
<package name="ruby3.2-rubygem-agama-yast"/>
<package name="ruby3.2-rubygem-byebug"/>
<package name="staging-build-key"/>
<package name="openSUSE-build-key"/>
<package name="MozillaFirefox-branding-openSUSE"/>
</packages>
<!-- additional packages for the openSUSE distributions -->
<packages type="image" profiles="openSUSE,openSUSE-PXE">
<package name="agama-products-opensuse"/>
Expand Down Expand Up @@ -188,6 +202,9 @@
<package name="ca-certificates"/>
<package name="ca-certificates-mozilla"/>
</packages>
<packages type="bootstrap" profiles="Leap,Leap-PXE">
<package name="Leap-release"/>
</packages>
<packages type="bootstrap" profiles="openSUSE,openSUSE-PXE">
<package name="openSUSE-release"/>
<package name="openSUSE-release-ftp"/>
Expand Down

0 comments on commit 65939ce

Please sign in to comment.