Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2015-01-21 21:51:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2015-01-14 11:44:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2015-01-21 21:52:03.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 20 10:54:52 UTC 2015 - [email protected] + +- Use grub2-efi on aarch64 +- 3.1.115 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.114.tar.bz2 New: ---- yast2-bootloader-3.1.115.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.oMUAR5/_old 2015-01-21 21:52:04.000000000 +0100 +++ /var/tmp/diff_new_pack.oMUAR5/_new 2015-01-21 21:52:04.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.114 +Version: 3.1.115 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.114.tar.bz2 -> yast2-bootloader-3.1.115.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.114/package/yast2-bootloader.changes new/yast2-bootloader-3.1.115/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.114/package/yast2-bootloader.changes 2015-01-13 09:57:11.000000000 +0100 +++ new/yast2-bootloader-3.1.115/package/yast2-bootloader.changes 2015-01-20 13:12:11.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 20 10:54:52 UTC 2015 - [email protected] + +- Use grub2-efi on aarch64 +- 3.1.115 + +------------------------------------------------------------------- Tue Jan 13 08:48:38 UTC 2015 - [email protected] - Do not crash with unsupported bootloader when resetting diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.114/package/yast2-bootloader.spec new/yast2-bootloader-3.1.115/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.114/package/yast2-bootloader.spec 2015-01-13 09:57:11.000000000 +0100 +++ new/yast2-bootloader-3.1.115/package/yast2-bootloader.spec 2015-01-20 13:12:11.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.114 +Version: 3.1.115 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.114/src/include/bootloader/grub2/dialogs.rb new/yast2-bootloader-3.1.115/src/include/bootloader/grub2/dialogs.rb --- old/yast2-bootloader-3.1.114/src/include/bootloader/grub2/dialogs.rb 2015-01-13 09:57:11.000000000 +0100 +++ new/yast2-bootloader-3.1.115/src/include/bootloader/grub2/dialogs.rb 2015-01-20 13:12:11.000000000 +0100 @@ -59,7 +59,7 @@ "contents" => VBox( VSquash(HBox( Top(VBox(VSpacing(1), "loader_type")), - Arch.s390 ? Empty() : "loader_location")), + Arch.s390 || Arch.aarch64 ? Empty() : "loader_location")), MarginBox(1, 0.5, "distributor"), MarginBox(1, 0.5, Left("activate")), MarginBox(1, 0.5, Left("generic_mbr")), @@ -285,11 +285,13 @@ end def grub2efiWidgets - if Arch.x86_64 - if @_grub2_efi_widgets.nil? + if @_grub2_efi_widgets.nil? + if Arch.x86_64 @_grub2_efi_widgets = { "loader_location" => grub2SecureBootWidget } - @_grub2_efi_widgets.merge! Grub2Options() + else + @_grub2_efi_widgets = {} end + @_grub2_efi_widgets.merge! Grub2Options() end deep_copy(@_grub2_efi_widgets) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.114/src/modules/BootCommon.rb new/yast2-bootloader-3.1.115/src/modules/BootCommon.rb --- old/yast2-bootloader-3.1.114/src/modules/BootCommon.rb 2015-01-13 09:57:11.000000000 +0100 +++ new/yast2-bootloader-3.1.115/src/modules/BootCommon.rb 2015-01-20 13:12:11.000000000 +0100 @@ -407,8 +407,8 @@ @loader_type = "grub2" if ["s390", "ppc", "grub"].include? @loader_type Builtins.y2milestone("Bootloader detection returned %1", @loader_type) - if (Arch.i386 || Arch.x86_64) && boot_efi? - # use grub2-efi as default bootloader for x86_64/i386 EFI + if (Arch.i386 || Arch.x86_64 || Arch.aarch64) && boot_efi? + # use grub2-efi as default bootloader for x86_64/i386/aarch64 EFI @loader_type = "grub2-efi" end @@ -492,8 +492,8 @@ return SUPPORTED_BOOTLOADERS + ["default"] end ret = [getLoaderType(false)] - ret << "grub2" # grub2 everywhere - ret << "grub2-efi" if Arch.x86_64 + ret << "grub2" unless Arch.aarch64 # grub2 everywhere except aarch64 + ret << "grub2-efi" if Arch.x86_64 || Arch.aarch64 ret << "none" # avoid double entry for selected one ret.uniq diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.114/src/modules/BootGRUB2EFI.rb new/yast2-bootloader-3.1.115/src/modules/BootGRUB2EFI.rb --- old/yast2-bootloader-3.1.114/src/modules/BootGRUB2EFI.rb 2015-01-13 09:57:11.000000000 +0100 +++ new/yast2-bootloader-3.1.115/src/modules/BootGRUB2EFI.rb 2015-01-20 13:12:11.000000000 +0100 @@ -133,6 +133,8 @@ packages = ["grub2-i386-efi"] elsif Arch.x86_64 packages = ["grub2-x86_64-efi", "shim", "mokutil"] + elsif Arch.aarch64 + packages = ["grub2-arm64-efi"] else # do not raise exception as we call constructor everywhere even if it doesn't make sense packages = [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.114/src/modules/BootSupportCheck.rb new/yast2-bootloader-3.1.115/src/modules/BootSupportCheck.rb --- old/yast2-bootloader-3.1.114/src/modules/BootSupportCheck.rb 2015-01-13 09:57:11.000000000 +0100 +++ new/yast2-bootloader-3.1.115/src/modules/BootSupportCheck.rb 2015-01-20 13:12:11.000000000 +0100 @@ -77,7 +77,7 @@ return true if lt == "none" # grub2 is sooo cool... - return true if lt == "grub2" + return true if lt == "grub2" && !Arch.aarch64 if Arch.i386 || Arch.x86_64 if efi? @@ -86,6 +86,9 @@ return true if lt == "grub2" end end + + return true if lt == "grub2-efi" && Arch.aarch64 + Builtins.y2error( "Unsupported combination of hardware platform %1 and bootloader %2", Arch.architecture, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
