Hello community,
here is the log from the commit of package livecd-openSUSE for openSUSE:Factory
checked in at 2019-10-24 23:03:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/livecd-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.livecd-openSUSE.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "livecd-openSUSE"
Thu Oct 24 23:03:31 2019 rev:78 rq:742152 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/livecd-openSUSE/livecd-openSUSE.changes
2019-10-22 12:54:56.613960098 +0200
+++
/work/SRC/openSUSE:Factory/.livecd-openSUSE.new.2990/livecd-openSUSE.changes
2019-10-24 23:03:34.876131346 +0200
@@ -1,0 +2,6 @@
+Wed Oct 23 13:39:39 UTC 2019 - Fabian Vogt <[email protected]>
+
+- It's Leap-release on Leap now for some reason
+- Only install opensuse-welcome on TW
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ livecd-leap-gnome.kiwi ++++++
--- /var/tmp/diff_new_pack.aj7DrB/_old 2019-10-24 23:03:35.996132653 +0200
+++ /var/tmp/diff_new_pack.aj7DrB/_new 2019-10-24 23:03:35.996132653 +0200
@@ -540,8 +540,8 @@
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
- <package name="openSUSE-release"/>
- <package name="openSUSE-release-livecd-gnome"/>
+ <package name="Leap-release"/>
+ <package name="Leap-release-livecd-gnome"/>
<package name="branding-openSUSE"/>
</packages>
<repository type="rpm-md">
++++++ livecd-leap-kde.kiwi ++++++
--- /var/tmp/diff_new_pack.aj7DrB/_old 2019-10-24 23:03:36.012132672 +0200
+++ /var/tmp/diff_new_pack.aj7DrB/_new 2019-10-24 23:03:36.012132672 +0200
@@ -496,12 +496,11 @@
<package name="aaa_base" replaces="cyrus-sasl"/>
<ignore name="cyrus-sasl"/>
<package name="alsa-firmware"/>
- <package name="opensuse-welcome"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
- <package name="openSUSE-release"/>
- <package name="openSUSE-release-livecd-kde"/>
+ <package name="Leap-release"/>
+ <package name="Leap-release-livecd-kde"/>
<package name="branding-openSUSE"/>
</packages>
<repository type="rpm-md">
++++++ livecd-leap-x11.kiwi ++++++
--- /var/tmp/diff_new_pack.aj7DrB/_old 2019-10-24 23:03:36.028132690 +0200
+++ /var/tmp/diff_new_pack.aj7DrB/_new 2019-10-24 23:03:36.028132690 +0200
@@ -544,8 +544,8 @@
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
- <package name="openSUSE-release"/>
- <package name="openSUSE-release-livecd-x11"/>
+ <package name="Leap-release"/>
+ <package name="Leap-release-livecd-x11"/>
<package name="branding-openSUSE"/>
</packages>
<repository type="rpm-md">
livecd-tumbleweed-gnome.kiwi: same change
livecd-tumbleweed-kde.kiwi: same change
livecd-tumbleweed-x11.kiwi: same change
livecd-tumbleweed-xfce.kiwi: same change
++++++ list-kde.sh ++++++
--- /var/tmp/diff_new_pack.aj7DrB/_old 2019-10-24 23:03:36.184132872 +0200
+++ /var/tmp/diff_new_pack.aj7DrB/_new 2019-10-24 23:03:36.184132872 +0200
@@ -68,4 +68,4 @@
install alsa-firmware
# From x11_enhanced, but that pattern can't be installed
-install opensuse-welcome
+[ "$distro" = "tumbleweed" ] && install opensuse-welcome
++++++ list-xfce.sh ++++++
--- /var/tmp/diff_new_pack.aj7DrB/_old 2019-10-24 23:03:36.212132905 +0200
+++ /var/tmp/diff_new_pack.aj7DrB/_new 2019-10-24 23:03:36.212132905 +0200
@@ -43,4 +43,4 @@
install alsa-firmware
# From x11_enhanced, but that pattern can't be installed
-install opensuse-welcome
+[ "$distro" = "tumbleweed" ] && install opensuse-welcome
++++++ livecd.kiwi.in ++++++
--- /var/tmp/diff_new_pack.aj7DrB/_old 2019-10-24 23:03:36.236132933 +0200
+++ /var/tmp/diff_new_pack.aj7DrB/_new 2019-10-24 23:03:36.236132933 +0200
@@ -59,8 +59,8 @@
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
- <package name="openSUSE-release"/>
- <package name="openSUSE-release-livecd-@FLAVOR@"/>
+ <package name="@RELEASEPREFIX@-release"/>
+ <package name="@RELEASEPREFIX@-release-livecd-@FLAVOR@"/>
<package name="branding-openSUSE"/>
</packages>
<repository type="rpm-md">
++++++ pre-checkin.sh ++++++
--- /var/tmp/diff_new_pack.aj7DrB/_old 2019-10-24 23:03:36.252132952 +0200
+++ /var/tmp/diff_new_pack.aj7DrB/_new 2019-10-24 23:03:36.252132952 +0200
@@ -33,9 +33,11 @@
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 @@
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
