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>
@ -46,19 +40,20 @@
</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
type="dvd5"
flavor="dvd" flavor="dvd"
name="openSUSE-Tumbleweed-Kubic-DVD" name="openSUSE-Tumbleweed-Kubic-DVD"
sourcemedia="0" sourcemedia="0"
@ -70,27 +65,16 @@
create_pattern="false" create_pattern="false"
use_required="true" use_required="true"
use_recommended="true" use_recommended="true"
use_suggested="false" > use_suggested="false">
<!-- type : defines the default size of a media
flavor : flavor name - this is needed for registration
product : references the product name
name : name of the media
sourcemedia : sources on this media allowed?
create_pattern : create pattern out of the given groups
use_required : add required packages from the groups
use_recommended : add recommended packages from the groups
use_suggested : add suggested packages from the groups
size : define a new size for the media - default is defined via 'type' attribute
-->
<archsets> <archsets>
<archset ref="x86_64" /> <archset ref="x86_64"/>
</archsets> </archsets>
<metadata> <metadata>
<package name="skelcd-installer-Kubic"/> <package name="skelcd-installer-Kubic"/>
<package name="skelcd-control-Kubic"/> <package name="skelcd-control-Kubic"/>
<package name="skelcd-openSUSE"/> <package name="skelcd-openSUSE"/>
</metadata> </metadata>
<use group="opensuse_kubic" create_pattern="false" /> <use group="opensuse_kubic" create_pattern="false"/>
</media> </media>
</mediasets> </mediasets>
@ -114,6 +98,6 @@
</packagelist> </packagelist>
</group> </group>
<xi:include href="opensuse_kubic.group" /> <xi:include href="opensuse_kubic.group"/>
</productdefinition> </productdefinition>

View File

