Hello community,
here is the log from the commit of package kiwi-config-openSUSE for
openSUSE:Factory checked in at 2016-05-25 21:29:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-config-openSUSE"
Changes:
--------
---
/work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes
2016-03-26 15:25:28.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes
2016-05-25 21:29:48.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May 18 08:55:36 UTC 2016 - [email protected]
+
+- Do not apply the live-installer patch anymore:
+ yast2-live-installer has been dropped.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-config-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.DOQ7yf/_old 2016-05-25 21:29:50.000000000 +0200
+++ /var/tmp/diff_new_pack.DOQ7yf/_new 2016-05-25 21:29:50.000000000 +0200
@@ -65,7 +65,7 @@
install -D /usr/lib/YaST2/startup/YaST2.call
$testdir/usr/lib/YaST2/startup/YaST2.call
install -D /usr/lib/X11/display-manager $testdir/usr/lib/X11/display-manager
cd $testdir
-patch -p0 < %{SOURCE26}
+#patch -p0 < %{SOURCE26}
%build
kiwiversion=13.2
@@ -147,9 +147,10 @@
cp -a $localedir etc/langset
install -m 755 %{SOURCE23} etc/langset.sh
install -D -m 644 %{SOURCE16} usr/lib/systemd/system/langset.service
- install -D -m 755 %{SOURCE11} usr/bin/correct_live_for_reboot
- install -D -m 755 %{SOURCE12} usr/bin/correct_live_install
- install -m 644 %{SOURCE26} etc/YaST2/liveinstall.patch
+# live-installer was dropped on 2016-05-17 - dimstar
+# install -D -m 755 %{SOURCE11} usr/bin/correct_live_for_reboot
+# install -D -m 755 %{SOURCE12} usr/bin/correct_live_install
+# install -m 644 %{SOURCE26} etc/YaST2/liveinstall.patch
mkdir -p var/lib/zypp/
echo livecd-$desktop > var/lib/zypp/LastDistributionFlavor
++++++ config.xml.in ++++++
--- /var/tmp/diff_new_pack.DOQ7yf/_old 2016-05-25 21:29:50.000000000 +0200
+++ /var/tmp/diff_new_pack.DOQ7yf/_new 2016-05-25 21:29:50.000000000 +0200
@@ -24,7 +24,7 @@
<package name="grub2-branding-openSUSE" bootinclude="true"/>
<!-- workaround for bnc#892087 -->
<package name="e2fsprogs" bootinclude="true"/>
- <package name="yast2-live-installer"/>
+ <!--package name="yast2-live-installer"/-->
<package name="pam"/>
<package name="pam-config"/>
<package name="pam-modules"/>
++++++ isopatch.sh.in ++++++
--- /var/tmp/diff_new_pack.DOQ7yf/_old 2016-05-25 21:29:50.000000000 +0200
+++ /var/tmp/diff_new_pack.DOQ7yf/_new 2016-05-25 21:29:50.000000000 +0200
@@ -7,7 +7,8 @@
#sed -i -e "s,label openSUSE.*,label $label," boot/*/loader/isolinux.cfg
if test "$desktop" != "x11"; then
sed -i -e "s,label Failsafe.*,label linux," boot/*/loader/isolinux.cfg
- sed -i -e "s,showopts ide=nodma.*,liveinstall showopts,"
boot/*/loader/isolinux.cfg
+ #sed -i -e "s,showopts ide=nodma.*,liveinstall showopts,"
boot/*/loader/isolinux.cfg
+ sed -i -e "s,showopts ide=nodma.*,showopts," boot/*/loader/isolinux.cfg
else
sed -i -ne ':ss;/^label media/{:s;n;/^ /b s;b ss};p'
boot/*/loader/isolinux.cfg
#sed -i -e "s,label Failsafe.*,label Failsafe $label,"
boot/*/loader/isolinux.cfg
