[yast-commit] [ci_new_pac] JFYI yast2-bootloader -> sle12
Script 'mail_helper' called by kukuk Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: kukuk. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-bootloader -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-bootloader/yast2-bootloader.changes 2014-03-04 17:52:03.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-bootloader/yast2-bootloader.changes 2014-03-04 17:52:21.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 4 16:27:11 CET 2014 - snwint@suse.de + +- switch to grub2 on s390x +- support both grub2 & zipl +- drop grub & elilo support from x86 +- 3.1.9 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-bootloader - yast2-kdump - yast2-product-creator - yast2-reipl - yast2-vm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-bootloader (Old) and /mounts/work_src_done/SLE12/yast2-bootloader (BS:build ID:33829 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-bootloader-3.1.8.tar.bz2 New: ---- yast2-bootloader-3.1.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.3yRyJh/_old 2014-03-04 18:03:27.000000000 +0100 +++ /var/tmp/diff_new_pack.3yRyJh/_new 2014-03-04 18:03:27.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.8 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.8.tar.bz2 -> yast2-bootloader-3.1.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.8/package/yast2-bootloader.changes new/yast2-bootloader-3.1.9/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.8/package/yast2-bootloader.changes 2014-03-04 16:47:14.000000000 +0100 +++ new/yast2-bootloader-3.1.9/package/yast2-bootloader.changes 2014-03-04 17:49:44.000000000 +0100 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Mar 4 16:27:11 CET 2014 - snwint@suse.de + +- switch to grub2 on s390x +- support both grub2 & zipl +- drop grub & elilo support from x86 +- 3.1.9 + +------------------------------------------------------------------- Tue Mar 4 12:03:05 UTC 2014 - jreidinger@suse.com - fix typo in proposal screen(bnc#866607) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.8/package/yast2-bootloader.spec new/yast2-bootloader-3.1.9/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.8/package/yast2-bootloader.spec 2014-03-04 16:47:14.000000000 +0100 +++ new/yast2-bootloader-3.1.9/package/yast2-bootloader.spec 2014-03-04 17:49:44.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.8 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.8/src/modules/BootCommon.rb new/yast2-bootloader-3.1.9/src/modules/BootCommon.rb --- old/yast2-bootloader-3.1.8/src/modules/BootCommon.rb 2014-03-04 16:47:14.000000000 +0100 +++ new/yast2-bootloader-3.1.9/src/modules/BootCommon.rb 2014-03-04 17:49:44.000000000 +0100 @@ -954,7 +954,7 @@ SCR.Read(path(".sysconfig.bootloader.LOADER_TYPE")) ) if @loader_type != nil && @loader_type != "" - @loader_type = "zipl" if @loader_type == "s390" + @loader_type = "grub2" if @loader_type == "s390" @loader_type = "ppc" if @loader_type == "lilo" && Arch.ppc Builtins.y2milestone( "Sysconfig bootloader is %1, using", @@ -981,7 +981,7 @@ end # detect bootloader @loader_type = Convert.to_string(SCR.Read(path(".probe.boot_arch"))) - @loader_type = "zipl" if @loader_type == "s390" + @loader_type = "grub2" if @loader_type == "s390" # ppc uses grub2 (fate #315753) @loader_type = "grub2" if @loader_type == "ppc" # suppose grub2 should superscede grub .. @@ -1145,18 +1145,21 @@ if Arch.i386 || Arch.x86_64 ret = Convert.convert( # don't add lilo (fate #314886) - Builtins.merge(ret, ["grub", "grub2"]), + Builtins.merge(ret, ["grub2"]), :from => "list", :to => "list <string>" ) if Arch.x86_64 ret = Convert.convert( - Builtins.merge(ret, ["elilo", "grub2-efi"]), + Builtins.merge(ret, ["grub2-efi"]), :from => "list", :to => "list <string>" ) end end + if Arch.s390 + ret = ["grub2", "zipl"] + end # in order not to display it twice when "none" is selected ret = Builtins.filter(ret) { |l| l != "none" } ret = Builtins.toset(ret) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.8/src/modules/BootZIPL.rb new/yast2-bootloader-3.1.9/src/modules/BootZIPL.rb --- old/yast2-bootloader-3.1.8/src/modules/BootZIPL.rb 2014-03-04 16:47:14.000000000 +0100 +++ new/yast2-bootloader-3.1.9/src/modules/BootZIPL.rb 2014-03-04 17:49:44.000000000 +0100 @@ -306,7 +306,7 @@ BootCommon.bootloader_attribs, "zipl", { - "loader_name" => "zipl", + "loader_name" => "ZIPL", "required_packages" => ["s390-tools"], "initializer" => fun_ref(method(:Initializer), "void ()") } continue with "q"... Checked in at Tue Mar 4 18:03:59 CET 2014 by kukuk Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
kukuk