1
0
Fabian Vogt 2019-10-23 13:40:11 +00:00 committed by Git OBS Bridge
parent 85cba414de
commit ed425682cb
6 changed files with 16 additions and 8 deletions

View File

@ -540,8 +540,8 @@
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
<package name="openSUSE-release"/>
<package name="openSUSE-release-livecd-gnome"/>
<package name="Leap-release"/>
<package name="Leap-release-livecd-gnome"/>
<package name="branding-openSUSE"/>
</packages>
<repository type="rpm-md">

View File

@ -500,8 +500,8 @@
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
<package name="openSUSE-release"/>
<package name="openSUSE-release-livecd-kde"/>
<package name="Leap-release"/>
<package name="Leap-release-livecd-kde"/>
<package name="branding-openSUSE"/>
</packages>
<repository type="rpm-md">

View File

@ -544,8 +544,8 @@
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
<package name="openSUSE-release"/>
<package name="openSUSE-release-livecd-x11"/>
<package name="Leap-release"/>
<package name="Leap-release-livecd-x11"/>
<package name="branding-openSUSE"/>
</packages>
<repository type="rpm-md">

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 23 13:39:39 UTC 2019 - Fabian Vogt <fvogt@suse.com>
- It's Leap-release on Leap now for some reason
-------------------------------------------------------------------
Tue Oct 22 08:40:15 UTC 2019 - Fabian Vogt <fvogt@suse.com>

View File

@ -59,8 +59,8 @@
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
<package name="openSUSE-release"/>
<package name="openSUSE-release-livecd-@FLAVOR@"/>
<package name="@RELEASEPREFIX@-release"/>
<package name="@RELEASEPREFIX@-release-livecd-@FLAVOR@"/>
<package name="branding-openSUSE"/>
</packages>
<repository type="rpm-md">

View File

@ -33,9 +33,11 @@ archive() {
for distro in leap tumbleweed; do
distroname="openSUSE Tumbleweed"
bootsplash="bgrt"
releaseprefix="openSUSE"
if [ "${distro}" = "leap" ]; then
distroname="openSUSE Leap %OS_VERSION_ID%"
bootsplash="openSUSE"
releaseprefix="Leap"
fi
for flavor in gnome kde xfce x11; do
@ -58,6 +60,7 @@ for distro in leap tumbleweed; do
s#@DISPLAYNAME@#${name}#g;\
s#@VOLID@#${name// /_}#g;\
s#@BOOTSPLASH@#${bootsplash}#g;\
s#@RELEASEPREFIX@#${releaseprefix}#g;\
s#@PACKAGES@#${PACKAGES}#g;" livecd.kiwi.in > livecd-${distro}-${flavor}.kiwi
done
done