mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
owfs: upgrade 3.2p2 -> 3.2p3
1) Upgrade owfs from 3.2p2 to 3.2p3. 2) Update LIC_FILES_CHKSUM for COPYING and COPYING.LIB as $Id$ has been removed. 3) Remove 0001-include-sys-sysmacros.h-for-major.patch as it has been merged in new version. 4) Add 0001-Add-build-rule-for-README.patch to fix do_configure error: Makefile.am: required file `./README' not found Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -0,0 +1,25 @@
|
|||||||
|
From dfeadd4eb43e829aafb0d10f611fa22ae81bfca4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
|
||||||
|
Date: Sun, 20 Oct 2019 17:00:45 +0900
|
||||||
|
Subject: [PATCH] Add build rule for README.
|
||||||
|
|
||||||
|
fix do_configure error:
|
||||||
|
Makefile.am: required file `./README' not found
|
||||||
|
|
||||||
|
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
|
||||||
|
---
|
||||||
|
Makefile.am | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/Makefile.am b/Makefile.am
|
||||||
|
index e0c4ad6..0449321 100644
|
||||||
|
--- a/Makefile.am
|
||||||
|
+++ b/Makefile.am
|
||||||
|
@@ -35,3 +35,4 @@ rpmcvs: preparerpm
|
||||||
|
@LN_S@ -f `pwd`/@PACKAGE@-@VERSION@.tar.gz ${RPMDIR}/SOURCES/@PACKAGE@-@VERSION@_cvs_`date +"%Y%m%d"`.tar.gz
|
||||||
|
cd ${RPMDIR}/SPECS && @RPMBUILD@ -ba @PACKAGE@.spec --define 'cvs 1'
|
||||||
|
|
||||||
|
+README: README.md
|
||||||
|
--
|
||||||
|
2.7.4
|
||||||
|
|
||||||
-46
@@ -1,46 +0,0 @@
|
|||||||
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()
|
|
||||||
+5
-5
@@ -4,16 +4,16 @@ HOMEPAGE = "http://www.owfs.org/"
|
|||||||
SECTION = "console/network"
|
SECTION = "console/network"
|
||||||
|
|
||||||
LICENSE = "GPLv2 & LGPLv2"
|
LICENSE = "GPLv2 & LGPLv2"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=12a64df1cc87275e940cab05ee75c37d \
|
LIC_FILES_CHKSUM = "file://COPYING;md5=628b867016631792781a8735a04760e5 \
|
||||||
file://COPYING.LIB;md5=16ff3ffebed582e19ea7a4f48ec77b42"
|
file://COPYING.LIB;md5=9021b7435efdd9fb22beef8291134099"
|
||||||
|
|
||||||
DEPENDS = "fuse virtual/libusb0"
|
DEPENDS = "fuse virtual/libusb0"
|
||||||
# v3.2p2
|
# v3.2p3
|
||||||
SRCREV = "93c1f36d9ac481075287da331d5184f590f8c0fa"
|
SRCREV = "3744375dfaa350e31c9b360eb1e1a517bbeb5c47"
|
||||||
SRC_URI = "git://github.com/owfs/owfs \
|
SRC_URI = "git://github.com/owfs/owfs \
|
||||||
|
file://0001-Add-build-rule-for-README.patch \
|
||||||
file://owhttpd \
|
file://owhttpd \
|
||||||
file://owserver \
|
file://owserver \
|
||||||
file://0001-include-sys-sysmacros.h-for-major.patch \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
Reference in New Issue
Block a user