From ed425682cbcbe6f7d8b8bc892a83da5f2cb55086866fc6a09ee11bfc27d9660d Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 23 Oct 2019 13:40:11 +0000 Subject: [PATCH 1/2] - It's Leap-release on Leap now for some reason OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=55 --- livecd-leap-gnome.kiwi | 4 ++-- livecd-leap-kde.kiwi | 4 ++-- livecd-leap-x11.kiwi | 4 ++-- livecd-openSUSE.changes | 5 +++++ livecd.kiwi.in | 4 ++-- pre-checkin.sh | 3 +++ 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi index e1b3489..278fe80 100644 --- a/livecd-leap-gnome.kiwi +++ b/livecd-leap-gnome.kiwi @@ -540,8 +540,8 @@ - - + + diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index b1de243..ff1c788 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -500,8 +500,8 @@ - - + + diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index 1562ad0..e030315 100644 --- a/livecd-leap-x11.kiwi +++ b/livecd-leap-x11.kiwi @@ -544,8 +544,8 @@ - - + + diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index 0b57d9a..8034513 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 23 13:39:39 UTC 2019 - Fabian Vogt + +- It's Leap-release on Leap now for some reason + ------------------------------------------------------------------- Tue Oct 22 08:40:15 UTC 2019 - Fabian Vogt diff --git a/livecd.kiwi.in b/livecd.kiwi.in index 7e35686..2c52559 100644 --- a/livecd.kiwi.in +++ b/livecd.kiwi.in @@ -59,8 +59,8 @@ - - + + diff --git a/pre-checkin.sh b/pre-checkin.sh index d4ca639..0a681a6 100644 --- a/pre-checkin.sh +++ b/pre-checkin.sh @@ -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 From 901c39391729c134214c168281c3eb0d5e96667efefcd6177dbca31895cd4978 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 23 Oct 2019 13:42:52 +0000 Subject: [PATCH 2/2] - Only install opensuse-welcome on TW OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=56 --- list-kde.sh | 2 +- list-xfce.sh | 2 +- livecd-leap-kde.kiwi | 1 - livecd-openSUSE.changes | 1 + 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/list-kde.sh b/list-kde.sh index 8d891d9..142fbf9 100644 --- a/list-kde.sh +++ b/list-kde.sh @@ -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 diff --git a/list-xfce.sh b/list-xfce.sh index 8e7c10c..6a36b23 100644 --- a/list-xfce.sh +++ b/list-xfce.sh @@ -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 diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index ff1c788..dfdc0e8 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -496,7 +496,6 @@ - diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index 8034513..5815124 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -2,6 +2,7 @@ Wed Oct 23 13:39:39 UTC 2019 - Fabian Vogt - 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