diff options
Diffstat (limited to 'meta-openembedded/meta-filesystems/recipes-filesystems/owfs')
-rw-r--r-- | meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch | 46 | ||||
-rw-r--r-- | meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb (renamed from meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_2.9p1.bb) | 19 |
2 files changed, 57 insertions, 8 deletions
diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch b/meta-openembedded/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-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch @@ -0,0 +1,46 @@ +From dd1af7541f18399bcdcb129a8b6618c18ebd9d63 Mon Sep 17 00:00:00 2001 +From: Tomasz Torcz <tomek@pipebreaker.pl> +Date: Sat, 17 Mar 2018 12:56:04 +0100 +Subject: [PATCH] include <sys/sysmacros.h> for major() + + Linux glibc ceased to include it in sys/types.h: +https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 +- + module/owlib/src/include/ow.h | 6 +++++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 86751bf7..d625d3f0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -180,7 +180,7 @@ m4_include([src/scripts/m4/acx_pthread.m4]) + # Checks for header files. + AC_HEADER_DIRENT + AC_HEADER_STDC +-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]) ++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]) + AC_CHECK_HEADERS([linux/limits.h linux/types.h netdb.h dlfcn.h]) + AC_CHECK_HEADERS(sys/event.h sys/inotify.h) + +diff --git a/module/owlib/src/include/ow.h b/module/owlib/src/include/ow.h +index 9dbec5f3..0a310552 100644 +--- a/module/owlib/src/include/ow.h ++++ b/module/owlib/src/include/ow.h +@@ -188,8 +188,12 @@ + #include <netdb.h> /* for getaddrinfo */ + #endif /* HAVE_NETDB_H */ + ++#ifdef HAVE_SYS_SYSMACROS_H ++#include <sys/sysmacros.h> /* for major() */ ++#endif /* HAVE_SYS_SYSMACROS_H */ ++ + #ifdef HAVE_SYS_MKDEV_H +-#include <sys/mkdev.h> /* for major() */ ++#include <sys/mkdev.h> /* for major() on Solaris */ + #endif /* HAVE_SYS_MKDEV_H */ + + #include <stddef.h> // for offsetof() diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_2.9p1.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb index 21fd7e93e..50865cccd 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_2.9p1.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb @@ -4,18 +4,21 @@ HOMEPAGE = "http://www.owfs.org/" SECTION = "console/network" LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=a0bc427f423a41220ab79a0b392218bd \ - file://COPYING.LIB;md5=865c4bd642d9e04f43925ad7e929ae87" +LIC_FILES_CHKSUM = "file://COPYING;md5=12a64df1cc87275e940cab05ee75c37d \ + file://COPYING.LIB;md5=16ff3ffebed582e19ea7a4f48ec77b42" DEPENDS = "fuse virtual/libusb0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/owfs/owfs-${PV}.tar.gz \ +# v3.2p2 +SRCREV = "93c1f36d9ac481075287da331d5184f590f8c0fa" +SRC_URI = "git://github.com/owfs/owfs \ file://owhttpd \ - file://owserver " -SRC_URI[md5sum] = "56ba145be208002e58775a7203369851" -SRC_URI[sha256sum] = "9d22dbff72d235476688c02669f7171b23e21dffadf40bbdd3b8263908218424" + file://owserver \ + file://0001-include-sys-sysmacros.h-for-major.patch \ + " + +S = "${WORKDIR}/git" -inherit autotools-brokensep update-rc.d +inherit autotools-brokensep update-rc.d pkgconfig EXTRA_OECONF = " \ --with-fuseinclude=${STAGING_INCDIR} \ |