Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2015-06-05 08:45:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2015-05-23 13:24:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2015-06-05 08:45:34.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 3 20:07:33 UTC 2015 - [email protected] + +- Fix license for setjmp module + * added grub2-arm64-setjmp-Add-missing-license-macro.patch + +------------------------------------------------------------------- New: ---- grub2-arm64-setjmp-Add-missing-license-macro.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.bOa57Q/_old 2015-06-05 08:45:36.000000000 +0200 +++ /var/tmp/diff_new_pack.bOa57Q/_new 2015-06-05 08:45:36.000000000 +0200 @@ -244,6 +244,7 @@ Patch237: grub2-ppc64le-fix-64bit-trampoline-in-dyn-linker.patch Patch238: grub2-arm64-Reduce-timer-event-frequency-by-10.patch Patch239: grub2-arm64-set-correct-length.patch +Patch240: grub2-arm64-setjmp-Add-missing-license-macro.patch Requires: gettext-runtime %if 0%{?suse_version} >= 1140 @@ -486,6 +487,7 @@ %patch237 -p1 %patch238 -p1 %patch239 -p1 +%patch240 -p1 # Generate po/LINGUAS for message catalogs ... ./linguas.sh ++++++ grub2-arm64-setjmp-Add-missing-license-macro.patch ++++++ >From 3ac342205dc81293bb8e2d91b8c5ebe124b4ad35 Mon Sep 17 00:00:00 2001 From: dann frazier <[email protected]> Date: Thu, 21 May 2015 10:28:48 -0600 Subject: [PATCH 1/2] arm64/setjmp: Add missing license macro Including the setjmp module in an arm64-efi image will cause it to immediately exit with an "incompatible license" error. The source file includes a GPLv3+ boilerplate, so fix this by declaring a GPLv3+ license using the GRUB_MOD_LICENSE macro. Signed-off-by: dann frazier <[email protected]> --- grub-core/lib/arm64/setjmp.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/grub-core/lib/arm64/setjmp.S b/grub-core/lib/arm64/setjmp.S index adaafe4..eabfd99 100644 --- a/grub-core/lib/arm64/setjmp.S +++ b/grub-core/lib/arm64/setjmp.S @@ -17,8 +17,10 @@ */ #include <grub/symbol.h> +#include <grub/dl.h> .file "setjmp.S" +GRUB_MOD_LICENSE "GPLv3+" .text /* -- 2.4.1
