Accepting request 264095 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/264095
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=105

grub2-snapper-plugin.sh

@@ -115,7 +115,7 @@ snapper_snapshots_cfg_refresh () {
   hk=""
   [ -z "$hotkey" ] || hk="--hotkey=s"
 
-  for c in `echo -e "${cs}" | sort -Vr`; do
+  for c in `printf "${cs}\n" | sort -Vr`; do
     if ! snapshot_submenu "$c" > "${c}/${snapshot_submenu_name}"; then
        rm -f "${c}/${snapshot_submenu_name}"
        continue

grub2.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Dec  4 01:42:39 UTC 2014 - agraf@suse.com
+
+- enable 32bit arm targets for uboot and efi
+
+-------------------------------------------------------------------
+Sat Nov 29 18:26:00 UTC 2014 - Led <ledest@gmail.com>
+
+- Replace 'echo -e' command in grub2-snapper-plugin.sh script to
+  'printf' command. '-e' option of 'echo' command may be
+  unsupported in some POSIX-complete shells.
+
 -------------------------------------------------------------------
 Fri Nov 14 16:06:00 UTC 2014 - Led <ledest@gmail.com>
 

grub2.spec

@@ -76,11 +76,16 @@ BuildRequires:  xen-devel
 %define platform emu
 %endif
 
+%ifarch %{arm}
+%define grubcpu arm
+%define platform uboot
+%endif
+
 %define grubarch %{grubcpu}-%{platform}
 
 # build efi bootloader on some platforms only:
 %if ! 0%{?efi:1}
-%global efi %{ix86} x86_64 ia64 aarch64
+%global efi %{ix86} x86_64 ia64 aarch64 %{arm}
 %endif
 %ifarch aarch64
 %define only_efi 1
@@ -93,10 +98,14 @@ BuildRequires:  xen-devel
 %ifarch aarch64
 %define grubefiarch arm64-efi
 %else
+%ifarch %{arm}
+%define grubefiarch arm-efi
+%else
 %define grubefiarch %{_target_cpu}-efi
 %endif
 %endif
 %endif
+%endif
 
 %if 0%{?suse_version} == 1110
 %define only_efi %{nil}
@@ -214,7 +223,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?only_x86_64:1}
 ExclusiveArch:  x86_64
 %else
-ExclusiveArch:  %{ix86} x86_64 ppc ppc64 ppc64le s390x aarch64
+ExclusiveArch:  %{ix86} x86_64 ppc ppc64 ppc64le s390x aarch64 %{arm}
 %endif
 
 %description
@@ -878,7 +887,7 @@ fi
 %{_libdir}/%{name}/%{grubarch}/grub.chrp
 %{_libdir}/%{name}/%{grubarch}/bootinfo.txt
 %endif
-%ifnarch ppc ppc64 ppc64le s390x
+%ifnarch ppc ppc64 ppc64le s390x %{arm}
 %{_libdir}/%{name}/%{grubarch}/*.image
 %endif
 %{_libdir}/%{name}/%{grubarch}/*.img