Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4210 from ertugerata/uefi_support

Browse Source 
fwupdate-9
This commit is contained in:
Ertuğrul Erata
2017-12-12 18:44:49 +00:00
committed by GitHub
parent 5d9d636d87 8d464b2a33
commit 5a2cecf879
8 changed files with 274 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi-index.xml
+108 -14
View File
@@ -11168,6 +11168,8 @@
<Dependency>libXtst-devel</Dependency>
<Dependency>libICE-devel</Dependency>
<Dependency>libXrandr-devel</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency>mesa-glu-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">sdl-1.2.14-disable-mmx.patch</Patch>
@@ -11208,7 +11210,7 @@
<Summary xml:lang="en">Development files for libsdl</Summary>
<Summary xml:lang="tr">libsdl için geliştirme dosyaları</Summary>
<RuntimeDependencies>
<Dependency release="4">libsdl</Dependency>
<Dependency release="5">libsdl</Dependency>
<Dependency versionFrom="1.7.1">DirectFB-devel</Dependency>
<Dependency>alsa-lib-devel</Dependency>
<Dependency>aalib-devel</Dependency>
@@ -11234,13 +11236,20 @@
<PartOf>emul32</PartOf>
<BuildType>emul32</BuildType>
<RuntimeDependencies>
<Dependency release="4">libsdl</Dependency>
<Dependency release="5">libsdl</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32</Path>
</Files>
</Package>
<History>
<Update release="5">
<Date>2017-12-12</Date>
<Version>1.2.15</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="4">
<Date>2017-02-16</Date>
<Version>1.2.15</Version>
@@ -11946,12 +11955,15 @@
<Description xml:lang="tr">libsdl; ses, klavye, fare, oyun çubuğu, OpenGL ile 3B donanımsal hızlandırma, 2B görüntü belleğine direkt erişim sağlayan birden çok platform destekleyen bir çokluortam kitaplığıdır.</Description>
<Archive type="targz" sha1sum="c4f87580630387796df4ac87c362b4f9a721457e">http://www.libsdl.org/release/SDL2-2.0.5.tar.gz</Archive>
<BuildDependencies>
<Dependency>dbus-devel</Dependency>
<Dependency>ibus-devel</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency>libXv-devel</Dependency>
<Dependency>libXt-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libXext-devel</Dependency>
<Dependency>DirectFB-devel</Dependency>
<Dependency>mesa-glu-devel</Dependency>
<Dependency>alsa-lib-devel</Dependency>
<Dependency>audiofile-devel</Dependency>
<Dependency>libXrandr-devel</Dependency>
@@ -11966,7 +11978,7 @@
<Summary xml:lang="en">libsdl2 reference documents</Summary>
<Summary xml:lang="tr">libsdl2 başvuru belgeleri</Summary>
<RuntimeDependencies>
<Dependency release="3">libsdl2</Dependency>
<Dependency release="4">libsdl2</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="man">/usr/share/man</Path>
@@ -11998,7 +12010,7 @@
<Summary xml:lang="en">Development files for libsdl2</Summary>
<Summary xml:lang="tr">libsdl2 için geliştirme dosyaları</Summary>
<RuntimeDependencies>
<Dependency release="3">libsdl2</Dependency>
<Dependency release="4">libsdl2</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
@@ -12042,13 +12054,20 @@
<Dependency>libXScrnSaver-32bit</Dependency>
<Dependency>libXScrnSaver-32bit</Dependency>
<Dependency>pulseaudio-libs-32bit</Dependency>
<Dependency release="3">libsdl2</Dependency>
<Dependency release="4">libsdl2</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32</Path>
</Files>
</Package>
<History>
<Update release="4">
<Date>2017-12-12</Date>
<Version>2.0.5</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="3">
<Date>2017-02-16</Date>
<Version>2.0.5</Version>
@@ -27997,6 +28016,67 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
</Update>
</History>
</SpecFile>
<SpecFile>
<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>
<PartOf>util.admin</PartOf>
<Summary xml:lang="en">Tools for using the ESRT and UpdateCapsule() to apply firmware updates</Summary>
<Description xml:lang="en">Tools for using the ESRT and UpdateCapsule() to apply firmware updates</Description>
<Archive type="targz" sha1sum="68873b972eff83c360d8e50d0214e354d881f272">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>
<SourceURI>util/admin/fwupdate/pspec.xml</SourceURI>
</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="1">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>
</SpecFile>
<SpecFile>
<Source>
<Name>systemtap</Name>
@@ -34597,11 +34677,18 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
<Package>
<Name>xmoto</Name>
<RuntimeDependencies>
<Dependency>curl</Dependency>
<Dependency>zlib</Dependency>
<Dependency>bzip2</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libpng</Dependency>
<Dependency>sqlite</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>libsdl</Dependency>
<Dependency>sdl-mixer</Dependency>
<Dependency>sdl-ttf</Dependency>
<Dependency>sdl-net</Dependency>
<Dependency>lua</Dependency>
<Dependency>lua51</Dependency>
<Dependency>ode</Dependency>
<Dependency>mesa</Dependency>
<Dependency>mesa-glu</Dependency>
@@ -146797,13 +146884,13 @@ It supports email, address books, calendars, tasks, news feeds and much more.</D
<Dependency>libgcc</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/usr/local/etc</Path>
<Path fileType="library">/usr/share</Path>
<Path fileType="library">/usr/local/lib</Path>
<Path fileType="config">/etc</Path>
<Path fileType="executable">/usr/sbin</Path>
<Path fileType="executable">/usr/local/sbin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="localedata">/usr/local/share</Path>
<Path fileType="man">/usr/share/man/man3</Path>
<Path fileType="data">/usr/share/smbios-utils</Path>
<Path fileType="localedata">/usr/share/locale</Path>
</Files>
</Package>
<Package>
@@ -146811,15 +146898,22 @@ It supports email, address books, calendars, tasks, news feeds and much more.</D
<Summary xml:lang="en">Development files for libsmbios</Summary>
<Summary xml:lang="tr">libsmbios için geliştirme dosyaları</Summary>
<RuntimeDependencies>
<Dependency release="3">libsmbios</Dependency>
<Dependency release="4">libsmbios</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/smbios</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
<Path fileType="man">/usr/share/man/man3</Path>
<Path fileType="header">/usr/include/smbios_c</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<History>
<Update release="4">
<Date>2017-12-11</Date>
<Version>2.3.3</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="3">
<Date>2017-04-29</Date>
<Version>2.3.3</Version>
pisi-index.xml.sha1sum
+1 -1
View File
@@ -1 +1 @@
9e2e78fdf06d1186664c9d809d7212afc36a7fbc
2e9afd2d33957da6f3bf61242f3bd74a4337893a
pisi-index.xml.xz
BIN
View File
Binary file not shown.
pisi-index.xml.xz.sha1sum
+1 -1
View File
@@ -1 +1 @@
ab338f3f20d3b8dfcbbf303d5905984a2bcf2fb9
3bd0bdc6bfca3a7b4592daa75ba3aa7f784160e1
util/admin/fwupdate/actions.py
+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")
util/admin/fwupdate/files/build.patch
+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 \
util/admin/fwupdate/files/fwupdate-9-objcopy_detection.patch
+45
View File
@@ -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
util/admin/fwupdate/pspec.xml
+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>