From 3fba4dde1895d9b6c3ff9dc7fadd6cb732839ad838d54826f64ac6393985e543 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 15 Aug 2019 09:23:45 +0000 Subject: [PATCH 1/2] - 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 --- _service | 3 +++ list-x11.sh | 3 +++ livecd-leap-gnome.kiwi | 6 +++--- livecd-leap-kde.kiwi | 6 +++--- livecd-leap-x11.kiwi | 12 +++++++++--- livecd-openSUSE.changes | 6 ++++++ livecd-tumbleweed-x11.kiwi | 6 ++++++ pre-checkin.sh | 2 +- 8 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 _service diff --git a/_service b/_service new file mode 100644 index 0000000..c2048cb --- /dev/null +++ b/_service @@ -0,0 +1,3 @@ + + + diff --git a/list-x11.sh b/list-x11.sh index f92fead..5d0306c 100644 --- a/list-x11.sh +++ b/list-x11.sh @@ -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 diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi index 732810c..45cd3e5 100644 --- a/livecd-leap-gnome.kiwi +++ b/livecd-leap-gnome.kiwi @@ -2,7 +2,7 @@ - + openSUSE Project opensuse@opensuse.org @@ -13,7 +13,7 @@ - + 2.8.0 openSUSE bgrt @@ -23,7 +23,7 @@ true - + 2.8.0 openSUSE bgrt diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index b15b0da..c86e0d6 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -2,7 +2,7 @@ - + openSUSE Project opensuse@opensuse.org @@ -13,7 +13,7 @@ - + 2.8.0 openSUSE bgrt @@ -23,7 +23,7 @@ true - + 2.8.0 openSUSE bgrt diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index c757a5e..24a4606 100644 --- a/livecd-leap-x11.kiwi +++ b/livecd-leap-x11.kiwi @@ -2,7 +2,7 @@ - + openSUSE Project opensuse@opensuse.org @@ -13,7 +13,7 @@ - + 2.8.0 openSUSE bgrt @@ -23,7 +23,7 @@ true - + 2.8.0 openSUSE bgrt @@ -435,6 +435,12 @@ + + + + + + diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index de95d52..57ac92c 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 15 09:22:47 UTC 2019 - Fabian Vogt + +- 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 diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi index 86e9cd0..66af371 100644 --- a/livecd-tumbleweed-x11.kiwi +++ b/livecd-tumbleweed-x11.kiwi @@ -435,6 +435,12 @@ + + + + + + diff --git a/pre-checkin.sh b/pre-checkin.sh index 84c7b33..4bfe90a 100644 --- a/pre-checkin.sh +++ b/pre-checkin.sh @@ -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 From 9dd2101925eb43bf34013926189dbe56e391862a7da9dab70a3f0e246ca46521 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Fri, 16 Aug 2019 06:58:45 +0000 Subject: [PATCH 2/2] - Use "openSUSE" bootsplash for leap OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=40 --- 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 45cd3e5..8d64765 100644 --- a/livecd-leap-gnome.kiwi +++ b/livecd-leap-gnome.kiwi @@ -16,7 +16,7 @@ 2.8.0 openSUSE - bgrt + openSUSE zypper false en_US @@ -26,7 +26,7 @@ 2.8.0 openSUSE - bgrt + openSUSE zypper false en_US diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index c86e0d6..73fff7a 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -16,7 +16,7 @@ 2.8.0 openSUSE - bgrt + openSUSE zypper false en_US @@ -26,7 +26,7 @@ 2.8.0 openSUSE - bgrt + openSUSE zypper false en_US diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index 24a4606..af2e822 100644 --- a/livecd-leap-x11.kiwi +++ b/livecd-leap-x11.kiwi @@ -16,7 +16,7 @@ 2.8.0 openSUSE - bgrt + openSUSE zypper false en_US @@ -26,7 +26,7 @@ 2.8.0 openSUSE - bgrt + openSUSE zypper false en_US diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index 57ac92c..6565ebb 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 16 06:58:23 UTC 2019 - Fabian Vogt + +- Use "openSUSE" bootsplash for leap + ------------------------------------------------------------------- Thu Aug 15 09:22:47 UTC 2019 - Fabian Vogt diff --git a/livecd.kiwi.in b/livecd.kiwi.in index 1725f1d..7e35686 100644 --- a/livecd.kiwi.in +++ b/livecd.kiwi.in @@ -16,7 +16,7 @@ 2.8.0 openSUSE - bgrt + @BOOTSPLASH@ zypper false en_US @@ -26,7 +26,7 @@ 2.8.0 openSUSE - bgrt + @BOOTSPLASH@ zypper false en_US diff --git a/pre-checkin.sh b/pre-checkin.sh index 4bfe90a..d4ca639 100644 --- a/pre-checkin.sh +++ b/pre-checkin.sh @@ -32,8 +32,10 @@ archive() { for distro in leap tumbleweed; do distroname="openSUSE Tumbleweed" + bootsplash="bgrt" if [ "${distro}" = "leap" ]; then distroname="openSUSE Leap %OS_VERSION_ID%" + bootsplash="openSUSE" fi for flavor in gnome kde xfce x11; do @@ -55,6 +57,7 @@ for distro in leap tumbleweed; do s#@NAME@#${name// /-}#g;\ s#@DISPLAYNAME@#${name}#g;\ s#@VOLID@#${name// /_}#g;\ + s#@BOOTSPLASH@#${bootsplash}#g;\ s#@PACKAGES@#${PACKAGES}#g;" livecd.kiwi.in > livecd-${distro}-${flavor}.kiwi done done