indent the XML a little more consistent

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/000package-groups?expand=0&rev=38
This commit is contained in:
Stephan Kulow 2019-01-15 18:34:57 +00:00 committed by Git OBS Bridge
parent 4b4e1c5ca0
commit eda208e4b0
2 changed files with 230 additions and 284 deletions

View File

@ -13,16 +13,10 @@
<summary>openSUSE Tumbleweed Kubic</summary> <summary>openSUSE Tumbleweed Kubic</summary>
<shortsummary>openSUSE Tumbleweed Kubic</shortsummary> <shortsummary>openSUSE Tumbleweed Kubic</shortsummary>
<description>openSUSE Tumbleweed Kubic combines the benefits of a rolling <description>openSUSE Tumbleweed Kubic combines the benefits of a rolling OS with a container orchestration platform. It is a modern Linux Operating System, designed for containers and optimized for large, clustered deployments. It inherits the
OS with a container orchestration platform. benefits of openSUSE Tumbleweed while redefining the operating system into a small, efficient and reliable distribution.
It is a modern Linux Operating System, designed for containers and
optimized for large, clustered deployments. It inherits the benefits of
openSUSE Tumbleweed while redefining the operating system into a small,
efficient and reliable distribution.
</description> </description>
<linguas> <linguas>
<language>en_US</language> <language>en_US</language>
</linguas> </linguas>
@ -33,87 +27,77 @@
<buildconfig> <buildconfig>
<!-- This section is needed to generate the installation media --> <!-- This section is needed to generate the installation media -->
<producttheme>Kubic</producttheme> <producttheme>Kubic</producttheme>
<create_flavors>true</create_flavors> <create_flavors>true</create_flavors>
</buildconfig> </buildconfig>
<installconfig> <installconfig>
<!-- All flags needed during installation --> <!-- All flags needed during installation -->
<defaultlang>en_US</defaultlang> <defaultlang>en_US</defaultlang>
<datadir>suse</datadir> <datadir>suse</datadir>
<descriptiondir>suse/setup/descr</descriptiondir> <descriptiondir>suse/setup/descr</descriptiondir>
<distribution>openSUSE</distribution> <distribution>openSUSE</distribution>
</installconfig> </installconfig>
<!-- All Flags needed in the running system --> <!-- All Flags needed in the running system -->
<runtimeconfig /> <runtimeconfig/>
</product> </product>
</products> </products>
<!-- Default conditionals, repositories and archsets get imported --> <!-- Default conditionals, repositories and archsets get imported -->
<xi:include href="defaults-conditionals.include" /> <xi:include href="defaults-conditionals.include"/>
<xi:include href="defaults-archsets.include" /> <xi:include href="defaults-archsets.include"/>
<repositories> <repositories>
<repository path="obs://openSUSE:Factory/standard"/> <repository path="obs://openSUSE:Factory/standard"/>
</repositories> </repositories>
<mediasets> <mediasets>
<media type="dvd5" <media
flavor="dvd" type="dvd5"
name="openSUSE-Tumbleweed-Kubic-DVD" flavor="dvd"
sourcemedia="0" name="openSUSE-Tumbleweed-Kubic-DVD"
firmware="uefi" sourcemedia="0"
mediastyle="suse-tumbleweed" firmware="uefi"
run_hybridiso="true" mediastyle="suse-tumbleweed"
run_media_check="true" run_hybridiso="true"
use_undecided="false" run_media_check="true"
create_pattern="false" use_undecided="false"
use_required="true" create_pattern="false"
use_recommended="true" use_required="true"
use_suggested="false" > use_recommended="true"
<!-- type : defines the default size of a media use_suggested="false">
flavor : flavor name - this is needed for registration <archsets>
product : references the product name <archset ref="x86_64"/>
name : name of the media </archsets>
sourcemedia : sources on this media allowed? <metadata>
create_pattern : create pattern out of the given groups <package name="skelcd-installer-Kubic"/>
use_required : add required packages from the groups <package name="skelcd-control-Kubic"/>
use_recommended : add recommended packages from the groups <package name="skelcd-openSUSE"/>
use_suggested : add suggested packages from the groups </metadata>
size : define a new size for the media - default is defined via 'type' attribute <use group="opensuse_kubic" create_pattern="false"/>
--> </media>
<archsets> </mediasets>
<archset ref="x86_64" />
</archsets>
<metadata>
<package name="skelcd-installer-Kubic"/>
<package name="skelcd-control-Kubic"/>
<package name="skelcd-openSUSE"/>
</metadata>
<use group="opensuse_kubic" create_pattern="false" />
</media>
</mediasets>
<group name="openSUSE-Kubic-direct"> <group name="openSUSE-Kubic-direct">
<packagelist> <packagelist>
<package name="caasp-container-manifests"/> <package name="caasp-container-manifests"/>
<package name="kubic-caasp-dex-image"/> <package name="kubic-caasp-dex-image"/>
<package name="kubic-dnsmasq-nanny-image"/> <package name="kubic-dnsmasq-nanny-image"/>
<package name="kubic-flannel-image"/> <package name="kubic-flannel-image"/>
<package name="kubic-haproxy-image"/> <package name="kubic-haproxy-image"/>
<package name="kubic-kubedns-image"/> <package name="kubic-kubedns-image"/>
<package name="kubic-mariadb-image"/> <package name="kubic-mariadb-image"/>
<package name="kubic-openldap-image"/> <package name="kubic-openldap-image"/>
<package name="kubic-pv-recycler-node-image"/> <package name="kubic-pv-recycler-node-image"/>
<package name="kubic-salt-api-image"/> <package name="kubic-salt-api-image"/>
<package name="kubic-salt-master-image"/> <package name="kubic-salt-master-image"/>
<package name="kubic-salt-minion-image"/> <package name="kubic-salt-minion-image"/>
<package name="kubic-sidecar-image"/> <package name="kubic-sidecar-image"/>
<package name="kubic-tiller-image"/> <package name="kubic-tiller-image"/>
<package name="kubic-velum-image"/> <package name="kubic-velum-image"/>
</packagelist> </packagelist>
</group> </group>
<xi:include href="opensuse_kubic.group" /> <xi:include href="opensuse_kubic.group"/>
</productdefinition> </productdefinition>

