Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2014-09-07 11:10:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2014-09-03 21:23:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2014-09-07 11:10:08.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Sep 5 14:32:23 UTC 2014 - lsle...@suse.cz + +- do not write /etc/sysconfig/kernel:INITRD_MODULES, it has been + dropped (bnc#895084) +- 3.1.105 + +------------------------------------------------------------------- +Thu Sep 4 12:32:06 UTC 2014 - mvid...@suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.104 + +------------------------------------------------------------------- Old: ---- yast2-3.1.103.tar.bz2 New: ---- yast2-3.1.105.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.J0mcT1/_old 2014-09-07 11:10:09.000000000 +0200 +++ /var/tmp/diff_new_pack.J0mcT1/_new 2014-09-07 11:10:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.103 +Version: 3.1.105 Release: 0 Url: https://github.com/yast/yast-yast2 @@ -38,13 +38,12 @@ # Needed for tests BuildRequires: grep -BuildRequires: rubygem-rspec # for symlinking yardoc duplicates BuildRequires: fdupes # For running RSpec tests during build -BuildRequires: rubygem-rspec +BuildRequires: rubygem(rspec) # pre-requires for filling the sysconfig template (sysconfig.yast2) PreReq: %fillup_prereq ++++++ yast2-3.1.103.tar.bz2 -> yast2-3.1.105.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.103/library/system/src/modules/Initrd.rb new/yast2-3.1.105/library/system/src/modules/Initrd.rb --- old/yast2-3.1.103/library/system/src/modules/Initrd.rb 2014-09-01 14:52:08.000000000 +0200 +++ new/yast2-3.1.105/library/system/src/modules/Initrd.rb 2014-09-06 07:47:23.000000000 +0200 @@ -39,6 +39,8 @@ module Yast class InitrdClass < Module + include Yast::Logger + def main Yast.import "UI" @@ -138,7 +140,7 @@ :from => "list", :to => "list <string>" ) - end + end # currently no disk controller modules are known to fail in initrd (bnc#719696), list removed end deep_copy(@modules_to_skip) @@ -195,6 +197,9 @@ # @param [String] modname name of module # @param [String] modargs arguments to be passes to module def AddModule(modname, modargs) + log.warn "Initrd.AddModule() is deprecated, do not use (sysconfig.kernel.INITRD_MODULES " \ + "is not written anymore, see bnc#895084)" + if Stage.initial && Builtins.size(@modules) == 0 tmp_mods = Convert.to_string( SCR.Read(path(".etc.install_inf.InitrdModules")) @@ -372,10 +377,12 @@ path(".target.bash"), "/usr/bin/touch /etc/sysconfig/bootloader" ) + + # TODO FIXME: the modules are not written, remove them completely, + # for now just log them without any change mods = Builtins.mergestring(ListModules(), " ") - Builtins.y2milestone("Writing modules %1", mods) - SCR.Write(path(".sysconfig.kernel.INITRD_MODULES"), mods) - SCR.Write(path(".sysconfig.kernel"), nil) + log.warn "Ignoring configured kernel modules: #{mods}" unless mods.empty? + # recreate initrd param = "" if @splash != "" && @splash != nil && diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.103/library/system/testsuite/tests/initrd.out new/yast2-3.1.105/library/system/testsuite/tests/initrd.out --- old/yast2-3.1.103/library/system/testsuite/tests/initrd.out 2014-09-01 14:52:08.000000000 +0200 +++ new/yast2-3.1.105/library/system/testsuite/tests/initrd.out 2014-09-06 07:47:23.000000000 +0200 @@ -10,6 +10,7 @@ Dump Reseting again Return nil Dump Adding ne2k +Log Initrd.AddModule() is deprecated, do not use (sysconfig.kernel.INITRD_MODULES is not written anymore, see bnc#895084) Read .target.size "/etc/sysconfig/kernel" 0 Read .sysconfig.kernel.INITRD_MODULES "reiserfs lvmmod" Return nil @@ -23,8 +24,7 @@ Read .target.size "/etc/sysconfig/kernel" 0 Read .sysconfig.kernel.INITRD_MODULES "reiserfs lvmmod" Execute .target.bash "/usr/bin/touch /etc/sysconfig/bootloader" 0 -Write .sysconfig.kernel.INITRD_MODULES "reiserfs ne2k" true -Write .sysconfig.kernel nil true +Log Ignoring configured kernel modules: reiserfs ne2k Execute .target.bash "/sbin/mkinitrd >> /var/log/YaST2/y2logmkinitrd 2>&1" 0 Return true Dump Importing with filtered module @@ -35,8 +35,7 @@ Read .target.size "/etc/sysconfig/kernel" 0 Read .sysconfig.kernel.INITRD_MODULES "reiserfs lvmmod" Execute .target.bash "/usr/bin/touch /etc/sysconfig/bootloader" 0 -Write .sysconfig.kernel.INITRD_MODULES "ne2k xfs_dmapi xfs_support lvmmod" true -Write .sysconfig.kernel nil true +Log Ignoring configured kernel modules: ne2k xfs_dmapi xfs_support lvmmod Execute .target.bash "/sbin/mkinitrd >> /var/log/YaST2/y2logmkinitrd 2>&1" 0 Return true Dump Setting Mode::Update @@ -49,8 +48,7 @@ Read .target.size "/etc/sysconfig/kernel" 0 Read .sysconfig.kernel.INITRD_MODULES "reiserfs lvmmod" Execute .target.bash "/usr/bin/touch /etc/sysconfig/bootloader" 0 -Write .sysconfig.kernel.INITRD_MODULES "ne2k lvmmod" true -Write .sysconfig.kernel nil true +Log Ignoring configured kernel modules: ne2k lvmmod Execute .target.bash "/sbin/mkinitrd >> /var/log/YaST2/y2logmkinitrd 2>&1" 0 Return true Dump Resetting for installation test @@ -58,8 +56,11 @@ Return nil Return nil Dump Testing keeping installation order +Log Initrd.AddModule() is deprecated, do not use (sysconfig.kernel.INITRD_MODULES is not written anymore, see bnc#895084) Read .etc.install_inf.InitrdModules "driver1 driver2 driver3" Return nil +Log Initrd.AddModule() is deprecated, do not use (sysconfig.kernel.INITRD_MODULES is not written anymore, see bnc#895084) Return nil +Log Initrd.AddModule() is deprecated, do not use (sysconfig.kernel.INITRD_MODULES is not written anymore, see bnc#895084) Return nil Return ["driver2", "driver3", "ne2k"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.103/package/yast2.changes new/yast2-3.1.105/package/yast2.changes --- old/yast2-3.1.103/package/yast2.changes 2014-09-01 14:52:08.000000000 +0200 +++ new/yast2-3.1.105/package/yast2.changes 2014-09-06 07:47:23.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Fri Sep 5 14:32:23 UTC 2014 - lsle...@suse.cz + +- do not write /etc/sysconfig/kernel:INITRD_MODULES, it has been + dropped (bnc#895084) +- 3.1.105 + +------------------------------------------------------------------- +Thu Sep 4 12:32:06 UTC 2014 - mvid...@suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.104 + +------------------------------------------------------------------- Thu Aug 28 11:17:16 UTC 2014 - jreidin...@suse.com - fix using changed root in netd agent so it can be used in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.103/package/yast2.spec new/yast2-3.1.105/package/yast2.spec --- old/yast2-3.1.103/package/yast2.spec 2014-09-01 14:52:08.000000000 +0200 +++ new/yast2-3.1.105/package/yast2.spec 2014-09-06 07:47:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.103 +Version: 3.1.105 Release: 0 URL: https://github.com/yast/yast-yast2 @@ -34,13 +34,13 @@ BuildRequires: yast2-core >= 2.18.12 yast2-pkg-bindings >= 2.20.3 yast2-ycp-ui-bindings >= 2.18.4 # Needed for tests -BuildRequires: rubygem-rspec grep +BuildRequires: grep # for symlinking yardoc duplicates BuildRequires: fdupes # For running RSpec tests during build -BuildRequires: rubygem-rspec +BuildRequires: rubygem(rspec) # pre-requires for filling the sysconfig template (sysconfig.yast2) PreReq: %fillup_prereq -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
