Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2011-12-30 08:45:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2011-12-25 17:34:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2011-12-30 08:45:42.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Dec 29 02:31:23 UTC 2011 - [email protected] + +- set --target=%{_target_plaform) explicitly to %configure in case + it wouldn't do that for us implicitly +- when making x86_64-efi image not use i386 target build and keep + use of x86_64. otherwise it would have error "invalid ELF header" + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.lYsLWK/_old 2011-12-30 08:45:43.000000000 +0100 +++ /var/tmp/diff_new_pack.lYsLWK/_new 2011-12-30 08:45:43.000000000 +0100 @@ -44,11 +44,6 @@ # Modules always contain just 32-bit code %define _libdir %{_exec_prefix}/lib -# 64-bit x86-64 machines use 32-bit boot loader -# (We cannot just redefine _target_cpu, as we'd get i386.rpm packages then) -%ifarch x86_64 -%define _target_platform i386-%{_vendor}-%{_target_os}%{?_gnu} -%endif %ifarch ppc ppc64 %define platform ieee1275 %else @@ -149,6 +144,7 @@ export CFLAGS CXXFLAGS FFLAGS %configure \ TARGET_LDFLAGS=-static \ + --target=%{_target_platform} \ --with-platform=efi \ --program-transform-name=s,grub,%{name}-efi, make %{?_smp_mflags} @@ -171,9 +167,16 @@ FFLAGS=" " export CFLAGS CXXFLAGS FFLAGS +# 64-bit x86-64 machines use 32-bit boot loader +# (We cannot just redefine _target_cpu, as we'd get i386.rpm packages then) +%ifarch x86_64 +%define _target_platform i386-%{_vendor}-%{_target_os}%{?_gnu} +%endif + # -static is needed so that autoconf script is able to link # test that looks for _start symbol on 64 bit platforms %configure TARGET_LDFLAGS=-static \ + --target=%{_target_platform} \ --with-platform=%{platform} \ --enable-grub-emu-usb \ --program-transform-name=s,grub,%{name}, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