@ -12,15 +12,16 @@
<!-- Ensure we have valid distrotarget - used by "zypper tos" - boo#977052 --> <!-- Ensure we have valid distrotarget - used by "zypper tos" - boo#977052 -->
<register> <register>
<updates> <updates>
<distrotarget arch="x86_64" >openSUSE-Tumbleweed-x86_64</distrotarget> <distrotarget arch="x86_64">openSUSE-Tumbleweed-x86_64</distrotarget>
<distrotarget arch="s390x" >openSUSE-Tumbleweed-s390x</distrotarget> <distrotarget arch="s390x">openSUSE-Tumbleweed-s390x</distrotarget>
<distrotarget arch="ppc64le">openSUSE-Tumbleweed-ppc64le</distrotarget> <distrotarget arch="ppc64le">openSUSE-Tumbleweed-ppc64le</distrotarget>
<distrotarget arch="aarch64">openSUSE-Tumbleweed-aarch64</distrotarget> <distrotarget arch="aarch64">openSUSE-Tumbleweed-aarch64</distrotarget>
</updates> </updates>
</register> </register>
<updaterepokey>000000000</updaterepokey> <updaterepokey>000000000</updaterepokey>
<summary>openSUSE Tumbleweed</summary> <!-- one line only --> <summary>openSUSE Tumbleweed</summary>
<!-- one line only -->
<shortsummary>openSUSE</shortsummary> <shortsummary>openSUSE</shortsummary>
<description>openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project. <description>openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
@ -51,8 +52,7 @@
<urls> <urls>
<url name="releasenotes">http://doc.opensuse.org/release-notes/x86_64/openSUSE/Tumbleweed/release-notes-openSUSE.rpm</url> <url name="releasenotes">http://doc.opensuse.org/release-notes/x86_64/openSUSE/Tumbleweed/release-notes-openSUSE.rpm</url>
<!-- <url name="smolt">http://smolt.opensuse.org/register.pl</url> <!-- <url name="smolt">http://smolt.opensuse.org/register.pl</url> <url name="register">http://register.novell.com/</url> -->
<url name="register">http://register.novell.com/</url> -->
<url name="repository">http://download.opensuse.org/tumbleweed/repo/oss/</url> <url name="repository">http://download.opensuse.org/tumbleweed/repo/oss/</url>
<!-- url name="update">http://download.opensuse.org/update/factory/</url> --> <!-- url name="update">http://download.opensuse.org/update/factory/</url> -->
</urls> </urls>
@ -78,7 +78,7 @@
</product> </product>
</products> </products>
<xi:include href="defaults-conditionals.include" /> <xi:include href="defaults-conditionals.include"/>
<repositories> <repositories>
<repository path="obs://openSUSE:Factory/standard"/> <repository path="obs://openSUSE:Factory/standard"/>
@ -86,151 +86,113 @@
<repository path="obs://openSUSE:Factory:Containers/container"/> <repository path="obs://openSUSE:Factory:Containers/container"/>
</repositories> </repositories>
<xi:include href="defaults-archsets.include" /> <xi:include href="defaults-archsets.include"/>
<mediasets> <mediasets>
<!-- BEWARE: do not touch the naming here without adapting ftp upload scripts ! --> <!-- BEWARE: do not touch the naming here without adapting ftp upload scripts ! -->
<media type="ftp" <media type="ftp" flavor="ftp" sourcemedia="3" debugmedia="2" mediastyle="suse-tumbleweed"
flavor="ftp" create_pattern="false" repo_only="true" run_make_listings="true"
sourcemedia="3" use_required="true" use_recommended="true" use_suggested="false" use_undecided="true">
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 --> <archsets>
<archset ref="i586" /> <!-- for this we generate a product file --> <!-- for this we generate a medium -->
<archset ref="x86_64" /> <!-- so we get 2 product files on this medium --> <archset ref="i586"/>
<!-- for this we generate a product file -->
<archset ref="x86_64"/>
<!-- so we get 2 product files on this medium -->
</archsets> </archsets>
<!-- we put all packages (even suggested) on the media for the two groups below --> <!-- we put all packages (even suggested) on the media for the two groups below -->
<metadata> <metadata>
<!-- if you like to add a metapackage to the real media, add it in a normal group.xml file --> <!-- 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-installer-openSUSE"/>
<package name="instlux" /> <package name="instlux"/>
<package name="skelcd-control-openSUSE" /> <package name="skelcd-control-openSUSE"/>
<package name="skelcd-openSUSE"/> <package name="skelcd-openSUSE"/>
<!-- package name="yast2-slide-show" / --> <!-- package name="yast2-slide-show" / -->
</metadata> </metadata>
<use group="NON_FTP_PACKAGES" create_pattern="false" /> <use group="NON_FTP_PACKAGES" create_pattern="false"/>
</media> </media>
<!-- BEWARE: do not touch the naming here without adapting ftp upload scripts ! --> <!-- BEWARE: do not touch the naming here without adapting ftp upload scripts ! -->
<media type="cd" <media type="cd" flavor="mini" name="openSUSE-Tumbleweed-NET" run_hybridiso="true"
flavor="mini" mediastyle="suse-tumbleweed" sourcemedia="0" firmware="uefi"
name="openSUSE-Tumbleweed-NET" use_required="true" use_recommended="true" use_suggested="false">
run_hybridiso="true"
mediastyle="suse-tumbleweed"
sourcemedia="0"
firmware="uefi"
use_required="true"
use_recommended="true"
use_suggested="false">
<archsets> <archsets>
<archset ref="x86_64" /> <archset ref="x86_64"/>
</archsets> </archsets>
<archsets> <archsets>
<archset ref="i586" /> <archset ref="i586"/>
</archsets> </archsets>
<metadata> <metadata>
<package name="skelcd-installer-net-openSUSE" /> <package name="skelcd-installer-net-openSUSE"/>
<package name="skelcd-openSUSE"/> <package name="skelcd-openSUSE"/>
</metadata> </metadata>
</media> </media>
<media type="dvd5" <media type="dvd5" flavor="dvd" name="openSUSE-Tumbleweed-DVD" run_hybridiso="true"
flavor="dvd" mediastyle="suse-tumbleweed" sourcemedia="0" firmware="uefi"
name="openSUSE-Tumbleweed-DVD" run_media_check="true" use_required="true" use_recommended="true" use_suggested="false">
sourcemedia="0"
mediastyle="suse-tumbleweed"
firmware="uefi"
run_media_check="true"
run_hybridiso="true"
use_required="true"
use_recommended="true"
use_suggested="false">
<use group="dvd" create_pattern="false" /> <use group="dvd" create_pattern="false"/>
<archsets> <!-- for this we generate a medium --> <archsets>
<archset ref="i586" /> <!-- for this we generate a medium -->
<archset ref="i586"/>
</archsets> </archsets>
<archsets> <archsets>
<archset ref="x86_64" /> <archset ref="x86_64"/>
</archsets> </archsets>
<metadata> <metadata>
<!-- if you like to add a metapackage to the real media, add it in a normal group.xml file --> <!-- 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-installer-openSUSE"/>
<package name="skelcd-control-openSUSE" /> <package name="skelcd-control-openSUSE"/>
<package name="skelcd-openSUSE" /> <package name="skelcd-openSUSE"/>
<!--package name="yast2-slide-show" /--> <!--package name="yast2-slide-show" /-->
</metadata> </metadata>
</media> </media>
<media type="cd" <media type="cd" flavor="livecd-kde" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-livecd-kde">
flavor="livecd-kde"
mediastyle="suse-tumbleweed"
name="openSUSE-Tumbleweed-livecd-kde" >
<!-- Create no product media, but a flavor release subpackage --> <!-- Create no product media, but a flavor release subpackage -->
</media> </media>
<media type="cd" <media type="cd" flavor="livecd-x11" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-livecd-x11">
flavor="livecd-x11"
mediastyle="suse-tumbleweed"
name="openSUSE-Tumbleweed-livecd-x11" >
<!-- Create no product media, but a flavor release subpackage --> <!-- Create no product media, but a flavor release subpackage -->
</media> </media>
<media type="cd" <media type="cd" flavor="livecd-gnome" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-livecd-gnome">
flavor="livecd-gnome"
mediastyle="suse-tumbleweed"
name="openSUSE-Tumbleweed-livecd-gnome" >
<!-- Create no product media, but a flavor release subpackage --> <!-- Create no product media, but a flavor release subpackage -->
</media> </media>
<media type="cd" <media type="cd" flavor="usb-kde" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-usb-kde">
flavor="usb-kde"
mediastyle="suse-tumbleweed"
name="openSUSE-Tumbleweed-usb-kde" >
<!-- Create no product media, but a flavor release subpackage --> <!-- Create no product media, but a flavor release subpackage -->
</media> </media>
<media type="cd" <media type="cd" flavor="usb-gnome" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-usb-gnome">
flavor="usb-gnome"
mediastyle="suse-tumbleweed"
name="openSUSE-Tumbleweed-usb-gnome" >
<!-- Create no product media, but a flavor release subpackage --> <!-- Create no product media, but a flavor release subpackage -->
</media> </media>
<media type="cd" <media type="cd" flavor="usb-x11" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-usb-x11">
flavor="usb-x11"
mediastyle="suse-tumbleweed"
name="openSUSE-Tumbleweed-usb-x11" >
<!-- Create no product media, but a flavor release subpackage --> <!-- Create no product media, but a flavor release subpackage -->
</media> </media>
</mediasets> </mediasets>
<xi:include href="NON_FTP_PACKAGES.group"/> <xi:include href="NON_FTP_PACKAGES.group"/>
<xi:include href="dvd.group" /> <xi:include href="dvd.group"/>
<group name="drop_from_dvd9"> <group name="drop_from_dvd9">
<conditional name="drop_from_medium" /> <conditional name="drop_from_medium"/>
<packagelist> <packagelist>
<package name="openSUSE-release-dvd"/> <package name="openSUSE-release-dvd"/>
</packagelist> </packagelist>
</group> </group>
<group name="kernel_pae_special"> <group name="kernel_pae_special">
<conditional name="only_i686" /> <conditional name="only_i686"/>
<packagelist relationship="requires"> <packagelist relationship="requires">
<package name="kernel-pae-base" /> <package name="kernel-pae-base"/>
<package name="kernel-pae-devel" /> <package name="kernel-pae-devel"/>
<package name="kernel-pae" /> <package name="kernel-pae"/>
</packagelist> </packagelist>
</group> </group>