rpm/livecd-openSUSE
SHA256
1
0
Fork 0
forked from pool/livecd-openSUSE
Code Pull Requests Activity

Accepting request 742152 from Virtualization:Appliances:Images:openSUSE-Tumbleweed

Browse Source 
- 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:
Dominique Leuenberger 2019-10-24 21:03:31 +00:00 committed by Git OBS Bridge
commit 47a839b49c
8 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
list-kde.sh
View File

@ -68,4 +68,4 @@ buildignore cyrus-sasl
install alsa-firmware install alsa-firmware
# From x11_enhanced, but that pattern can't be installed # From x11_enhanced, but that pattern can't be installed
install opensuse-welcome [ "$distro" = "tumbleweed" ] && install opensuse-welcome

2
list-xfce.sh
View File

@ -43,4 +43,4 @@ install xreader-plugin-pdfdocument
install alsa-firmware install alsa-firmware
# From x11_enhanced, but that pattern can't be installed # From x11_enhanced, but that pattern can't be installed
install opensuse-welcome [ "$distro" = "tumbleweed" ] && install opensuse-welcome

4
livecd-leap-gnome.kiwi
View File

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

5
livecd-leap-kde.kiwi
View File

@ -496,12 +496,11 @@
<package name="aaa_base" replaces="cyrus-sasl"/> <package name="aaa_base" replaces="cyrus-sasl"/>
<ignore name="cyrus-sasl"/> <ignore name="cyrus-sasl"/>
<package name="alsa-firmware"/> <package name="alsa-firmware"/>
<package name="opensuse-welcome"/>
</packages> </packages>
<packages type="bootstrap"> <packages type="bootstrap">
<package name="filesystem"/> <package name="filesystem"/>
<package name="openSUSE-release"/> <package name="Leap-release"/>
<package name="openSUSE-release-livecd-kde"/> <package name="Leap-release-livecd-kde"/>
<package name="branding-openSUSE"/> <package name="branding-openSUSE"/>
</packages> </packages>
<repository type="rpm-md"> <repository type="rpm-md">

4
livecd-leap-x11.kiwi
View File

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

6
livecd-openSUSE.changes
View File

@ -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> Tue Oct 22 08:40:15 UTC 2019 - Fabian Vogt <fvogt@suse.com>

4
livecd.kiwi.in
View File

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

3
pre-checkin.sh
View File

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