View File

@ -2,236 +2,198 @@
<productdefinition xmlns:xi="http://www.w3.org/2001/XInclude"> <productdefinition xmlns:xi="http://www.w3.org/2001/XInclude">
<products> <products>
<product> <product>
<vendor>openSUSE</vendor> <vendor>openSUSE</vendor>
<name>openSUSE</name> <name>openSUSE</name>
<version>20181203</version> <version>20181203</version>
<release>0</release> <release>0</release>
<productline>openSUSE</productline> <productline>openSUSE</productline>
<!-- Ensure we have valid distrotarget - used by "zypper tos" - boo#977052 -->
<register>
<updates>
<distrotarget arch="x86_64" >openSUSE-Tumbleweed-x86_64</distrotarget>
<distrotarget arch="s390x" >openSUSE-Tumbleweed-s390x</distrotarget>
<distrotarget arch="ppc64le">openSUSE-Tumbleweed-ppc64le</distrotarget>
<distrotarget arch="aarch64">openSUSE-Tumbleweed-aarch64</distrotarget>
</updates>
</register>
<updaterepokey>000000000</updaterepokey> <!-- Ensure we have valid distrotarget - used by "zypper tos" - boo#977052 -->
<summary>openSUSE Tumbleweed</summary> <!-- one line only --> <register>
<shortsummary>openSUSE</shortsummary> <updates>
<distrotarget arch="x86_64">openSUSE-Tumbleweed-x86_64</distrotarget>
<description>openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. <distrotarget arch="s390x">openSUSE-Tumbleweed-s390x</distrotarget>
</description> <distrotarget arch="ppc64le">openSUSE-Tumbleweed-ppc64le</distrotarget>
<distrotarget arch="aarch64">openSUSE-Tumbleweed-aarch64</distrotarget>
</updates>
</register>
<!-- Available languages for collecting packages and during installation and runtime --> <updaterepokey>000000000</updaterepokey>
<linguas> <summary>openSUSE Tumbleweed</summary>
<language>cs</language> <!-- one line only -->
<language>da</language> <shortsummary>openSUSE</shortsummary>
<language>de</language>
<language>el</language>
<language>en</language>
<language>en_GB</language>
<language>en_US</language>
<language>es</language>
<language>fr</language>
<language>hu</language>
<language>it</language>
<language>ja</language>
<language>pl</language>
<language>pt</language>
<language>pt_BR</language>
<language>ru</language>
<language>zh</language>
<language>zh_CN</language>
<language>zh_TW</language>
</linguas>
<urls> <description>openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
<url name="releasenotes">http://doc.opensuse.org/release-notes/x86_64/openSUSE/Tumbleweed/release-notes-openSUSE.rpm</url> </description>
<!-- <url name="smolt">http://smolt.opensuse.org/register.pl</url>
<url name="register">http://register.novell.com/</url> -->
<url name="repository">http://download.opensuse.org/tumbleweed/repo/oss/</url>
<!-- url name="update">http://download.opensuse.org/update/factory/</url> -->
</urls>
<buildconfig> <!-- Available languages for collecting packages and during installation and runtime -->
<!-- This section is needed to generate the installation media --> <linguas>
<producttheme>openSUSE</producttheme> <language>cs</language>
<create_flavors>true</create_flavors> <language>da</language>
</buildconfig> <language>de</language>
<language>el</language>
<language>en</language>
<language>en_GB</language>
<language>en_US</language>
<language>es</language>
<language>fr</language>
<language>hu</language>
<language>it</language>
<language>ja</language>
<language>pl</language>
<language>pt</language>
<language>pt_BR</language>
<language>ru</language>
<language>zh</language>
<language>zh_CN</language>
<language>zh_TW</language>
</linguas>
<installconfig> <urls>
<!-- All flags needed during installation --> <url name="releasenotes">http://doc.opensuse.org/release-notes/x86_64/openSUSE/Tumbleweed/release-notes-openSUSE.rpm</url>
<defaultlang>en_US</defaultlang> <!-- <url name="smolt">http://smolt.opensuse.org/register.pl</url> <url name="register">http://register.novell.com/</url> -->
<!-- needed for current content file --> <url name="repository">http://download.opensuse.org/tumbleweed/repo/oss/</url>
<releasepackage name="openSUSE-release" flag="EQ" version="%{version}"/> <!-- url name="update">http://download.opensuse.org/update/factory/</url> -->
<distribution>openSUSE</distribution> </urls>
</installconfig>
<runtimeconfig> <buildconfig>
<!-- All Flags needed in the running system --> <!-- This section is needed to generate the installation media -->
</runtimeconfig> <producttheme>openSUSE</producttheme>
<create_flavors>true</create_flavors>
</buildconfig>
</product> <installconfig>
</products> <!-- All flags needed during installation -->
<defaultlang>en_US</defaultlang>
<!-- needed for current content file -->
<releasepackage name="openSUSE-release" flag="EQ" version="%{version}"/>
<distribution>openSUSE</distribution>
</installconfig>
<xi:include href="defaults-conditionals.include" /> <runtimeconfig>
<!-- All Flags needed in the running system -->
</runtimeconfig>
<repositories> </product>
<repository path="obs://openSUSE:Factory/standard"/> </products>
<repository path="obs://openSUSE:Factory:Live/standard"/>
<repository path="obs://openSUSE:Factory:Containers/container"/>
</repositories>
<xi:include href="defaults-archsets.include" /> <xi:include href="defaults-conditionals.include"/>
<mediasets> <repositories>
<!-- BEWARE: do not touch the naming here without adapting ftp upload scripts ! --> <repository path="obs://openSUSE:Factory/standard"/>
<media type="ftp" <repository path="obs://openSUSE:Factory:Live/standard"/>
flavor="ftp" <repository path="obs://openSUSE:Factory:Containers/container"/>
sourcemedia="3" </repositories>
debugmedia="2"
mediastyle="suse-tumbleweed"
create_pattern="false"
repo_only="true"
run_make_listings="true"
use_required="true"
use_recommended="true"
use_suggested="false"
use_undecided="true">
<archsets> <!-- for this we generate a medium --> <xi:include href="defaults-archsets.include"/>
<archset ref="i586" /> <!-- for this we generate a product file -->
<archset ref="x86_64" /> <!-- so we get 2 product files on this medium -->
</archsets>
<!-- we put all packages (even suggested) on the media for the two groups below -->
<metadata>
<!-- if you like to add a metapackage to the real media, add it in a normal group.xml file -->
<package name="skelcd-installer-openSUSE" />
<package name="instlux" />
<package name="skelcd-control-openSUSE" />
<package name="skelcd-openSUSE"/>
<!-- package name="yast2-slide-show" / -->
</metadata>
<use group="NON_FTP_PACKAGES" create_pattern="false" />
</media>
<!-- BEWARE: do not touch the naming here without adapting ftp upload scripts ! --> <mediasets>
<media type="cd" <!-- BEWARE: do not touch the naming here without adapting ftp upload scripts ! -->
flavor="mini" <media type="ftp" flavor="ftp" sourcemedia="3" debugmedia="2" mediastyle="suse-tumbleweed"
name="openSUSE-Tumbleweed-NET" create_pattern="false" repo_only="true" run_make_listings="true"
run_hybridiso="true" use_required="true" use_recommended="true" use_suggested="false" use_undecided="true">
mediastyle="suse-tumbleweed"
sourcemedia="0"
firmware="uefi"
use_required="true"
use_recommended="true"
use_suggested="false">
<archsets>
<archset ref="x86_64" />
</archsets>
<archsets>
<archset ref="i586" />
</archsets>
<metadata>
<package name="skelcd-installer-net-openSUSE" />
<package name="skelcd-openSUSE"/>
</metadata>
</media>
<media type="dvd5" <archsets>
flavor="dvd" <!-- for this we generate a medium -->
name="openSUSE-Tumbleweed-DVD" <archset ref="i586"/>
sourcemedia="0" <!-- for this we generate a product file -->
mediastyle="suse-tumbleweed" <archset ref="x86_64"/>
firmware="uefi" <!-- so we get 2 product files on this medium -->
run_media_check="true" </archsets>
run_hybridiso="true" <!-- we put all packages (even suggested) on the media for the two groups below -->
use_required="true" <metadata>
use_recommended="true" <!-- if you like to add a metapackage to the real media, add it in a normal group.xml file -->
use_suggested="false"> <package name="skelcd-installer-openSUSE"/>
<package name="instlux"/>
<package name="skelcd-control-openSUSE"/>
<package name="skelcd-openSUSE"/>
<!-- package name="yast2-slide-show" / -->
</metadata>
<use group="NON_FTP_PACKAGES" create_pattern="false"/>
</media>
<use group="dvd" create_pattern="false" /> <!-- BEWARE: do not touch the naming here without adapting ftp upload scripts ! -->
<media type="cd" flavor="mini" name="openSUSE-Tumbleweed-NET" run_hybridiso="true"
mediastyle="suse-tumbleweed" sourcemedia="0" firmware="uefi"
use_required="true" use_recommended="true" use_suggested="false">
<archsets>
<archset ref="x86_64"/>
</archsets>
<archsets>
<archset ref="i586"/>
</archsets>
<metadata>
<package name="skelcd-installer-net-openSUSE"/>
<package name="skelcd-openSUSE"/>
</metadata>
</media>
<archsets> <!-- for this we generate a medium --> <media type="dvd5" flavor="dvd" name="openSUSE-Tumbleweed-DVD" run_hybridiso="true"
<archset ref="i586" /> mediastyle="suse-tumbleweed" sourcemedia="0" firmware="uefi"
</archsets> run_media_check="true" use_required="true" use_recommended="true" use_suggested="false">
<archsets>
<archset ref="x86_64" />
</archsets>
<metadata> <use group="dvd" create_pattern="false"/>
<!-- if you like to add a metapackage to the real media, add it in a normal group.xml file -->
<package name="skelcd-installer-openSUSE" />
<package name="skelcd-control-openSUSE" />
<package name="skelcd-openSUSE" />
<!--package name="yast2-slide-show" /-->
</metadata>
</media>
<media type="cd" <archsets>
flavor="livecd-kde" <!-- for this we generate a medium -->
mediastyle="suse-tumbleweed" <archset ref="i586"/>
name="openSUSE-Tumbleweed-livecd-kde" > </archsets>
<!-- Create no product media, but a flavor release subpackage --> <archsets>
</media> <archset ref="x86_64"/>
</archsets>
<media type="cd" <metadata>
flavor="livecd-x11" <!-- if you like to add a metapackage to the real media, add it in a normal group.xml file -->
mediastyle="suse-tumbleweed" <package name="skelcd-installer-openSUSE"/>
name="openSUSE-Tumbleweed-livecd-x11" > <package name="skelcd-control-openSUSE"/>
<!-- Create no product media, but a flavor release subpackage --> <package name="skelcd-openSUSE"/>
</media> <!--package name="yast2-slide-show" /-->
</metadata>
</media>
<media type="cd" <media type="cd" flavor="livecd-kde" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-livecd-kde">
flavor="livecd-gnome" <!-- Create no product media, but a flavor release subpackage -->
mediastyle="suse-tumbleweed" </media>
name="openSUSE-Tumbleweed-livecd-gnome" >
<!-- Create no product media, but a flavor release subpackage -->
</media>
<media type="cd" <media type="cd" flavor="livecd-x11" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-livecd-x11">
flavor="usb-kde" <!-- Create no product media, but a flavor release subpackage -->
mediastyle="suse-tumbleweed" </media>
name="openSUSE-Tumbleweed-usb-kde" >
<!-- Create no product media, but a flavor release subpackage -->
</media>
<media type="cd" <media type="cd" flavor="livecd-gnome" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-livecd-gnome">
flavor="usb-gnome" <!-- Create no product media, but a flavor release subpackage -->
mediastyle="suse-tumbleweed" </media>
name="openSUSE-Tumbleweed-usb-gnome" >
<!-- Create no product media, but a flavor release subpackage -->
</media>
<media type="cd" <media type="cd" flavor="usb-kde" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-usb-kde">
flavor="usb-x11" <!-- Create no product media, but a flavor release subpackage -->
mediastyle="suse-tumbleweed" </media>
name="openSUSE-Tumbleweed-usb-x11" >
<!-- Create no product media, but a flavor release subpackage -->
</media>
</mediasets> <media type="cd" flavor="usb-gnome" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-usb-gnome">
<!-- Create no product media, but a flavor release subpackage -->
</media>
<xi:include href="NON_FTP_PACKAGES.group"/> <media type="cd" flavor="usb-x11" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-usb-x11">
<xi:include href="dvd.group" /> <!-- Create no product media, but a flavor release subpackage -->
</media>
<group name="drop_from_dvd9"> </mediasets>
<conditional name="drop_from_medium" />
<packagelist> <xi:include href="NON_FTP_PACKAGES.group"/>
<package name="openSUSE-release-dvd"/> <xi:include href="dvd.group"/>
</packagelist>
</group> <group name="drop_from_dvd9">
<group name="kernel_pae_special"> <conditional name="drop_from_medium"/>
<conditional name="only_i686" /> <packagelist>
<packagelist relationship="requires"> <package name="openSUSE-release-dvd"/>
<package name="kernel-pae-base" /> </packagelist>
<package name="kernel-pae-devel" /> </group>
<package name="kernel-pae" /> <group name="kernel_pae_special">
</packagelist> <conditional name="only_i686"/>
</group> <packagelist relationship="requires">
<package name="kernel-pae-base"/>
<package name="kernel-pae-devel"/>
<package name="kernel-pae"/>
</packagelist>
</group>
</productdefinition> </productdefinition>