Accepting request 455620 from home:gary_lin:branches:Base:System

- Add efivar-use-sysmacros.patch to fix the Factory/Tumbleweed
  build correctly.

OBS-URL: https://build.opensuse.org/request/show/455620
OBS-URL: https://build.opensuse.org/package/show/Base:System/efivar?expand=0&rev=23
This commit is contained in:
Gary Ching-Pang Lin 2017-02-09 04:40:38 +00:00 committed by Git OBS Bridge
parent 5fa45300b3
commit 64823aaa08
3 changed files with 33 additions and 2 deletions

View File

@ -0,0 +1,25 @@
From 3ad5aab6ec57b28e62625bf6f3e444b0bcde799a Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 10 Aug 2016 16:47:41 -0400
Subject: [PATCH] libefivar: use sysmacros.h
Signed-off-by: Peter Jones <pjones@redhat.com>
---
src/linux.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/linux.c b/src/linux.c
index 87f2284..7c644ed 100644
--- a/src/linux.c
+++ b/src/linux.c
@@ -31,6 +31,7 @@
#include <stdio.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
+#include <sys/sysmacros.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/stat.h>
--
2.11.0

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 9 04:38:03 UTC 2017 - glin@suse.com
- Add efivar-use-sysmacros.patch to fix the Factory/Tumbleweed
build correctly.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 6 14:40:25 UTC 2017 - rw@suse.com Mon Feb 6 14:40:25 UTC 2017 - rw@suse.com

View File

@ -37,6 +37,7 @@ Url: https://github.com/rhinstaller/efivar
Source0: https://github.com/rhinstaller/efivar/releases/download/%{version}/%{name}-%{version}.tar.bz2 Source0: https://github.com/rhinstaller/efivar/releases/download/%{version}/%{name}-%{version}.tar.bz2
Patch1: efivar-no-static.patch Patch1: efivar-no-static.patch
Patch2: deprecated-readdir_r.patch Patch2: deprecated-readdir_r.patch
Patch3: efivar-use-sysmacros.patch
%if "0%{?buildroot}" == "0" %if "0%{?buildroot}" == "0"
# set a sane value for buildroot, unless it's already there! # set a sane value for buildroot, unless it's already there!
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -71,8 +72,7 @@ Development headers required to use libefivar.
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
# gcc6-update breaks building with -Werror %patch3 -p1
perl -pi -e 's{-Werror}{}' gcc.specs
%if 0%{?suse_version} == 1110 %if 0%{?suse_version} == 1110
# Instead of conditional patching: # Instead of conditional patching:
# - 'popt.pc' missing in 'popt-devel' on SLE11 # - 'popt.pc' missing in 'popt-devel' on SLE11