rpm/elilo
SHA256
1
0
Fork 0
forked from pool/elilo
Code Pull Requests Activity

Accepting request 868937 from home:marxin:branches:Base:System

Browse Source 
- Add elilo-binutils-2.36-fix.patch in order to fix build
  with binutils 2.36.

OBS-URL: https://build.opensuse.org/request/show/868937
OBS-URL: https://build.opensuse.org/package/show/Base:System/elilo?expand=0&rev=20
This commit is contained in:
Raymund Will 2021-02-17 12:14:21 +00:00 committed by Git OBS Bridge
parent 5048a757ed
commit 82432966e4
3 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
elilo-binutils-2.36-fix.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git a/ia32/Makefile b/ia32/Makefile
index 46609c4..078efc9 100644
--- a/ia32/Makefile
+++ b/ia32/Makefile
@@ -43,7 +43,7 @@ system.o: rmswitch.h
rmswitch.h: bin_to_h.c rmswitch.S
$(CC) $(OPTIMFLAGS) -o bin_to_h $(SRCDIR)/bin_to_h.c
- $(AS) -o rmswitch.o $(SRCDIR)/rmswitch.S
+ $(AS) -mx86-used-note=no -o rmswitch.o $(SRCDIR)/rmswitch.S
$(LD) -Ttext 0x0 -s --oformat binary -o rmswitch rmswitch.o
./bin_to_h <rmswitch >rmswitch.h
diff --git a/x86_64/Makefile b/x86_64/Makefile
index e7c81f8..a3f2411 100644
--- a/x86_64/Makefile
+++ b/x86_64/Makefile
@@ -44,7 +44,7 @@ system.o: rmswitch.h
rmswitch.h: bin_to_h.c rmswitch.S
$(CC) $(OPTIMFLAGS) -o bin_to_h $(SRCDIR)/bin_to_h.c
- $(AS) -o rmswitch.o $(SRCDIR)/rmswitch.S
+ $(AS) -mx86-used-note=no -o rmswitch.o $(SRCDIR)/rmswitch.S
$(LD) -Ttext 0x0 -s --oformat binary -o rmswitch rmswitch.o
./bin_to_h <rmswitch >rmswitch.h

6
elilo.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Feb 3 12:32:12 UTC 2021 - Martin Liška <mliska@suse.cz>
- Add elilo-binutils-2.36-fix.patch in order to fix build
with binutils 2.36.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 23 14:29:41 UTC 2018 - rw@suse.com Fri Nov 23 14:29:41 UTC 2018 - rw@suse.com

10
elilo.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package elilo # spec file for package elilo
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2021 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -28,7 +28,7 @@ BuildRequires: perl(Pod::Man)
Name: elilo Name: elilo
Summary: EFI Linux Loader Summary: EFI Linux Loader
License: GPL-2.0+ License: GPL-2.0-or-later
Group: System/Boot Group: System/Boot
Version: 3.16 Version: 3.16
Release: 0 Release: 0
@ -39,7 +39,7 @@ PreReq: /usr/bin/perl perl(Pod::Usage) perl(Getopt::Long)
%ifarch ia64 %ifarch ia64
PreReq: perl(File::Compare) PreReq: perl(File::Compare)
%endif %endif
Url: http://elilo.sourceforge.net/ URL: http://elilo.sourceforge.net/
#ource: http://downloads.sourceforge.net/elilo/elilo-3.16-all.tar.gz #ource: http://downloads.sourceforge.net/elilo/elilo-3.16-all.tar.gz
Source: elilo-%{version}-source.tar.xz Source: elilo-%{version}-source.tar.xz
Source1: elilo.pl Source1: elilo.pl
@ -57,6 +57,7 @@ Patch6: elilo-textmenu-disable-print-devices.diff
Patch7: elilo-high_base_mem.diff Patch7: elilo-high_base_mem.diff
Patch10: elilo-de-debianify.diff Patch10: elilo-de-debianify.diff
Patch11: eliloalt-no-date.diff Patch11: eliloalt-no-date.diff
Patch12: elilo-binutils-2.36-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -75,6 +76,7 @@ The EFI Linux boot loader.
%patch7 -p1 %patch7 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1 %patch11 -p1
%patch12 -p1
# work around b0rked 'Str'-ops in newer 'gnu-efi' ... :-( # work around b0rked 'Str'-ops in newer 'gnu-efi' ... :-(
find . -type f -name '*.[ch]' -print0 | xargs -0rn 1 \ find . -type f -name '*.[ch]' -print0 | xargs -0rn 1 \
perl -pi -e 's{Str(Chr|n(X?Cpy|Cat))}{eliloStr$1}g' perl -pi -e 's{Str(Chr|n(X?Cpy|Cat))}{eliloStr$1}g'