openSUSE/Leap
SHA256
5
0
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'don't use readonly root, further rename _multibuild' (#6) from master into 16.0

Browse Source 
Reviewed-on: #6
This commit is contained in:
Lubos Kocman 2024-06-24 13:47:19 +02:00
commit a2f7a4fba8
2 changed files with 64 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
Leap/Leap.kiwi
View File

@ -6,13 +6,13 @@
<description type="system"> <description type="system">
<author>openSUSE</author> <author>openSUSE</author>
<contact>crc@suse.com</contact> <contact>crc@suse.com</contact>
<specification>openSUSE Leap Micro</specification> <specification>Leap</specification>
</description> </description>
<profiles> <profiles>
<!-- Profiles used as dependencies of actual image profiles --> <!-- Profiles used as dependencies of actual image profiles -->
<!-- Flavors --> <!-- Flavors -->
<profile name="full" description="openSUSE Leap Micro as KVM and Container host"/> <profile name="full" description="Leap as KVM and Container host"/>
<profile name="container-host" description="openSUSE Leap Micro as Container host"/> <profile name="container-host" description="Leap as Container host"/>
<profile name="ecs_anywhere" description="Amazon ECS Anywhere support"/> <profile name="ecs_anywhere" description="Amazon ECS Anywhere support"/>
<!-- Platforms - support profiles --> <!-- Platforms - support profiles -->
<profile name="bootloader" description="Bootloader files for x86_64 and aarch64"/> <profile name="bootloader" description="Bootloader files for x86_64 and aarch64"/>
@ -64,123 +64,123 @@
<requires profile="bootloader"/> <requires profile="bootloader"/>
</profile> </profile>
<!-- Images (flavor + platform) --> <!-- Images (flavor + platform) -->
<profile name="Default" description="openSUSE Leap Micro with Podman and KVM as raw image with uEFI boot" arch="x86_64"> <profile name="Default" description="Leap with Podman and KVM as raw image with uEFI boot" arch="x86_64">
<requires profile="full"/> <requires profile="full"/>
<requires profile="x86"/> <requires profile="x86"/>
</profile> </profile>
<profile name="Base" description="openSUSE Leap Micro with Podman as raw image with uEFI boot" arch="x86_64"> <profile name="Base" description="Leap with Podman as raw image with uEFI boot" arch="x86_64">
<requires profile="container-host"/> <requires profile="container-host"/>
<requires profile="x86"/> <requires profile="x86"/>
</profile> </profile>
<profile name="Default-VMware" description="openSUSE Leap Micro with Podman and KVM as raw image with uEFI boot" arch="x86_64"> <profile name="Default-VMware" description="Leap with Podman and KVM as raw image with uEFI boot" arch="x86_64">
<requires profile="full"/> <requires profile="full"/>
<requires profile="x86-vmware"/> <requires profile="x86-vmware"/>
</profile> </profile>
<profile name="Base-VMware" description="openSUSE Leap Micro with Podman as raw image with uEFI boot" arch="x86_64"> <profile name="Base-VMware" description="Leap with Podman as raw image with uEFI boot" arch="x86_64">
<requires profile="container-host"/> <requires profile="container-host"/>
<requires profile="x86-vmware"/> <requires profile="x86-vmware"/>
</profile> </profile>
<profile name="Default-encrypted" description="openSUSE Leap Micro with Podman and KVM as raw image with uEFI boot" arch="x86_64"> <profile name="Default-encrypted" description="Leap with Podman and KVM as raw image with uEFI boot" arch="x86_64">
<requires profile="full"/> <requires profile="full"/>
<requires profile="x86-encrypted"/> <requires profile="x86-encrypted"/>
</profile> </profile>
<profile name="Base-encrypted" description="openSUSE Leap Micro with Podman as raw image with uEFI boot" arch="x86_64"> <profile name="Base-encrypted" description="Leap with Podman as raw image with uEFI boot" arch="x86_64">
<requires profile="container-host"/> <requires profile="container-host"/>
<requires profile="x86-encrypted"/> <requires profile="x86-encrypted"/>
</profile> </profile>
<profile name="Base-RT-encrypted" description="openSUSE Leap Micro with Podman as raw image with uEFI boot" arch="x86_64"> <profile name="Base-RT-encrypted" description="Leap with Podman as raw image with uEFI boot" arch="x86_64">
<requires profile="container-host"/> <requires profile="container-host"/>
<requires profile="x86-rt-encrypted"/> <requires profile="x86-rt-encrypted"/>
</profile> </profile>
<profile name="Default-SelfInstall" description="openSUSE Leap Micro with Podman and KVM as raw image with uEFI boot - SelfInstall" arch="x86_64"> <profile name="Default-SelfInstall" description="Leap with Podman and KVM as raw image with uEFI boot - SelfInstall" arch="x86_64">
<requires profile="full"/> <requires profile="full"/>
<requires profile="x86-self_install"/> <requires profile="x86-self_install"/>
<requires profile="self_install"/> <requires profile="self_install"/>
</profile> </profile>
<profile name="Base-SelfInstall" description="openSUSE Leap Micro with Podman as raw image with uEFI boot - SelfInstall" arch="x86_64"> <profile name="Base-SelfInstall" description="Leap with Podman as raw image with uEFI boot - SelfInstall" arch="x86_64">
<requires profile="container-host"/> <requires profile="container-host"/>
<requires profile="x86-self_install"/> <requires profile="x86-self_install"/>
<requires profile="self_install"/> <requires profile="self_install"/>
</profile> </profile>
<profile name="Default-SelfInstall" description="openSUSE Leap Micro with Podman and KVM as raw image with uEFI boot - SelfInstall" arch="aarch64"> <profile name="Default-SelfInstall" description="Leap with Podman and KVM as raw image with uEFI boot - SelfInstall" arch="aarch64">
<requires profile="full"/> <requires profile="full"/>
<requires profile="aarch64-self_install"/> <requires profile="aarch64-self_install"/>
<requires profile="self_install"/> <requires profile="self_install"/>
</profile> </profile>
<profile name="Base-SelfInstall" description="openSUSE Leap Micro with Podman as raw image with uEFI boot - SelfInstall" arch="aarch64"> <profile name="Base-SelfInstall" description="Leap with Podman as raw image with uEFI boot - SelfInstall" arch="aarch64">
<requires profile="container-host"/> <requires profile="container-host"/>
<requires profile="aarch64-self_install"/> <requires profile="aarch64-self_install"/>
<requires profile="self_install"/> <requires profile="self_install"/>
</profile> </profile>
<profile name="ECS-Anywhere" description="openSUSE Leap Micro with Podman and ECS Anywhere packagesas raw image with uEFI boot" arch="x86_64"> <profile name="ECS-Anywhere" description="Leap with Podman and ECS Anywhere packagesas raw image with uEFI boot" arch="x86_64">
<requires profile="full"/> <requires profile="full"/>
<requires profile="ecs_anywhere"/> <requires profile="ecs_anywhere"/>
<requires profile="x86"/> <requires profile="x86"/>
</profile> </profile>
<profile name="ECS-Anywhere-SelfInstall" description="openSUSE Leap Micro with Podman and ECS Anywhere packages as raw image with uEFI boot - SelfInstall" arch="x86_64"> <profile name="ECS-Anywhere-SelfInstall" description="Leap with Podman and ECS Anywhere packages as raw image with uEFI boot - SelfInstall" arch="x86_64">
<requires profile="full"/> <requires profile="full"/>
<requires profile="ecs_anywhere"/> <requires profile="ecs_anywhere"/>
<requires profile="x86-self_install"/> <requires profile="x86-self_install"/>
<requires profile="self_install"/> <requires profile="self_install"/>
</profile> </profile>
<profile name="Default" description="openSUSE Leap Micro with Podman and KVM as raw image with uEFI boot" arch="aarch64"> <profile name="Default" description="Leap with Podman and KVM as raw image with uEFI boot" arch="aarch64">
<requires profile="full"/> <requires profile="full"/>
<requires profile="rpi"/> <requires profile="rpi"/>
</profile> </profile>
<profile name="Base" description="openSUSE Leap Micro with Podman as raw image with uEFI boot" arch="aarch64"> <profile name="Base" description="Leap with Podman as raw image with uEFI boot" arch="aarch64">
<requires profile="container-host"/> <requires profile="container-host"/>
<requires profile="rpi"/> <requires profile="rpi"/>
</profile> </profile>
<profile name="Base-RT" description="openSUSE Leap Micro with Podman as raw image with uEFI boot" arch="x86_64"> <profile name="Base-RT" description="Leap with Podman as raw image with uEFI boot" arch="x86_64">
<requires profile="container-host"/> <requires profile="container-host"/>
<requires profile="x86-rt"/> <requires profile="x86-rt"/>
</profile> </profile>
<profile name="Base-RT-SelfInstall" description="openSUSE Leap Micro with Podman as raw image with uEFI boot - SelfInstall" arch="x86_64"> <profile name="Base-RT-SelfInstall" description="Leap with Podman as raw image with uEFI boot - SelfInstall" arch="x86_64">
<requires profile="container-host"/> <requires profile="container-host"/>
<requires profile="x86-rt-self_install"/> <requires profile="x86-rt-self_install"/>
<requires profile="self_install"/> <requires profile="self_install"/>
</profile> </profile>
<profile name="Default-qcow" description="openSUSE Leap Micro with Podman and KVM as raw image for KVM on System z" arch="s390x"> <profile name="Default-qcow" description="Leap with Podman and KVM as raw image for KVM on System z" arch="s390x">
<requires profile="full"/> <requires profile="full"/>
<requires profile="s390-kvm"/> <requires profile="s390-kvm"/>
</profile> </profile>
<profile name="Base-qcow" description="openSUSE Leap Micro with Podman as raw image for KVM on System z" arch="s390x"> <profile name="Base-qcow" description="Leap with Podman as raw image for KVM on System z" arch="s390x">
<requires profile="container-host"/> <requires profile="container-host"/>
<requires profile="s390-kvm"/> <requires profile="s390-kvm"/>
</profile> </profile>
<profile name="Default-dasd" description="openSUSE Leap Micro with Podman and KVM as raw image for KVM on System z" arch="s390x"> <profile name="Default-dasd" description="Leap with Podman and KVM as raw image for KVM on System z" arch="s390x">
<requires profile="full"/> <requires profile="full"/>
<requires profile="s390-dasd"/> <requires profile="s390-dasd"/>
</profile> </profile>
<profile name="Base-dasd" description="openSUSE Leap Micro with Podman as raw image for KVM on System z" arch="s390x"> <profile name="Base-dasd" description="Leap with Podman as raw image for KVM on System z" arch="s390x">
<requires profile="container-host"/> <requires profile="container-host"/>
<requires profile="s390-dasd"/> <requires profile="s390-dasd"/>
</profile> </profile>
<profile name="Default-fba" description="openSUSE Leap Micro with Podman and KVM as raw image for KVM on System z" arch="s390x"> <profile name="Default-fba" description="Leap with Podman and KVM as raw image for KVM on System z" arch="s390x">
<requires profile="full"/> <requires profile="full"/>
<requires profile="s390-fba"/> <requires profile="s390-fba"/>
</profile> </profile>
<profile name="Base-fba" description="openSUSE Leap Micro with Podman as raw image for KVM on System z" arch="s390x"> <profile name="Base-fba" description="Leap with Podman as raw image for KVM on System z" arch="s390x">
<requires profile="container-host"/> <requires profile="container-host"/>
<requires profile="s390-fba"/> <requires profile="s390-fba"/>
</profile> </profile>
<profile name="Default-legacy" description="openSUSE Leap Micro with Podman as raw image with legacy boot" arch="x86_64"> <profile name="Default-legacy" description="Leap with Podman as raw image with legacy boot" arch="x86_64">
<requires profile="full"/> <requires profile="full"/>
<requires profile="x86-legacy"/> <requires profile="x86-legacy"/>
</profile> </profile>
<profile name="Default-qcow" description="openSUSE Leap Micro with Podman and KVM as raw image with uEFI boot" arch="x86_64"> <profile name="Default-qcow" description="Leap with Podman and KVM as raw image with uEFI boot" arch="x86_64">
<requires profile="full"/> <requires profile="full"/>
<requires profile="x86-qcow"/> <requires profile="x86-qcow"/>
</profile> </profile>
<profile name="Base-qcow" description="openSUSE Leap Micro with Podman as raw image with uEFI boot" arch="x86_64"> <profile name="Base-qcow" description="Leap with Podman as raw image with uEFI boot" arch="x86_64">
<requires profile="container-host"/> <requires profile="container-host"/>
<requires profile="x86-qcow"/> <requires profile="x86-qcow"/>
</profile> </profile>
<profile name="Default-qcow" description="openSUSE Leap Micro with Podman and KMV as raw image with uEFI boot" arch="aarch64"> <profile name="Default-qcow" description="Leap with Podman and KMV as raw image with uEFI boot" arch="aarch64">
<requires profile="full"/> <requires profile="full"/>
<requires profile="aarch64-qcow"/> <requires profile="aarch64-qcow"/>
</profile> </profile>
<profile name="Base-qcow" description="openSUSE Leap Micro with Podman as raw image with uEFI boot" arch="aarch64"> <profile name="Base-qcow" description="Leap with Podman as raw image with uEFI boot" arch="aarch64">
<requires profile="container-host"/> <requires profile="container-host"/>
<requires profile="aarch64-qcow"/> <requires profile="aarch64-qcow"/>
</profile> </profile>
@ -203,7 +203,7 @@
bootkernel="custom" bootkernel="custom"
devicepersistency="by-uuid" devicepersistency="by-uuid"
btrfs_root_is_snapshot="true" btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true" btrfs_root_is_readonly_snapshot="false"
btrfs_quota_groups="true" btrfs_quota_groups="true"
luks_version="luks2" luks_version="luks2"
luks="1234" luks="1234"
@ -246,7 +246,7 @@
bootkernel="custom" bootkernel="custom"
devicepersistency="by-uuid" devicepersistency="by-uuid"
btrfs_root_is_snapshot="true" btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true" btrfs_root_is_readonly_snapshot="false"
btrfs_quota_groups="true" btrfs_quota_groups="true"
> >
<bootloader name="grub2" console="gfxterm" timeout="3"/> <bootloader name="grub2" console="gfxterm" timeout="3"/>
@ -285,7 +285,7 @@
bootkernel="custom" bootkernel="custom"
devicepersistency="by-uuid" devicepersistency="by-uuid"
btrfs_root_is_snapshot="true" btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true" btrfs_root_is_readonly_snapshot="false"
btrfs_quota_groups="true" btrfs_quota_groups="true"
> >
<bootloader name="grub2" console="gfxterm" timeout="3" /> <bootloader name="grub2" console="gfxterm" timeout="3" />
@ -326,7 +326,7 @@
btrfs_root_is_snapshot="true" btrfs_root_is_snapshot="true"
efipartsize="128" efipartsize="128"
editbootinstall="editbootinstall_rpi.sh" editbootinstall="editbootinstall_rpi.sh"
btrfs_root_is_readonly_snapshot="true" btrfs_root_is_readonly_snapshot="false"
btrfs_quota_groups="false" btrfs_quota_groups="false"
disk_start_sector="4096" disk_start_sector="4096"
> >
@ -365,7 +365,7 @@
bootkernel="custom" bootkernel="custom"
devicepersistency="by-uuid" devicepersistency="by-uuid"
btrfs_root_is_snapshot="true" btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true" btrfs_root_is_readonly_snapshot="false"
btrfs_quota_groups="true" btrfs_quota_groups="true"
disk_start_sector="4096" disk_start_sector="4096"
> >
@ -403,7 +403,7 @@
kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet" kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet"
devicepersistency="by-uuid" devicepersistency="by-uuid"
btrfs_root_is_snapshot="true" btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true" btrfs_root_is_readonly_snapshot="false"
btrfs_quota_groups="true" btrfs_quota_groups="true"
> >
<bootloader name="grub2_s390x_emu" timeout="3" /> <bootloader name="grub2_s390x_emu" timeout="3" />
@ -440,7 +440,7 @@
devicepersistency="by-uuid" devicepersistency="by-uuid"
target_blocksize="4096" target_blocksize="4096"
btrfs_root_is_snapshot="true" btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true" btrfs_root_is_readonly_snapshot="false"
btrfs_quota_groups="true" btrfs_quota_groups="true"
> >
<bootloader name="grub2_s390x_emu" console="serial" timeout="3" targettype="CDL" /> <bootloader name="grub2_s390x_emu" console="serial" timeout="3" targettype="CDL" />

26
Leap/_multibuild Normal file
View File

@ -0,0 +1,26 @@
<multibuild>
<!-- for release -->
<flavor>Default</flavor>
<flavor>Base</flavor>
<!--
<flavor>Default-VMware</flavor>
<flavor>Base-VMware</flavor>
<flavor>Default-encrypted</flavor>
<flavor>Base-encrypted</flavor>
<flavor>Default-SelfInstall</flavor>
<flavor>Base-SelfInstall</flavor>
<flavor>Default-qcow</flavor>
<flavor>Base-qcow</flavor>
<flavor>Base-RT-SelfInstall</flavor>
<flavor>Base-RT</flavor>
<flavor>Base-RT-encrypted</flavor>
<flavor>Base-dasd</flavor>
<flavor>Base-fba</flavor>
<flavor>Default-dasd</flavor>
<flavor>Default-fba</flavor> -->
<!-- for testing purposes only -->
<!--
<flavor>image-legacy</flavor>
-->
</multibuild>