forked from pool/livecd-openSUSE
Accepting request 742152 from Virtualization:Appliances:Images:openSUSE-Tumbleweed
- It's Leap-release on Leap now for some reason - Only install opensuse-welcome on TW OBS-URL: https://build.opensuse.org/request/show/742152 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/livecd-openSUSE?expand=0&rev=78
This commit is contained in:
commit
47a839b49c
@ -68,4 +68,4 @@ buildignore cyrus-sasl
|
||||
install alsa-firmware
|
||||
|
||||
# From x11_enhanced, but that pattern can't be installed
|
||||
install opensuse-welcome
|
||||
[ "$distro" = "tumbleweed" ] && install opensuse-welcome
|
||||
|
@ -43,4 +43,4 @@ install xreader-plugin-pdfdocument
|
||||
install alsa-firmware
|
||||
|
||||
# From x11_enhanced, but that pattern can't be installed
|
||||
install opensuse-welcome
|
||||
[ "$distro" = "tumbleweed" ] && install opensuse-welcome
|
||||
|
@ -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">
|
||||
|
@ -496,12 +496,11 @@
|
||||
<package name="aaa_base" replaces="cyrus-sasl"/>
|
||||
<ignore name="cyrus-sasl"/>
|
||||
<package name="alsa-firmware"/>
|
||||
<package name="opensuse-welcome"/>
|
||||
</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">
|
||||
|
@ -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">
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 23 13:39:39 UTC 2019 - Fabian Vogt <fvogt@suse.com>
|
||||
|
||||
- It's Leap-release on Leap now for some reason
|
||||
- Only install opensuse-welcome on TW
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 22 08:40:15 UTC 2019 - Fabian Vogt <fvogt@suse.com>
|
||||
|
||||
|
@ -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">
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user