Accepting request 852648 from Virtualization:Appliances:Images:openSUSE-Tumbleweed

OBS-URL: https://build.opensuse.org/request/show/852648
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kiwi-templates-JeOS?expand=0&rev=20
This commit is contained in:
Dominique Leuenberger 2020-12-05 19:36:13 +00:00 committed by Git OBS Bridge
commit c57e034727
3 changed files with 109 additions and 14 deletions

View File

@ -9,13 +9,29 @@
<specification>openSUSE Tumbleweed JeOS</specification> <specification>openSUSE Tumbleweed JeOS</specification>
</description> </description>
<profiles> <profiles>
<profile name="kvm-and-xen" description="JeOS for KVM and HVM Xen" arch="x86_64"/> <!-- Those two are only used as deps -->
<profile name="kvm-and-xen.x86_64" description="JeOS for KVM and HVM Xen" arch="x86_64"/>
<profile name="kvm-and-xen.aarch64" description="JeOS for KVM and HVM Xen" arch="aarch64"/>
<profile name="kvm-and-xen" description="JeOS for KVM and HVM Xen" arch="x86_64">
<requires profile="kvm-and-xen.x86_64"/>
</profile>
<profile name="kvm-and-xen" description="JeOS for KVM and HVM Xen" arch="aarch64">
<requires profile="kvm-and-xen.aarch64"/>
</profile>
<profile name="VMware" description="JeOS for VMware" arch="x86_64"/> <profile name="VMware" description="JeOS for VMware" arch="x86_64"/>
<profile name="MS-HyperV" description="JeOS for Hyper-V" arch="x86_64"/> <!-- Those two are only used as deps -->
<profile name="MS-HyperV.x86_64" description="JeOS for Hyper-V" arch="x86_64"/>
<profile name="MS-HyperV.aarch64" description="JeOS for Hyper-V" arch="aarch64"/>
<profile name="MS-HyperV" description="JeOS for Hyper-V" arch="x86_64">
<requires profile="MS-HyperV.x86_64"/>
</profile>
<profile name="MS-HyperV" description="JeOS for Hyper-V" arch="aarch64">
<requires profile="MS-HyperV.aarch64"/>
</profile>
<profile name="OpenStack-Cloud" description="JeOS for OpenStack Cloud" arch="x86_64"/> <profile name="OpenStack-Cloud" description="JeOS for OpenStack Cloud" arch="x86_64"/>
<profile name="RaspberryPi" description="JeOS for the Raspberry Pi" arch="aarch64"/> <profile name="RaspberryPi" description="JeOS for the Raspberry Pi" arch="aarch64"/>
</profiles> </profiles>
<preferences profiles="kvm-and-xen"> <preferences profiles="kvm-and-xen.x86_64">
<version>15.1.0</version> <version>15.1.0</version>
<packagemanager>zypper</packagemanager> <packagemanager>zypper</packagemanager>
<bootloader-theme>openSUSE</bootloader-theme> <bootloader-theme>openSUSE</bootloader-theme>
@ -48,6 +64,38 @@
</type> </type>
</preferences> </preferences>
<preferences profiles="kvm-and-xen.aarch64">
<version>15.1.0</version>
<packagemanager>zypper</packagemanager>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<type
image="vmx"
filesystem="btrfs"
format="qcow2"
bootloader="grub2"
firmware="uefi"
efipartsize="33"
kernelcmdline="quiet plymouth.enable=0 console=ttyS0,115200 console=tty0"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
btrfs_quota_groups="true"
btrfs_root_is_snapshot="true"
>
<systemdisk>
<volume name="home"/>
<volume name="root"/>
<volume name="opt"/>
<volume name="srv"/>
<volume name="boot/grub2/arm64-efi" mountpoint="boot/grub2/arm64-efi"/>
<volume name="usr/local"/>
<volume name="var" copy_on_write="false"/>
</systemdisk>
<size unit="G">24</size>
</type>
</preferences>
<preferences profiles="VMware"> <preferences profiles="VMware">
<version>15.1.0</version> <version>15.1.0</version>
<packagemanager>zypper</packagemanager> <packagemanager>zypper</packagemanager>
@ -104,7 +152,7 @@
</type> </type>
</preferences> </preferences>
<preferences profiles="MS-HyperV"> <preferences profiles="MS-HyperV.x86_64">
<version>15.1.0</version> <version>15.1.0</version>
<packagemanager>zypper</packagemanager> <packagemanager>zypper</packagemanager>
<bootloader-theme>openSUSE</bootloader-theme> <bootloader-theme>openSUSE</bootloader-theme>
@ -138,6 +186,40 @@
</type> </type>
</preferences> </preferences>
<preferences profiles="MS-HyperV.aarch64">
<version>15.1.0</version>
<packagemanager>zypper</packagemanager>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<type
image="vmx"
filesystem="btrfs"
format="vhdx"
boottimeout="10"
bootloader="grub2"
firmware="uefi"
efipartsize="33"
kernelcmdline="quiet plymouth.enable=0 rootdelay=300 console=ttyS0,115200 console=tty0 earlyprintk=ttyS0,115200"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
btrfs_quota_groups="true"
btrfs_root_is_snapshot="true"
>
<systemdisk>
<volume name="home"/>
<volume name="root"/>
<volume name="tmp"/>
<volume name="opt"/>
<volume name="srv"/>
<volume name="boot/grub2/arm64-efi" mountpoint="boot/grub2/arm64-efi"/>
<volume name="usr/local"/>
<volume name="var" copy_on_write="false"/>
</systemdisk>
<size unit="G">24</size>
</type>
</preferences>
<preferences profiles="RaspberryPi"> <preferences profiles="RaspberryPi">
<version>15.1.0</version> <version>15.1.0</version>
<packagemanager>zypper</packagemanager> <packagemanager>zypper</packagemanager>
@ -234,12 +316,12 @@
</packages> </packages>
<packages type="image" profiles="kvm-and-xen"> <packages type="image" profiles="kvm-and-xen">
<package name="xen-tools-domU" arch="x86_64"/> <package name="xen-tools-domU"/>
<package name="xen-libs" arch="x86_64"/> <package name="xen-libs"/>
<package name="kernel-default-base"/> <package name="kernel-default-base"/>
</packages> </packages>
<packages type="image" profiles="kvm-and-xen,OpenStack-Cloud"> <packages type="image" profiles="kvm-and-xen,OpenStack-Cloud">
<package name="qemu-guest-agent" arch="x86_64"/> <package name="qemu-guest-agent"/>
</packages> </packages>
<packages type="image" profiles="VMware"> <packages type="image" profiles="VMware">
<package name="open-vm-tools" arch="x86_64"/> <package name="open-vm-tools" arch="x86_64"/>

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Dec 2 14:28:44 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Include xen and qemu-guest packages for aarch64 too
-------------------------------------------------------------------
Wed Dec 2 13:58:56 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Add aarch64 support for kvm-and-xen image
-------------------------------------------------------------------
Wed Dec 2 13:36:23 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Add aarch64 support for MS-HyperV
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 11 07:34:51 UTC 2020 - Fabian Vogt <fvogt@suse.com> Fri Sep 11 07:34:51 UTC 2020 - Fabian Vogt <fvogt@suse.com>

