pool/grub2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 98401 from devel:openSUSE:Factory

Browse Source 
1. set --target=%{_target_plaform) explicitly to %configure in case it wouldn't do that for us implicitly
2. 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" (forwarded request 98397 from michael-chang)

OBS-URL: https://build.opensuse.org/request/show/98401
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=27
This commit is contained in:
Stephan Kulow 2011-12-30 07:45:41 +00:00 committed by Git OBS Bridge
parent 2c853cae15
commit 9bb9d2c66d
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
grub2.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Dec 29 02:31:23 UTC 2011 - mchang@suse.com
- 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"
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 2 16:31:14 UTC 2011 - coolo@suse.com Fri Dec 2 16:31:14 UTC 2011 - coolo@suse.com

13
grub2.spec
View File

@ -44,11 +44,6 @@ BuildRequires: xz
# Modules always contain just 32-bit code # Modules always contain just 32-bit code
%define _libdir %{_exec_prefix}/lib %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 %ifarch ppc ppc64
%define platform ieee1275 %define platform ieee1275
%else %else
@ -149,6 +144,7 @@ FFLAGS=" "
export CFLAGS CXXFLAGS FFLAGS export CFLAGS CXXFLAGS FFLAGS
%configure \ %configure \
TARGET_LDFLAGS=-static \ TARGET_LDFLAGS=-static \
--target=%{_target_platform} \
--with-platform=efi \ --with-platform=efi \
--program-transform-name=s,grub,%{name}-efi, --program-transform-name=s,grub,%{name}-efi,
make %{?_smp_mflags} make %{?_smp_mflags}
@ -171,9 +167,16 @@ CXXFLAGS=" "
FFLAGS=" " FFLAGS=" "
export CFLAGS CXXFLAGS 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 # -static is needed so that autoconf script is able to link
# test that looks for _start symbol on 64 bit platforms # test that looks for _start symbol on 64 bit platforms
%configure TARGET_LDFLAGS=-static \ %configure TARGET_LDFLAGS=-static \
--target=%{_target_platform} \
--with-platform=%{platform} \ --with-platform=%{platform} \
--enable-grub-emu-usb \ --enable-grub-emu-usb \
--program-transform-name=s,grub,%{name}, --program-transform-name=s,grub,%{name},