Accepting request 639400 from home:Andreas_Schwab:Factory

- sysmacros.patch: include <sys/sysmacros.h> for major/minor

OBS-URL: https://build.opensuse.org/request/show/639400
OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=95

syslinux.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug  6 07:35:52 UTC 2018 - schwab@suse.de
+
+- sysmacros.patch: include <sys/sysmacros.h> for major/minor
+
 -------------------------------------------------------------------
 Thu Jan 18 12:57:04 CET 2018 - snwint@suse.de
 

syslinux.spec

@@ -30,7 +30,7 @@ BuildRequires:  xz
 Url:            http://www.syslinux.org/wiki/index.php/The_Syslinux_Project
 Suggests:       mtools
 Summary:        Boot Loader for Linux
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/Boot
 Version:        4.04
 Release:        0
@@ -59,6 +59,7 @@ Patch18:        %{name}-%{version}-align.diff
 # PATCH-FIX-UPSTREAM -- make package build reproducible
 Patch19:        syslinux-4.04-reproducible.patch
 Patch20:        %{name}-%{version}-python3.diff
+Patch21:        sysmacros.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -95,6 +96,7 @@ Authors:
 %patch18
 %patch19 -p1
 %patch20 -p0
+%patch21 -p1
 
 %build
 cp %{SOURCE2} .

sysmacros.patch

@@ -0,0 +1,33 @@
+From 1a74985b2a404639b08882c57f3147229605dfd5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 19 Apr 2016 06:50:31 -0400
+Subject: [PATCH] extlinux: pull in sys/sysmacros.h for major/minor/makedev
+
+These functions are defined in sys/sysmacros.h, so add the include to
+main.c.  This is already handled correctly in mountinfo.c.  Otherwise
+we get build failures like:
+
+main.o: In function 'find_device_sysfs':
+extlinux/main.c:1131: undefined reference to 'minor'
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
+---
+ extlinux/main.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/extlinux/main.c b/extlinux/main.c
+index a7ebd49a94..ebff7eae0e 100644
+--- a/extlinux/main.c
++++ b/extlinux/main.c
+@@ -38,6 +38,7 @@
+ #include <sysexits.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/mount.h>
+ #include <sys/vfs.h>
+-- 
+2.19.0
+