From 308b24a38dc0d41d92bb53a0fd5ba6eb5aa2dc82fc96746723861ccca826c078 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 7 Sep 2020 09:52:17 +0000 Subject: [PATCH] Accepting request 832725 from home:favogt:branches:openSUSE:Factory:Live - Switch "leap" over to "Jump": * Add back yast2-trans-* * Don't replace vim with vim-small - Drop pcmciautils - Use set -eu in pre-checkin.sh OBS-URL: https://build.opensuse.org/request/show/832725 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=76 --- list-common.sh | 21 +++++++++++---------- list-x11.sh | 6 ++++-- livecd-leap-gnome.kiwi | 16 ++++++++++++---- livecd-leap-kde.kiwi | 16 ++++++++++++---- livecd-leap-x11.kiwi | 19 ++++++++++++------- livecd-openSUSE.changes | 9 +++++++++ livecd-tumbleweed-gnome.kiwi | 1 - livecd-tumbleweed-kde.kiwi | 1 - livecd-tumbleweed-x11.kiwi | 5 ++--- livecd-tumbleweed-xfce.kiwi | 1 - pre-checkin.sh | 27 ++++++++++++++------------- 11 files changed, 76 insertions(+), 46 deletions(-) diff --git a/list-common.sh b/list-common.sh index 779bc6a..086952b 100644 --- a/list-common.sh +++ b/list-common.sh @@ -232,7 +232,6 @@ install mpt-firmware install nano install ntfs-3g install open-iscsi -install pcmciautils install pptp install quota install reiserfs @@ -267,16 +266,18 @@ install xf86-video-voodoo install xfsdump install xfsprogs install xz -#install yast2-trans-cs -#install yast2-trans-da install yast2-trans-de -#install yast2-trans-es -#install yast2-trans-ja -#install yast2-trans-pl -#install yast2-trans-ru -#install yast2-trans-sv -#install yast2-trans-zh_CN -#install yast2-trans-zh_TW +if [ "$distro" = "leap" ]; then + install yast2-trans-cs + install yast2-trans-da + install yast2-trans-es + install yast2-trans-ja + install yast2-trans-pl + install yast2-trans-ru + install yast2-trans-sv + install yast2-trans-zh_CN + install yast2-trans-zh_TW +fi install zd1211-firmware install zip diff --git a/list-x11.sh b/list-x11.sh index d8397c1..599b526 100644 --- a/list-x11.sh +++ b/list-x11.sh @@ -47,9 +47,11 @@ buildignore avahi buildignore fprintd buildignore accountsservice buildignore MozillaFirefox -buildignore vim buildignore vim-data -install vim-small +if [ "$distro" = "tumbleweed" ]; then + buildignore vim + install vim-small +fi buildignore tcpdump install gparted diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi index 7c1647b..5714dc2 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 @@ -352,7 +352,6 @@ - @@ -388,6 +387,15 @@ + + + + + + + + + diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index 7ee4068..7a5901b 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 @@ -352,7 +352,6 @@ - @@ -388,6 +387,15 @@ + + + + + + + + + diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index cd33820..ba4c11d 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 @@ -352,7 +352,6 @@ - @@ -388,6 +387,15 @@ + + + + + + + + + @@ -480,11 +488,8 @@ - - - diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index 75ff9dc..65c6709 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Sep 7 09:07:51 UTC 2020 - Fabian Vogt + +- Switch "leap" over to "Jump": + * Add back yast2-trans-* + * Don't replace vim with vim-small +- Drop pcmciautils +- Use set -eu in pre-checkin.sh + ------------------------------------------------------------------- Tue Sep 1 07:07:55 UTC 2020 - Dominique Leuenberger diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi index 5000e4d..db62dcf 100644 --- a/livecd-tumbleweed-gnome.kiwi +++ b/livecd-tumbleweed-gnome.kiwi @@ -352,7 +352,6 @@ - diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi index 71a92c5..0b5cb22 100644 --- a/livecd-tumbleweed-kde.kiwi +++ b/livecd-tumbleweed-kde.kiwi @@ -352,7 +352,6 @@ - diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi index 2fbf1a1..7bc4fd8 100644 --- a/livecd-tumbleweed-x11.kiwi +++ b/livecd-tumbleweed-x11.kiwi @@ -352,7 +352,6 @@ - @@ -480,10 +479,10 @@ - - + + diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi index 84fc8f6..7143fb5 100644 --- a/livecd-tumbleweed-xfce.kiwi +++ b/livecd-tumbleweed-xfce.kiwi @@ -352,7 +352,6 @@ - diff --git a/pre-checkin.sh b/pre-checkin.sh index aade54a..2ec61ad 100644 --- a/pre-checkin.sh +++ b/pre-checkin.sh @@ -1,7 +1,8 @@ #!/bin/sh +set -eu install() { - if [ -n "$2" ]; then + if [ -n "${2-}" ]; then PACKAGES="$PACKAGES\n " else PACKAGES="$PACKAGES\n " @@ -13,7 +14,7 @@ buildignore() { # but https://github.com/openSUSE/obs-build/issues/420 requires a workaround ## Due to "--ignoreignore--" this has no effect either, so workaround the workaround ## by using , which gets ignored by OBS completely... - if [ -n "$2" ]; then + if [ -n "${2-}" ]; then PACKAGES="$PACKAGES\n " PACKAGES="$PACKAGES\n " else @@ -35,7 +36,7 @@ for distro in leap tumbleweed; do bootsplash="bgrt" releaseprefix="openSUSE" if [ "${distro}" = "leap" ]; then - distroname="openSUSE Leap %OS_VERSION_ID%" + distroname="openSUSE Jump %OS_VERSION_ID%" # This changes every few weeks, apparently. #releaseprefix="Leap" fi @@ -43,18 +44,18 @@ for distro in leap tumbleweed; do for flavor in gnome kde xfce x11; do uppercaseflavor="$(echo "${flavor}" | tr a-z A-Z)" - if [ "${flavor}" = "x11" ]; then - name="${distroname} Rescue CD" - else - name="${distroname} ${uppercaseflavor} Live" - fi + if [ "${flavor}" = "x11" ]; then + name="${distroname} Rescue CD" + else + name="${distroname} ${uppercaseflavor} Live" + fi - PACKAGES="\n " - . "$PWD/list-common.sh" - PACKAGES="$PACKAGES\n\n " - . "$PWD/list-${flavor}.sh" + PACKAGES="\n " + . "$PWD/list-common.sh" + PACKAGES="$PACKAGES\n\n " + . "$PWD/list-${flavor}.sh" - [ "${flavor}" = "xfce" -a "${distro}" = "leap" ] && continue # Prevent creation of livecd-leap-xfce.kiwi + [ "${flavor}" = "xfce" -a "${distro}" = "leap" ] && continue # Prevent creation of livecd-leap-xfce.kiwi sed "s#@FLAVOR@#${flavor}#g;\ s#@NAME@#${name// /-}#g;\ s#@DISPLAYNAME@#${name}#g;\