Hello community,
here is the log from the commit of package livecd-openSUSE for openSUSE:Factory
checked in at 2020-09-07 21:35:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/livecd-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.livecd-openSUSE.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "livecd-openSUSE"
Mon Sep 7 21:35:52 2020 rev:119 rq:832726 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/livecd-openSUSE/livecd-openSUSE.changes
2020-09-01 09:08:35.411473272 +0200
+++
/work/SRC/openSUSE:Factory/.livecd-openSUSE.new.3399/livecd-openSUSE.changes
2020-09-07 21:36:00.749399006 +0200
@@ -1,0 +2,9 @@
+Mon Sep 7 09:07:51 UTC 2020 - Fabian Vogt <fv...@suse.com>
+
+- 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
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ livecd-leap-gnome.kiwi ++++++
--- /var/tmp/diff_new_pack.g16Eaa/_old 2020-09-07 21:36:02.805399960 +0200
+++ /var/tmp/diff_new_pack.g16Eaa/_new 2020-09-07 21:36:02.809399961 +0200
@@ -2,7 +2,7 @@
<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
-<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-GNOME-Live"
displayname="openSUSE Leap %OS_VERSION_ID% GNOME Live">
+<image schemaversion="6.5" name="openSUSE-Jump-%OS_VERSION_ID%-GNOME-Live"
displayname="openSUSE Jump %OS_VERSION_ID% GNOME Live">
<description type="system">
<author>openSUSE Project</author>
<contact>opens...@opensuse.org</contact>
@@ -13,7 +13,7 @@
<profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
</profiles>
<preferences profiles="EFI">
- <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="uefi"
volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
+ <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="uefi"
volid="openSUSE_Jump_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme>
@@ -23,7 +23,7 @@
<rpm-excludedocs>true</rpm-excludedocs>
</preferences>
<preferences profiles="noEFI">
- <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="bios"
volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
+ <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="bios"
volid="openSUSE_Jump_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme>
@@ -352,7 +352,6 @@
<package name="nano"/>
<package name="ntfs-3g"/>
<package name="open-iscsi"/>
- <package name="pcmciautils"/>
<package name="pptp"/>
<package name="quota"/>
<package name="reiserfs"/>
@@ -388,6 +387,15 @@
<package name="xfsprogs"/>
<package name="xz"/>
<package name="yast2-trans-de"/>
+ <package name="yast2-trans-cs"/>
+ <package name="yast2-trans-da"/>
+ <package name="yast2-trans-es"/>
+ <package name="yast2-trans-ja"/>
+ <package name="yast2-trans-pl"/>
+ <package name="yast2-trans-ru"/>
+ <package name="yast2-trans-sv"/>
+ <package name="yast2-trans-zh_CN"/>
+ <package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/>
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
++++++ livecd-leap-kde.kiwi ++++++
--- /var/tmp/diff_new_pack.g16Eaa/_old 2020-09-07 21:36:02.829399970 +0200
+++ /var/tmp/diff_new_pack.g16Eaa/_new 2020-09-07 21:36:02.829399970 +0200
@@ -2,7 +2,7 @@
<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
-<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-KDE-Live"
displayname="openSUSE Leap %OS_VERSION_ID% KDE Live">
+<image schemaversion="6.5" name="openSUSE-Jump-%OS_VERSION_ID%-KDE-Live"
displayname="openSUSE Jump %OS_VERSION_ID% KDE Live">
<description type="system">
<author>openSUSE Project</author>
<contact>opens...@opensuse.org</contact>
@@ -13,7 +13,7 @@
<profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
</profiles>
<preferences profiles="EFI">
- <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="uefi"
volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
+ <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="uefi"
volid="openSUSE_Jump_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme>
@@ -23,7 +23,7 @@
<rpm-excludedocs>true</rpm-excludedocs>
</preferences>
<preferences profiles="noEFI">
- <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="bios"
volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
+ <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="bios"
volid="openSUSE_Jump_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme>
@@ -352,7 +352,6 @@
<package name="nano"/>
<package name="ntfs-3g"/>
<package name="open-iscsi"/>
- <package name="pcmciautils"/>
<package name="pptp"/>
<package name="quota"/>
<package name="reiserfs"/>
@@ -388,6 +387,15 @@
<package name="xfsprogs"/>
<package name="xz"/>
<package name="yast2-trans-de"/>
+ <package name="yast2-trans-cs"/>
+ <package name="yast2-trans-da"/>
+ <package name="yast2-trans-es"/>
+ <package name="yast2-trans-ja"/>
+ <package name="yast2-trans-pl"/>
+ <package name="yast2-trans-ru"/>
+ <package name="yast2-trans-sv"/>
+ <package name="yast2-trans-zh_CN"/>
+ <package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/>
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
++++++ livecd-leap-x11.kiwi ++++++
--- /var/tmp/diff_new_pack.g16Eaa/_old 2020-09-07 21:36:02.849399979 +0200
+++ /var/tmp/diff_new_pack.g16Eaa/_new 2020-09-07 21:36:02.853399981 +0200
@@ -2,7 +2,7 @@
<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
-<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-Rescue-CD"
displayname="openSUSE Leap %OS_VERSION_ID% Rescue CD">
+<image schemaversion="6.5" name="openSUSE-Jump-%OS_VERSION_ID%-Rescue-CD"
displayname="openSUSE Jump %OS_VERSION_ID% Rescue CD">
<description type="system">
<author>openSUSE Project</author>
<contact>opens...@opensuse.org</contact>
@@ -13,7 +13,7 @@
<profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
</profiles>
<preferences profiles="EFI">
- <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="uefi"
volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
+ <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="uefi"
volid="openSUSE_Jump_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme>
@@ -23,7 +23,7 @@
<rpm-excludedocs>true</rpm-excludedocs>
</preferences>
<preferences profiles="noEFI">
- <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="bios"
volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
+ <type primary="true" bootprofile="default" kernelcmdline="splash=silent
quiet" flags="overlay" hybrid="true" hybridpersistent="true"
hybridpersistent_filesystem="ext4" image="iso" firmware="bios"
volid="openSUSE_Jump_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme>
@@ -352,7 +352,6 @@
<package name="nano"/>
<package name="ntfs-3g"/>
<package name="open-iscsi"/>
- <package name="pcmciautils"/>
<package name="pptp"/>
<package name="quota"/>
<package name="reiserfs"/>
@@ -388,6 +387,15 @@
<package name="xfsprogs"/>
<package name="xz"/>
<package name="yast2-trans-de"/>
+ <package name="yast2-trans-cs"/>
+ <package name="yast2-trans-da"/>
+ <package name="yast2-trans-es"/>
+ <package name="yast2-trans-ja"/>
+ <package name="yast2-trans-pl"/>
+ <package name="yast2-trans-ru"/>
+ <package name="yast2-trans-sv"/>
+ <package name="yast2-trans-zh_CN"/>
+ <package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/>
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
@@ -480,11 +488,8 @@
<ignore name="accountsservice"/>
<package name="aaa_base" replaces="MozillaFirefox"/>
<ignore name="MozillaFirefox"/>
- <package name="aaa_base" replaces="vim"/>
- <ignore name="vim"/>
<package name="aaa_base" replaces="vim-data"/>
<ignore name="vim-data"/>
- <package name="vim-small"/>
<package name="aaa_base" replaces="tcpdump"/>
<ignore name="tcpdump"/>
<package name="gparted"/>
++++++ livecd-tumbleweed-gnome.kiwi ++++++
--- /var/tmp/diff_new_pack.g16Eaa/_old 2020-09-07 21:36:02.889399998 +0200
+++ /var/tmp/diff_new_pack.g16Eaa/_new 2020-09-07 21:36:02.889399998 +0200
@@ -352,7 +352,6 @@
<package name="nano"/>
<package name="ntfs-3g"/>
<package name="open-iscsi"/>
- <package name="pcmciautils"/>
<package name="pptp"/>
<package name="quota"/>
<package name="reiserfs"/>
livecd-tumbleweed-kde.kiwi: same change
++++++ livecd-tumbleweed-x11.kiwi ++++++
--- /var/tmp/diff_new_pack.g16Eaa/_old 2020-09-07 21:36:02.937400020 +0200
+++ /var/tmp/diff_new_pack.g16Eaa/_new 2020-09-07 21:36:02.937400020 +0200
@@ -352,7 +352,6 @@
<package name="nano"/>
<package name="ntfs-3g"/>
<package name="open-iscsi"/>
- <package name="pcmciautils"/>
<package name="pptp"/>
<package name="quota"/>
<package name="reiserfs"/>
@@ -480,10 +479,10 @@
<ignore name="accountsservice"/>
<package name="aaa_base" replaces="MozillaFirefox"/>
<ignore name="MozillaFirefox"/>
- <package name="aaa_base" replaces="vim"/>
- <ignore name="vim"/>
<package name="aaa_base" replaces="vim-data"/>
<ignore name="vim-data"/>
+ <package name="aaa_base" replaces="vim"/>
+ <ignore name="vim"/>
<package name="vim-small"/>
<package name="aaa_base" replaces="tcpdump"/>
<ignore name="tcpdump"/>
++++++ livecd-tumbleweed-xfce.kiwi ++++++
--- /var/tmp/diff_new_pack.g16Eaa/_old 2020-09-07 21:36:02.957400029 +0200
+++ /var/tmp/diff_new_pack.g16Eaa/_new 2020-09-07 21:36:02.961400031 +0200
@@ -352,7 +352,6 @@
<package name="nano"/>
<package name="ntfs-3g"/>
<package name="open-iscsi"/>
- <package name="pcmciautils"/>
<package name="pptp"/>
<package name="quota"/>
<package name="reiserfs"/>
++++++ list-common.sh ++++++
--- /var/tmp/diff_new_pack.g16Eaa/_old 2020-09-07 21:36:03.061400077 +0200
+++ /var/tmp/diff_new_pack.g16Eaa/_new 2020-09-07 21:36:03.065400079 +0200
@@ -232,7 +232,6 @@
install nano
install ntfs-3g
install open-iscsi
-install pcmciautils
install pptp
install quota
install reiserfs
@@ -267,16 +266,18 @@
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
++++++ list-x11.sh ++++++
--- /var/tmp/diff_new_pack.g16Eaa/_old 2020-09-07 21:36:03.157400123 +0200
+++ /var/tmp/diff_new_pack.g16Eaa/_new 2020-09-07 21:36:03.157400123 +0200
@@ -47,9 +47,11 @@
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
++++++ pre-checkin.sh ++++++
--- /var/tmp/diff_new_pack.g16Eaa/_old 2020-09-07 21:36:03.221400152 +0200
+++ /var/tmp/diff_new_pack.g16Eaa/_new 2020-09-07 21:36:03.221400152 +0200
@@ -1,7 +1,8 @@
#!/bin/sh
+set -eu
install() {
- if [ -n "$2" ]; then
+ if [ -n "${2-}" ]; then
PACKAGES="$PACKAGES\n <package name=\"$1\" arch=\"$2\"/>"
else
PACKAGES="$PACKAGES\n <package name=\"$1\"/>"
@@ -13,7 +14,7 @@
# 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 <ignore/>, which gets ignored by OBS completely...
- if [ -n "$2" ]; then
+ if [ -n "${2-}" ]; then
PACKAGES="$PACKAGES\n <package name=\"aaa_base\"
replaces=\"$1\" arch=\"$2\"/>"
PACKAGES="$PACKAGES\n <ignore name=\"$1\" arch=\"$2\"/>"
else
@@ -35,7 +36,7 @@
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 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 <!-- list-common.sh -->"
- . "$PWD/list-common.sh"
- PACKAGES="$PACKAGES\n\n <!-- list-${flavor}.sh -->"
- . "$PWD/list-${flavor}.sh"
+ PACKAGES="\n <!-- list-common.sh -->"
+ . "$PWD/list-common.sh"
+ PACKAGES="$PACKAGES\n\n <!-- list-${flavor}.sh -->"
+ . "$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;\