View File

@ -17,15 +17,9 @@
%define dest %_datadir/kiwi/image/openSUSE-Tumbleweed-JeOS %define dest %_datadir/kiwi/image/openSUSE-Tumbleweed-JeOS
%if "@BUILD_FLAVOR@" != ""
ExclusiveArch: do_not_build
%endif
Name: kiwi-templates-JeOS Name: kiwi-templates-JeOS
Version: 84.87 Version: 84.87
Release: 0 Release: 0
BuildArch: noarch
Summary: KIWI - openSUSE Tumbleweed JeOS image templates Summary: KIWI - openSUSE Tumbleweed JeOS image templates
License: MIT License: MIT
Group: System/Management Group: System/Management
@ -37,6 +31,10 @@ Source03: editbootinstall_rpi.sh
Source99: LICENSE Source99: LICENSE
Requires: python3-kiwi Requires: python3-kiwi
Supplements: kiwi-templates Supplements: kiwi-templates
BuildArch: noarch
%if "@BUILD_FLAVOR@" != ""
ExclusiveArch: do_not_build
%endif
%description %description
This package contains system image templates to easily build This package contains system image templates to easily build
@ -44,7 +42,7 @@ a openSUSE Tumbleweed based operating system image with
kiwi. kiwi.
%prep %prep
%setup -cT %setup -q -cT
cp "%SOURCE99" . cp "%SOURCE99" .
%build %build