This commit is contained in:
Ertuğrul Erata
2017-12-12 19:09:13 +03:00
parent 6576435afa
commit bc45a7e7b4
4 changed files with 164 additions and 0 deletions
+33
View File
@@ -0,0 +1,33 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Copyright 2017 TUBITAK/UEKAE
# Licensed under the GNU General Public License, version 2.
# See the file http://www.gnu.org/copyleft/gpl.txt.
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
# WorkDir = ""
# NoStrip = "/"
#def setup():
# shelltools.system("sed 's@ -Werror\([[:space:]]\|\n\)@\1@' -i linux/Makefile")
def build():
autotools.make("V=1 EFIDIR=org.pisilinux GNUEFIDIR=/usr/lib")
def install():
pisitools.dodir("/usr/include")
autotools.rawInstall("LIBDIR=/usr/lib libexecdir=/usr/lib/ EFIDIR=org.pisilinux GNUEFIDIR=/usr/lib DESTDIR=%s" % get.installDIR())
pisitools.domove("/boot/efi/EFI", "/usr/lib/fwupdate/EFI")
pisitools.removeDir("/boot")
pisitools.removeDir("/usr/lib/debug")
pisitools.removeDir("/usr/src")
pisitools.removeDir("/usr/share/fwupdate")
#pisitools.dodoc("AUTHORS", "ChangeLog", "README*", "NEWS")
+22
View File
@@ -0,0 +1,22 @@
--- fwupdate-9/efi/Makefile~ 2017-03-06 20:36:55.000000000 +0000
+++ fwupdate-9/efi/Makefile 2017-05-12 18:10:02.737950709 +0000
@@ -14,7 +14,7 @@
-Wl,--no-undefined -Wl,--fatal-warnings \
-Wl,-shared -Wl,-Bsymbolic -L$(LIBDIR) -L$(GNUEFIDIR) \
-Wl,--build-id=sha1 -Wl,--hash-style=sysv \
- $(GNUEFIDIR)/crt0-efi-$(ARCH).o
+ $(GNUEFIDIR)/crt0-efi-$(ARCH).o
OBJCOPY_GTE224 = $(shell expr `$(OBJCOPY) --version |grep ^"GNU objcopy" | sed 's/^[^0-9]*//g' | cut -f1-2 -d.` \>= 2.24)
FWUP = fwupdate
--- fwupdate-9/linux/Makefile~ 2017-03-06 20:36:55.000000000 +0000
+++ fwupdate-9/linux/Makefile 2017-05-12 20:39:51.049592296 +0000
@@ -29,7 +29,7 @@
PKLIBS += libsmbios_c
CFLAGS += -DFWUPDATE_HAVE_LIBSMBIOS__
endif
-BUILDFLAGS := $(CFLAGS) -Wall -Wextra -Werror -Wno-error=cpp \
+BUILDFLAGS := $(CFLAGS) -Wall -Wextra -Wno-error=cpp \
-Wno-unused-result -Wno-unused-function \
-Wsign-compare -Werror=sign-compare \
-fshort-wchar --std=gnu11 \
@@ -0,0 +1,45 @@
From affc219a5bac93cb6e774879c874c203f755ba11 Mon Sep 17 00:00:00 2001
From: Raymund Will <rw@suse.com>
Date: Mon, 13 Mar 2017 12:57:07 +0100
Subject: [PATCH] Fix regression in "objcopy version check" (AKA `expr: syntax
error`)
While commit 8418fee4 may have fixed the check for "some distributions"
it broke the same check for others, like
`GNU objcopy (WinAVR 20090313) 2.19`
`GNU objcopy (AVR_8_bit_GNU_Toolchain_3.4.3_1072) 2.23.2`
`GNU objcopy (Codescape GNU Tools 2016.05-03 for MIPS MTI Bare Metal) 2.24.90`
`GNU objcopy (GNU Binutils; openSUSE Leap 42.2) 2.26.1`
`GNU objcopy (GNU Binutils; SUSE Linux Enterprise 12) 2.26.1`
(some more, some less relevant... ;)
This version is meant to cover them all (or at least be easily extensible).
Signed-off-by: Raymund Will <rw@suse.com>
---
efi/Makefile | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/efi/Makefile b/efi/Makefile
index 920c096..faf8ee2 100644
--- a/efi/Makefile
+++ b/efi/Makefile
@@ -15,7 +15,15 @@ CCLDFLAGS ?= -nostdlib -Wl,--warn-common \
-Wl,-shared -Wl,-Bsymbolic -L$(LIBDIR) -L$(GNUEFIDIR) \
-Wl,--build-id=sha1 -Wl,--hash-style=sysv \
$(GNUEFIDIR)/crt0-efi-$(ARCH).o
-OBJCOPY_GTE224 = $(shell expr `$(OBJCOPY) --version |grep ^"GNU objcopy" | sed 's/^[^0-9]*//g' | cut -f1-2 -d.` \>= 2.24)
+
+define objcopy_version =
+ $(OBJCOPY) --version |
+ sed -e '/^GNU objcopy/! d;
+ : loop1; s/([^)(]*)//g; t loop1;
+ : loop2; s/\[[^][]*\]//g; t loop2;
+ s/.* \([0-9][0-9]*\.[0-9][0-9]*\).*/\1/;'
+endef
+OBJCOPY_GTE224 := $(shell expr `$(objcopy_version)` \>= 2.24)
FWUP = fwupdate
+64
View File
@@ -0,0 +1,64 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pardus.org.tr/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>fwupdate</Name>
<Homepage>https://github.com/rhinstaller/fwupdate</Homepage>
<Packager>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Packager>
<License>GPLv2</License>
<IsA>app:console</IsA>
<Summary>Tools for using the ESRT and UpdateCapsule() to apply firmware updates</Summary>
<Description>Tools for using the ESRT and UpdateCapsule() to apply firmware updates</Description>
<Archive sha1sum="68873b972eff83c360d8e50d0214e354d881f272" type="targz">https://github.com/rhboot/fwupdate/archive/9.tar.gz</Archive>
<BuildDependencies>
<Dependency>gnu-efi</Dependency>
<Dependency>efivar-devel</Dependency>
<Dependency>popt-devel</Dependency>
<Dependency>libsmbios-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">build.patch</Patch>
<Patch level="1">fwupdate-9-objcopy_detection.patch</Patch>
</Patches>
</Source>
<Package>
<Name>fwupdate</Name>
<RuntimeDependencies>
<Dependency>popt</Dependency>
<Dependency>efivar</Dependency>
<Dependency>libsmbios</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="data">/usr/share/bash-completion</Path>
<Path fileType="localedata">/usr/share/locale</Path>
</Files>
</Package>
<Package>
<Name>fwupdate-devel</Name>
<RuntimeDependencies>
<Dependency release="current">fwupdate</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2017-12-11</Date>
<Version>9</Version>
<Comment>First release</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
</History>
</PISI>