Script 'mail_helper' called by ro
Hello packager,
This is just FYI. Your package was checked in in distribution "sle12"
by autobuild-member: ro.
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-01-17 14:16:26.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-bootloader/yast2-bootloader.changes 2014-01-28 11:07:20.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Jan 28 09:56:33 UTC 2014 - jreidinger(a)suse.com
+
+- Fix examining MBR
+- 3.1.4
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- installation-images
- installation-images-extras
- skelcd-control-SLED
- skelcd-control-SLES
- 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:31236 MAIL:yast-devel@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader", Maintainer is "yast-devel(a)opensuse.org"
Old:
----
yast2-bootloader-3.1.3.tar.bz2
New:
----
yast2-bootloader-3.1.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.ls3Jl1/_old 2014-01-30 15:05:58.000000000 +0100
+++ /var/tmp/diff_new_pack.ls3Jl1/_new 2014-01-30 15:05:58.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-bootloader
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,68 +17,52 @@
Name: yast2-bootloader
-Version: 3.1.3
+Version: 3.1.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-BuildRequires: update-desktop-files
+Group: System/YaST
+License: GPL-2.0+
BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: update-desktop-files
PreReq: /bin/sed %fillup_prereq
# Installation::*version variables
# Wizard::SetDialogTitleAndIcon
-Requires: parted
-Requires: perl-Bootloader-YAML
-Requires: perl-Compress-Zlib
Requires: yast2 >= 2.21.22
-Requires: yast2-core >= 2.18.7
Requires: yast2-packager >= 2.17.24
Requires: yast2-pkg-bindings >= 2.17.25
-Requires: yast2-storage >= 2.18.18
+Requires: perl-Bootloader-YAML
+Requires: yast2-core >= 2.18.7
+Requires: yast2-storage >= 2.18.18 parted perl-Compress-Zlib
%ifarch %ix86 x86_64
Requires: syslinux
%endif
-Provides: yast2-config-bootloader
-Provides: yast2-config-lilo
-Obsoletes: yast2-config-bootloader
-Obsoletes: yast2-config-lilo
-Provides: yast2-agent-liloconf
-Provides: yast2-agent-prom
-Obsoletes: yast2-agent-liloconf
-Obsoletes: yast2-agent-prom
-Provides: yast2-trans-boot
-Provides: yast2-trans-inst-bootloader
-Provides: yast2-trans-lilo
-Obsoletes: yast2-trans-boot
-Obsoletes: yast2-trans-inst-bootloader
-Obsoletes: yast2-trans-lilo
-Provides: y2c_boot
-Provides: y2t_boot
-Obsoletes: y2c_boot
-Obsoletes: y2t_boot
-Provides: y2t_inst-bootloader
-Provides: yast2-agent-liloconf-devel
-Provides: yast2-agent-prom-devel
-Obsoletes: y2t_inst-bootloader
-Obsoletes: yast2-agent-liloconf-devel
-Obsoletes: yast2-agent-prom-devel
+Provides: yast2-config-lilo yast2-config-bootloader
+Obsoletes: yast2-config-lilo yast2-config-bootloader
+Provides: yast2-agent-liloconf yast2-agent-prom
+Obsoletes: yast2-agent-liloconf yast2-agent-prom
+Provides: yast2-trans-inst-bootloader yast2-trans-lilo yast2-trans-boot
+Obsoletes: yast2-trans-inst-bootloader yast2-trans-lilo yast2-trans-boot
+Provides: y2c_boot y2t_boot
+Obsoletes: y2c_boot y2t_boot
+Provides: y2t_inst-bootloader yast2-agent-liloconf-devel yast2-agent-prom-devel
+Obsoletes: y2t_inst-bootloader yast2-agent-liloconf-devel yast2-agent-prom-devel
Requires: yast2-ruby-bindings >= 1.0.0
Summary: YaST2 - Bootloader Configuration
-License: GPL-2.0+
-Group: System/YaST
%description
This package contains the YaST2 component for bootloader configuration.
%package devel-doc
Requires: yast2-bootloader = %version
-Summary: YaST2 - Bootloader Configuration - Development Documentation
Group: System/YaST
+Summary: YaST2 - Bootloader Configuration - Development Documentation
%description devel-doc
This package contains development documentation for using the API
@@ -93,6 +77,7 @@
%install
%yast_install
+
%post
%{fillup_only -n bootloader}
@@ -132,4 +117,3 @@
%files devel-doc
%doc %{yast_docdir}/autodocs
-%changelog
++++++ yast2-bootloader-3.1.3.tar.bz2 -> yast2-bootloader-3.1.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/package/yast2-bootloader.changes new/yast2-bootloader-3.1.4/package/yast2-bootloader.changes
--- old/yast2-bootloader-3.1.3/package/yast2-bootloader.changes 2014-01-14 13:07:45.000000000 +0100
+++ new/yast2-bootloader-3.1.4/package/yast2-bootloader.changes 2014-01-28 11:05:41.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Jan 28 09:56:33 UTC 2014 - jreidinger(a)suse.com
+
+- Fix examining MBR
+- 3.1.4
+
+-------------------------------------------------------------------
Tue Jan 14 10:37:06 UTC 2014 - jreidinger(a)suse.com
- handle problematic conversion of perl undef in perl-json
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/package/yast2-bootloader.spec new/yast2-bootloader-3.1.4/package/yast2-bootloader.spec
--- old/yast2-bootloader-3.1.3/package/yast2-bootloader.spec 2014-01-14 13:07:45.000000000 +0100
+++ new/yast2-bootloader-3.1.4/package/yast2-bootloader.spec 2014-01-28 11:05:41.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 3.1.3
+Version: 3.1.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/src/include/bootloader/grub/options.rb new/yast2-bootloader-3.1.4/src/include/bootloader/grub/options.rb
--- old/yast2-bootloader-3.1.3/src/include/bootloader/grub/options.rb 2014-01-14 11:06:53.000000000 +0100
+++ new/yast2-bootloader-3.1.4/src/include/bootloader/grub/options.rb 2014-01-28 11:05:41.000000000 +0100
@@ -590,8 +590,7 @@
boot_devices = BootStorage.getPartitionList(:boot, "grub")
value = ""
if BootCommon.VerifyMDArray
- if BootCommon.enable_md_array_redundancy == nil ||
- BootCommon.enable_md_array_redundancy
+ if BootCommon.enable_md_array_redundancy
UI.ChangeWidget(Id("enable_redundancy"), :Value, true)
else
UI.ChangeWidget(Id("enable_redundancy"), :Value, false)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/src/include/bootloader/routines/lib_iface.rb new/yast2-bootloader-3.1.4/src/include/bootloader/routines/lib_iface.rb
--- old/yast2-bootloader-3.1.3/src/include/bootloader/routines/lib_iface.rb 2014-01-14 13:07:45.000000000 +0100
+++ new/yast2-bootloader-3.1.4/src/include/bootloader/routines/lib_iface.rb 2014-01-28 11:05:41.000000000 +0100
@@ -411,7 +411,7 @@
device_data = TmpYAMLFile.new(device)
ret_data = TmpYAMLFile.new
- run_pbl_yaml "#{ret_data.path}=ExamineMBR(#{device_data})"
+ run_pbl_yaml "#{ret_data.path}=ExamineMBR(#{device_data.path})"
ret = ret_data.data
Builtins.y2milestone("Device: %1 includes in MBR: %2", device, ret)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/src/modules/BootCommon.rb new/yast2-bootloader-3.1.4/src/modules/BootCommon.rb
--- old/yast2-bootloader-3.1.3/src/modules/BootCommon.rb 2014-01-14 11:06:53.000000000 +0100
+++ new/yast2-bootloader-3.1.4/src/modules/BootCommon.rb 2014-01-28 11:05:41.000000000 +0100
@@ -982,6 +982,8 @@
# detect bootloader
@loader_type = Convert.to_string(SCR.Read(path(".probe.boot_arch")))
@loader_type = "zipl" if @loader_type == "s390"
+ # ppc uses grub2 (fate #315753)
+ @loader_type = "grub2" if @loader_type == "ppc"
# suppose grub2 should superscede grub ..
@loader_type = "grub2" if @loader_type == "grub"
Builtins.y2milestone("Bootloader detection returned %1", @loader_type)
@@ -1146,7 +1148,8 @@
]
if Arch.i386 || Arch.x86_64
ret = Convert.convert(
- Builtins.merge(ret, ["lilo", "grub", "grub2"]),
+ # don't add lilo (fate #314886)
+ Builtins.merge(ret, ["grub", "grub2"]),
:from => "list",
:to => "list <string>"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/src/modules/BootGRUB.rb new/yast2-bootloader-3.1.4/src/modules/BootGRUB.rb
--- old/yast2-bootloader-3.1.3/src/modules/BootGRUB.rb 2014-01-14 11:06:53.000000000 +0100
+++ new/yast2-bootloader-3.1.4/src/modules/BootGRUB.rb 2014-01-28 11:05:41.000000000 +0100
@@ -456,19 +456,6 @@
"__devs" => []
}
)
- elsif StorageDevices.FloppyPresent
- out = Builtins.add(
- out,
- {
- "name" => BootCommon.translateSectionTitle("floppy"),
- "original_name" => "floppy",
- "type" => "other",
- "chainloader" => "/dev/fd0",
- "__changed" => true,
- "__auto" => true,
- "__devs" => []
- }
- )
end
out = Builtins.add(out, CreateLinuxSection("failsafe"))
out = Builtins.add(out, CreateLinuxSection("memtest86"))
@@ -525,27 +512,25 @@
GfxMenu.ReadStatusAcousticSignal
md_value = BootStorage.addMDSettingsToGlobals
pB_md_value = Ops.get(BootCommon.globals, "boot_md_mbr", "")
- if md_value != pB_md_value
- if pB_md_value != ""
- disks = Builtins.splitstring(pB_md_value, ",")
- disks = Builtins.filter(disks) { |v| v != "" }
- if Builtins.size(disks) == 2
- BootCommon.enable_md_array_redundancy = true
- md_value = ""
- end
- Builtins.y2milestone(
- "disks from md array (perl Bootloader): %1",
- disks
- )
- end
- if md_value != ""
- BootCommon.enable_md_array_redundancy = false
- Ops.set(BootCommon.globals, "boot_md_mbr", md_value)
- Builtins.y2milestone(
- "Add md array to globals: %1",
- BootCommon.globals
- )
+ if pB_md_value != ""
+ disks = Builtins.splitstring(pB_md_value, ",")
+ disks = Builtins.filter(disks) { |v| v != "" }
+ if Builtins.size(disks) == 2
+ BootCommon.enable_md_array_redundancy = true
+ md_value = ""
end
+ Builtins.y2milestone(
+ "disks from md array (perl Bootloader): %1",
+ disks
+ )
+ end
+ if md_value != ""
+ BootCommon.enable_md_array_redundancy = false
+ Ops.set(BootCommon.globals, "boot_md_mbr", md_value)
+ Builtins.y2milestone(
+ "Add md array to globals: %1",
+ BootCommon.globals
+ )
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/src/modules/BootGRUB2.rb new/yast2-bootloader-3.1.4/src/modules/BootGRUB2.rb
--- old/yast2-bootloader-3.1.3/src/modules/BootGRUB2.rb 2014-01-14 11:06:53.000000000 +0100
+++ new/yast2-bootloader-3.1.4/src/modules/BootGRUB2.rb 2014-01-28 11:05:41.000000000 +0100
@@ -84,27 +84,25 @@
if Mode.normal
md_value = BootStorage.addMDSettingsToGlobals
pB_md_value = Ops.get(BootCommon.globals, "boot_md_mbr", "")
- if md_value != pB_md_value
- if pB_md_value != ""
- disks = Builtins.splitstring(pB_md_value, ",")
- disks = Builtins.filter(disks) { |v| v != "" }
- if Builtins.size(disks) == 2
- BootCommon.enable_md_array_redundancy = true
- md_value = ""
- end
- Builtins.y2milestone(
- "disks from md array (perl Bootloader): %1",
- disks
- )
- end
- if md_value != ""
- BootCommon.enable_md_array_redundancy = false
- Ops.set(BootCommon.globals, "boot_md_mbr", md_value)
- Builtins.y2milestone(
- "Add md array to globals: %1",
- BootCommon.globals
- )
+ if pB_md_value != ""
+ disks = Builtins.splitstring(pB_md_value, ",")
+ disks = Builtins.filter(disks) { |v| v != "" }
+ if Builtins.size(disks) == 2
+ BootCommon.enable_md_array_redundancy = true
+ md_value = ""
end
+ Builtins.y2milestone(
+ "disks from md array (perl Bootloader): %1",
+ disks
+ )
+ end
+ if md_value != ""
+ BootCommon.enable_md_array_redundancy = false
+ Ops.set(BootCommon.globals, "boot_md_mbr", md_value)
+ Builtins.y2milestone(
+ "Add md array to globals: %1",
+ BootCommon.globals
+ )
end
end
continue with "q"...
Checked in at Thu Jan 30 15:06:02 CET 2014 by ro
Remember to have fun...
--
To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org
To contact the owner, e-mail: yast-devel+owner(a)opensuse.org
](https://cod…](http://Climate](https://codeclimate.com/github/yast/yast-network.png)](https://codeclimate.com/github/yast/yast-network)){kind=link}
