summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch46
-rw-r--r--meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb (renamed from meta-filesystems/recipes-filesystems/owfs/owfs_2.9p1.bb)19
2 files changed, 57 insertions, 8 deletions
diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch b/meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch
new file mode 100644
index 000000000..0a990ac68
--- /dev/null
+++ b/meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch
@@ -0,0 +1,46 @@
1From dd1af7541f18399bcdcb129a8b6618c18ebd9d63 Mon Sep 17 00:00:00 2001
2From: Tomasz Torcz <tomek@pipebreaker.pl>
3Date: Sat, 17 Mar 2018 12:56:04 +0100
4Subject: [PATCH] include <sys/sysmacros.h> for major()
5
6 Linux glibc ceased to include it in sys/types.h:
7https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html
8
9Upstream-Status: Backport
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 configure.ac | 2 +-
13 module/owlib/src/include/ow.h | 6 +++++-
14 2 files changed, 6 insertions(+), 2 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index 86751bf7..d625d3f0 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -180,7 +180,7 @@ m4_include([src/scripts/m4/acx_pthread.m4])
21 # Checks for header files.
22 AC_HEADER_DIRENT
23 AC_HEADER_STDC
24-AC_CHECK_HEADERS([asm/types.h arpa/inet.h sys/ioctl.h sys/mkdev.h sys/socket.h sys/time.h sys/times.h sys/types.h sys/param.h sys/uio.h feature_tests.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/file.h syslog.h termios.h unistd.h limits.h stdint.h features.h getopt.h resolv.h semaphore.h])
25+AC_CHECK_HEADERS([asm/types.h arpa/inet.h sys/ioctl.h sys/mkdev.h sys/socket.h sys/sysmacros.h sys/time.h sys/times.h sys/types.h sys/param.h sys/uio.h feature_tests.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/file.h syslog.h termios.h unistd.h limits.h stdint.h features.h getopt.h resolv.h semaphore.h])
26 AC_CHECK_HEADERS([linux/limits.h linux/types.h netdb.h dlfcn.h])
27 AC_CHECK_HEADERS(sys/event.h sys/inotify.h)
28
29diff --git a/module/owlib/src/include/ow.h b/module/owlib/src/include/ow.h
30index 9dbec5f3..0a310552 100644
31--- a/module/owlib/src/include/ow.h
32+++ b/module/owlib/src/include/ow.h
33@@ -188,8 +188,12 @@
34 #include <netdb.h> /* for getaddrinfo */
35 #endif /* HAVE_NETDB_H */
36
37+#ifdef HAVE_SYS_SYSMACROS_H
38+#include <sys/sysmacros.h> /* for major() */
39+#endif /* HAVE_SYS_SYSMACROS_H */
40+
41 #ifdef HAVE_SYS_MKDEV_H
42-#include <sys/mkdev.h> /* for major() */
43+#include <sys/mkdev.h> /* for major() on Solaris */
44 #endif /* HAVE_SYS_MKDEV_H */
45
46 #include <stddef.h> // for offsetof()
diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs_2.9p1.bb b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb
index 21fd7e93e..50865cccd 100644
--- a/meta-filesystems/recipes-filesystems/owfs/owfs_2.9p1.bb
+++ b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb
@@ -4,18 +4,21 @@ HOMEPAGE = "http://www.owfs.org/"
4SECTION = "console/network" 4SECTION = "console/network"
5 5
6LICENSE = "GPLv2 & LGPLv2" 6LICENSE = "GPLv2 & LGPLv2"
7LIC_FILES_CHKSUM = "file://COPYING;md5=a0bc427f423a41220ab79a0b392218bd \ 7LIC_FILES_CHKSUM = "file://COPYING;md5=12a64df1cc87275e940cab05ee75c37d \
8 file://COPYING.LIB;md5=865c4bd642d9e04f43925ad7e929ae87" 8 file://COPYING.LIB;md5=16ff3ffebed582e19ea7a4f48ec77b42"
9 9
10DEPENDS = "fuse virtual/libusb0" 10DEPENDS = "fuse virtual/libusb0"
11 11# v3.2p2
12SRC_URI = "${SOURCEFORGE_MIRROR}/owfs/owfs-${PV}.tar.gz \ 12SRCREV = "93c1f36d9ac481075287da331d5184f590f8c0fa"
13SRC_URI = "git://github.com/owfs/owfs \
13 file://owhttpd \ 14 file://owhttpd \
14 file://owserver " 15 file://owserver \
15SRC_URI[md5sum] = "56ba145be208002e58775a7203369851" 16 file://0001-include-sys-sysmacros.h-for-major.patch \
16SRC_URI[sha256sum] = "9d22dbff72d235476688c02669f7171b23e21dffadf40bbdd3b8263908218424" 17 "
18
19S = "${WORKDIR}/git"
17 20
18inherit autotools-brokensep update-rc.d 21inherit autotools-brokensep update-rc.d pkgconfig
19 22
20EXTRA_OECONF = " \ 23EXTRA_OECONF = " \
21 --with-fuseinclude=${STAGING_INCDIR} \ 24 --with-fuseinclude=${STAGING_INCDIR} \