From c34aa24e3a10b31faa8c6682116e32d959b79072106ec0bbc4121a27248133af Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 4 Dec 2014 09:19:39 +0000 Subject: [PATCH 1/2] Accepting request 263434 from home:Ledest:bashisms 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. OBS-URL: https://build.opensuse.org/request/show/263434 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=128 --- grub2-snapper-plugin.sh | 2 +- grub2.changes | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/grub2-snapper-plugin.sh b/grub2-snapper-plugin.sh index c6203e4..8cb0526 100644 --- a/grub2-snapper-plugin.sh +++ b/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 diff --git a/grub2.changes b/grub2.changes index a7f1131..afa179d 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Nov 29 18:26:00 UTC 2014 - Led + +- 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 From 5adeb450eed27103901f9f0cd14110e8ff8af64099a640c0777dc482d2f16b2b Mon Sep 17 00:00:00 2001 From: Andrei Borzenkov Date: Fri, 5 Dec 2014 06:26:19 +0000 Subject: [PATCH 2/2] Accepting request 263925 from home:algraf:branches:Base:System enable 32bit arm targets for uboot and efi OBS-URL: https://build.opensuse.org/request/show/263925 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=129 --- grub2.changes | 5 +++++ grub2.spec | 15 ++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/grub2.changes b/grub2.changes index afa179d..2265149 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/grub2.spec b/grub2.spec index 589549b..46ae1d4 100644 --- a/grub2.spec +++ b/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