- Use %OS_VERSION_ID% for Leap version and add the

kiwi_metainfo_helper OBS service

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=39
This commit is contained in:
Fabian Vogt 2019-08-15 09:23:45 +00:00 committed by Git OBS Bridge
parent 6a72047e2b
commit 3fba4dde18
8 changed files with 34 additions and 10 deletions

3
_service Normal file
View File

@ -0,0 +1,3 @@
<services>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
</services>

View File

@ -12,6 +12,9 @@ buildignore gtk3-immodule-inuktitut
buildignore gtk3-immodule-thai
buildignore gtk3-immodule-vietnamese
buildignore gtk3-lang
buildignore evince-lang
buildignore hexchat-lang
buildignore nano-lang
buildignore zenity-lang
buildignore alsa
buildignore alsa-firmware

View File

@ -2,7 +2,7 @@
<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
<image schemaversion="6.5" name="openSUSE-Leap-15.1-GNOME-Live" displayname="openSUSE Leap 15.1 GNOME Live">
<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-GNOME-Live" displayname="openSUSE Leap %OS_VERSION_ID% GNOME Live">
<description type="system">
<author>openSUSE Project</author>
<contact>opensuse@opensuse.org</contact>
@ -13,7 +13,7 @@
<profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
</profiles>
<preferences profiles="EFI">
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_15.1_GNOME_Live" mediacheck="true"/>
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme>
@ -23,7 +23,7 @@
<rpm-excludedocs>true</rpm-excludedocs>
</preferences>
<preferences profiles="noEFI">
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_15.1_GNOME_Live" mediacheck="true"/>
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme>

View File

@ -2,7 +2,7 @@
<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
<image schemaversion="6.5" name="openSUSE-Leap-15.1-KDE-Live" displayname="openSUSE Leap 15.1 KDE Live">
<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-KDE-Live" displayname="openSUSE Leap %OS_VERSION_ID% KDE Live">
<description type="system">
<author>openSUSE Project</author>
<contact>opensuse@opensuse.org</contact>
@ -13,7 +13,7 @@
<profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
</profiles>
<preferences profiles="EFI">
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_15.1_KDE_Live" mediacheck="true"/>
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme>
@ -23,7 +23,7 @@
<rpm-excludedocs>true</rpm-excludedocs>
</preferences>
<preferences profiles="noEFI">
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_15.1_KDE_Live" mediacheck="true"/>
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme>

View File

@ -2,7 +2,7 @@
<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
<image schemaversion="6.5" name="openSUSE-Leap-15.1-Rescue-CD" displayname="openSUSE Leap 15.1 Rescue CD">
<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-Rescue-CD" displayname="openSUSE Leap %OS_VERSION_ID% Rescue CD">
<description type="system">
<author>openSUSE Project</author>
<contact>opensuse@opensuse.org</contact>
@ -13,7 +13,7 @@
<profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
</profiles>
<preferences profiles="EFI">
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_15.1_Rescue_CD" mediacheck="true"/>
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme>
@ -23,7 +23,7 @@
<rpm-excludedocs>true</rpm-excludedocs>
</preferences>
<preferences profiles="noEFI">
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_15.1_Rescue_CD" mediacheck="true"/>
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme>
@ -435,6 +435,12 @@
<ignore name="gtk3-immodule-vietnamese"/>
<package name="aaa_base" replaces="gtk3-lang"/>
<ignore name="gtk3-lang"/>
<package name="aaa_base" replaces="evince-lang"/>
<ignore name="evince-lang"/>
<package name="aaa_base" replaces="hexchat-lang"/>
<ignore name="hexchat-lang"/>
<package name="aaa_base" replaces="nano-lang"/>
<ignore name="nano-lang"/>
<package name="aaa_base" replaces="zenity-lang"/>
<ignore name="zenity-lang"/>
<package name="aaa_base" replaces="alsa"/>

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Aug 15 09:22:47 UTC 2019 - Fabian Vogt <fvogt@suse.com>
- Use %OS_VERSION_ID% for Leap version and add the
kiwi_metainfo_helper OBS service
-------------------------------------------------------------------
Fri Jul 26 12:08:16 UTC 2019 - Fabian Vogt <fvogt@suse.com>

View File

@ -435,6 +435,12 @@
<ignore name="gtk3-immodule-vietnamese"/>
<package name="aaa_base" replaces="gtk3-lang"/>
<ignore name="gtk3-lang"/>
<package name="aaa_base" replaces="evince-lang"/>
<ignore name="evince-lang"/>
<package name="aaa_base" replaces="hexchat-lang"/>
<ignore name="hexchat-lang"/>
<package name="aaa_base" replaces="nano-lang"/>
<ignore name="nano-lang"/>
<package name="aaa_base" replaces="zenity-lang"/>
<ignore name="zenity-lang"/>
<package name="aaa_base" replaces="alsa"/>

View File

@ -33,7 +33,7 @@ archive() {
for distro in leap tumbleweed; do
distroname="openSUSE Tumbleweed"
if [ "${distro}" = "leap" ]; then
distroname="openSUSE Leap 15.1"
distroname="openSUSE Leap %OS_VERSION_ID%"
fi
for flavor in gnome kde xfce x11; do