Hello community,
here is the log from the commit of package kiwi-config-openSUSE for
openSUSE:Factory checked in at 2014-09-10 17:02:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2014-08-25 11:05:10.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes
2014-09-10 17:03:09.000000000 +0200
@@ -1,0 +2,21 @@
+Tue Sep 9 14:30:01 UTC 2014 - [email protected]
+
+- disable usb configs, remove config-hal.patch and config-firstboot.patch
+
+-------------------------------------------------------------------
+Tue Sep 9 14:20:31 UTC 2014 - [email protected]
+
+- remove clicfs support - we don't use it anymore
+
+-------------------------------------------------------------------
+Tue Sep 9 14:16:14 UTC 2014 - [email protected]
+
+- remove ifcfg-eth0, not used anymore
+
+-------------------------------------------------------------------
+Tue Sep 9 12:41:10 UTC 2014 - [email protected]
+
+- disable wicked
+- throw out obsolete sound card hacks, /etc/hosts hack
+
+-------------------------------------------------------------------
Old:
----
clicfs.service
config-firstboot.patch
config-hal.patch
ifcfg-eth0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-config-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.mXg0f2/_old 2014-09-10 17:03:10.000000000 +0200
+++ /var/tmp/diff_new_pack.mXg0f2/_new 2014-09-10 17:03:10.000000000 +0200
@@ -38,23 +38,19 @@
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source1: COPYING
-Source2: config-hal.patch
Source3: config.sh
Source4: config.xml.in
-Source8: ifcfg-eth0
Source9: isopatch.sh.in
Source10: README
Source11: correct_live_for_reboot
Source12: correct_live_install
Source16: langset.service
Source17: 99-ignore-live-usb.fdi
-Source19: config-firstboot.patch
Source20: geturls.xsl
Source22: getcountrydata.ycp
Source23: langset.sh
Source26: xdm-liveinstall.patch
Source27: SoftLocks
-Source28: clicfs.service
Source30: GPL-2.0.txt
Source31: gpl-3.0.txt
ExcludeArch: ia64 ppc64 s390x s390 ppc
@@ -80,19 +76,12 @@
mv $i ${i/.UTF-8/}
done
popd
-for config in livecd-kde livecd-gnome usb-kde usb-gnome livecd-x11 usb-x11; do
+for config in livecd-kde livecd-gnome livecd-x11; do
cd $BASEDIR
mkdir $config
cd $config
desktop=`echo $config | cut -d- -f2`
type=`echo $config | cut -d- -f1`
- if test $type = usb; then
- #sed -i -e "s,yast2-live-installer,yast2-firstboot," wanted.list
- #sed -i -e "s,release-livecd,release-usb," wanted.list
- othertype=livecd
- else
- othertype=usb
- fi
install -m 755 %{SOURCE3} config.sh
if test $desktop = kde; then
echo 'baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER
kdm4' >> config.sh
@@ -106,18 +95,7 @@
echo 'baseUpdateSysConfig /etc/sysconfig/windowmanager DEFAULT_WM xfce' >>
config.sh
fi
- if test $type = usb; then
- echo 'baseUpdateSysConfig /etc/sysconfig/clock TIMEZONE UTC' >> config.sh
- fi
-
- echo '/usr/bin/systemctl -f enable NetworkManager.service' >> config.sh
-
- grep -v " type:$othertype " %{SOURCE4} | \
- xmllint --format - > config.xml
- if test $type = usb; then
- sed -i -e 's,#USB ,,' config.sh
- fi
- sed -i -e "s,@CONFIG@,/usr/share/openSUSE-kiwi/$config," config.xml
+ sed -e "s,@CONFIG@,/usr/share/openSUSE-kiwi/$config," %{SOURCE4} > config.xml
sed -i -e "s,@VERSION@,$kiwiversion," config.xml
sed -i -e "s,@FLAVOR@,$config," config.xml
volid="openSUSE %{version} Live"
@@ -136,9 +114,6 @@
;;
esac
label=`echo "$volid" | sed -e 's, ,_,g'`
- if test $type = usb; then
- sed -i -e "s,yast2-live-installer,yast2-firstboot," config.xml
- fi
sed -i -e "s,@VOLID@,$volid,; s,@LABEL@,$label," config.xml
%ifarch x86_64
sed -i -e "s,@BOOTKERNEL@,desktop," config.xml
@@ -146,6 +121,7 @@
sed -i -e "s,@BOOTKERNEL@,std," config.xml
sed -i -e 's,firmware="uefi",,' config.xml
%endif
+ xmllint --format config.xml > t && mv t config.xml
jing /usr/share/kiwi/modules/KIWISchema.rng config.xml
sed -e "s,^desktop=,desktop=$desktop," %{SOURCE9} > isopatch.sh
@@ -167,22 +143,11 @@
mkdir -p var/lib/zypp
install -m 644 %{SOURCE27} var/lib/zypp/SoftLocks
echo 0123456-7890-$desktop-$type-0123456 > var/lib/zypp/AnonymousUniqueId
- if test $type = usb; then
- cp %{SOURCE19} var/lib/livecd/config-firstboot.patch
- mkdir -p var/lib/YaST2
- touch var/lib/YaST2/reconfig_system
- # still needed due to a bug in yast2-installation
- touch etc/reconfig_system
- touch etc/dmidecode.md5
- fi
- install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0
cp -a $localedir etc/langset
install -m 755 %{SOURCE23} etc/langset.sh
install -D -m 755 %{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 -D -m 644 %{SOURCE2} etc/YaST2/policy.patch
- install -D -m 644 %{SOURCE28} etc/systemd/system/clicfs.service
if test $desktop != x11; then
install -m 644 %{SOURCE26} etc/YaST2/liveinstall.patch
fi
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.mXg0f2/_old 2014-09-10 17:03:10.000000000 +0200
+++ /var/tmp/diff_new_pack.mXg0f2/_new 2014-09-10 17:03:10.000000000 +0200
@@ -28,25 +28,16 @@
#--------------------------------------
echo "Configure image: [$name]..."
-if test -n "$use_special_hacks"; then
-#======================================
-# Load sound drivers by default
#--------------------------------------
-perl -ni -e 'm,^blacklist snd-, || print;' \
- /etc/modprobe.d/50-blacklist.conf
-
-# and unmute their mixers.
-perl -pi -e 's,/sbin/alsactl -F restore,/bin/set_default_volume -f,;' \
- /etc/udev/rules.d/40-alsa.rules
-fi
+# enable and disable services
-#--------------------------------------
-# these two we want to disable for policy reasons
-chkconfig sshd off
-chkconfig cron off
+for i in langset NetworkManager; do
+ systemctl -f enable $i
+done
+for i in sshd cron wicked purge-kernels; do
+ systemctl -f disable $i
+done
-ln -s '/etc/systemd/system/clicfs.service'
'/etc/systemd/system/multi-user.target.wants/clicfs.service'
-ln -s '/usr/lib/systemd/system/langset.service'
'/usr/lib/systemd/system/sysinit.target.wants/langset.service'
cd /
if test -e /etc/YaST2/liveinstall.patch; then
@@ -57,10 +48,6 @@
patch -f /etc/YaST2/firstboot.xml /var/lib/livecd/config-firstboot.patch
fi
-# disabled for now - if you reenable, don't forget correct_live_install
-# bnc#382158
-# patch -p0 < /etc/YaST2/policy.patch
-
for i in /rpmkeys/gpg*.asc; do
# the import fails if kiwi already had this key
rpm --import $i || true
@@ -68,8 +55,6 @@
done
rmdir /rpmkeys
-insserv
-
rm -rf /var/cache/zypp/raw/*
bash -x /var/lib/livecd/geturls.sh
@@ -113,8 +98,6 @@
#USB /usr/bin/correct_live_for_reboot usb
#USB /usr/bin/correct_live_install usb
-echo '127.0.0.2 linux.site linux' >> /etc/hosts
-
ln -s /usr/lib/systemd/system/runlevel5.target
/etc/systemd/system/default.target
baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER_AUTOLOGIN
linux
baseUpdateSysConfig /etc/sysconfig/keyboard KEYTABLE us.map.gz
++++++ config.xml.in ++++++
--- /var/tmp/diff_new_pack.mXg0f2/_old 2014-09-10 17:03:10.000000000 +0200
+++ /var/tmp/diff_new_pack.mXg0f2/_new 2014-09-10 17:03:10.000000000 +0200
@@ -6,14 +6,7 @@
<specification>openSUSE @VERSION@ Live system</specification>
</description>
<preferences>
- <type primary="true" boot="isoboot/suse-@VERSION@" bootprofile="default"
bootkernel="@BOOTKERNEL@" filesystem="ext4" flags="overlay" hybrid="true"
hybridpersistent="true" image="iso" editbootconfig="isopatch.sh"
firmware="uefi" volid="@VOLID@"/> <!-- type:livecd -->
- <type boot="oemboot/suse-@VERSION@" filesystem="ext4" image="oem"> <!--
type:usb -->
- <oemconfig> <!-- type:usb -->
- <oem-swap>false</oem-swap> <!-- type:usb -->
- <oem-boot-title>USB</oem-boot-title> <!-- type:usb -->
- </oemconfig> <!-- type:usb -->
- <size unit="M">3000</size> <!-- type:usb -->
- </type> <!-- type:usb -->
+ <type primary="true" boot="isoboot/suse-@VERSION@" bootprofile="default"
bootkernel="@BOOTKERNEL@" filesystem="ext4" flags="overlay" hybrid="true"
hybridpersistent="true" image="iso" editbootconfig="isopatch.sh"
firmware="uefi" volid="@VOLID@"/>
<version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>openSUSE</bootsplash-theme>
++++++ correct_live_for_reboot ++++++
--- /var/tmp/diff_new_pack.mXg0f2/_old 2014-09-10 17:03:10.000000000 +0200
+++ /var/tmp/diff_new_pack.mXg0f2/_new 2014-09-10 17:03:10.000000000 +0200
@@ -13,8 +13,7 @@
if test -e /etc/init.d/boot.compcache; then
chkconfig boot.compcache off
fi
-rm /etc/systemd/system/multi-user.target.wants/clicfs.service
/usr/lib/systemd/system/sysinit.target.wants/langset.service
-rm /etc/systemd/system/clicfs.service
/etc/systemd/system/multi-user.target.wants/clicfs.service
+rm /usr/lib/systemd/system/sysinit.target.wants/langset.service
rm /usr/lib/systemd/system/langset.service
/usr/lib/systemd/system/sysinit.target.wants/langset.service
++++++ correct_live_install ++++++
--- /var/tmp/diff_new_pack.mXg0f2/_old 2014-09-10 17:03:10.000000000 +0200
+++ /var/tmp/diff_new_pack.mXg0f2/_new 2014-09-10 17:03:10.000000000 +0200
@@ -32,8 +32,6 @@
rm -rf /etc/langset/
cd /
-# patch -R -p0 < /etc/YaST2/policy.patch
-rm /etc/YaST2/policy.patch
patch -R -p0 < /etc/YaST2/liveinstall.patch
rm /etc/YaST2/liveinstall.patch
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
