logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: f45e57f9bd216739fb3c425a1aefbca4386c0a52
parent 4b0940f00be478f10538bbfeb6fc0f237461b0b9
Author: Michael Forney <mforney@mforney.org>
Date:   Tue,  6 Aug 2019 20:16:30 -0700

syslinux: Include sys/sysmacros.h when necessary

Diffstat:

Apkg/syslinux/patch/0001-extlinux-pull-in-sys-sysmacros.h-for-major-minor-mak.patch33+++++++++++++++++++++++++++++++++
Mpkg/syslinux/ver2+-
2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/pkg/syslinux/patch/0001-extlinux-pull-in-sys-sysmacros.h-for-major-minor-mak.patch b/pkg/syslinux/patch/0001-extlinux-pull-in-sys-sysmacros.h-for-major-minor-mak.patch @@ -0,0 +1,33 @@ +From a46f0d695cea1e237247aa6118d5959f0e79e695 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 09740bd7..4967a306 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.22.0 + diff --git a/pkg/syslinux/ver b/pkg/syslinux/ver @@ -1 +1 @@ -6.03 r0 +6.03 r1