diff options
author | Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | 2019-10-26 03:44:45 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-10-26 02:41:33 -0700 |
commit | e8e6519f8634928f062589cf75a8d7a7779247ca (patch) | |
tree | 4e7f98df5279cb4b2e67ef3db3552ddc1e239c60 /meta-filesystems | |
parent | fe6a574803ad60669b5f5f9b33581cf5593da93b (diff) | |
download | meta-openembedded-e8e6519f8634928f062589cf75a8d7a7779247ca.tar.gz |
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>
Diffstat (limited to 'meta-filesystems')
-rw-r--r-- | meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch | 25 | ||||
-rw-r--r-- | meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch | 46 | ||||
-rw-r--r-- | meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb (renamed from meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb) | 10 |
3 files changed, 30 insertions, 51 deletions
diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch b/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch new file mode 100644 index 000000000..e4d52a802 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Add-build-rule-for-README.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From dfeadd4eb43e829aafb0d10f611fa22ae81bfca4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | ||
3 | Date: Sun, 20 Oct 2019 17:00:45 +0900 | ||
4 | Subject: [PATCH] Add build rule for README. | ||
5 | |||
6 | fix do_configure error: | ||
7 | Makefile.am: required file `./README' not found | ||
8 | |||
9 | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | ||
10 | --- | ||
11 | Makefile.am | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/Makefile.am b/Makefile.am | ||
15 | index e0c4ad6..0449321 100644 | ||
16 | --- a/Makefile.am | ||
17 | +++ b/Makefile.am | ||
18 | @@ -35,3 +35,4 @@ rpmcvs: preparerpm | ||
19 | @LN_S@ -f `pwd`/@PACKAGE@-@VERSION@.tar.gz ${RPMDIR}/SOURCES/@PACKAGE@-@VERSION@_cvs_`date +"%Y%m%d"`.tar.gz | ||
20 | cd ${RPMDIR}/SPECS && @RPMBUILD@ -ba @PACKAGE@.spec --define 'cvs 1' | ||
21 | |||
22 | +README: README.md | ||
23 | -- | ||
24 | 2.7.4 | ||
25 | |||
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 deleted file mode 100644 index 0a990ac68..000000000 --- a/meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From dd1af7541f18399bcdcb129a8b6618c18ebd9d63 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tomasz Torcz <tomek@pipebreaker.pl> | ||
3 | Date: Sat, 17 Mar 2018 12:56:04 +0100 | ||
4 | Subject: [PATCH] include <sys/sysmacros.h> for major() | ||
5 | |||
6 | Linux glibc ceased to include it in sys/types.h: | ||
7 | https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | Signed-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 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 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 | |||
29 | diff --git a/module/owlib/src/include/ow.h b/module/owlib/src/include/ow.h | ||
30 | index 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_3.2p2.bb b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb index 857aaf216..414084449 100644 --- a/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb +++ b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb | |||
@@ -4,16 +4,16 @@ HOMEPAGE = "http://www.owfs.org/" | |||
4 | SECTION = "console/network" | 4 | SECTION = "console/network" |
5 | 5 | ||
6 | LICENSE = "GPLv2 & LGPLv2" | 6 | LICENSE = "GPLv2 & LGPLv2" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=12a64df1cc87275e940cab05ee75c37d \ | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=628b867016631792781a8735a04760e5 \ |
8 | file://COPYING.LIB;md5=16ff3ffebed582e19ea7a4f48ec77b42" | 8 | file://COPYING.LIB;md5=9021b7435efdd9fb22beef8291134099" |
9 | 9 | ||
10 | DEPENDS = "fuse virtual/libusb0" | 10 | DEPENDS = "fuse virtual/libusb0" |
11 | # v3.2p2 | 11 | # v3.2p3 |
12 | SRCREV = "93c1f36d9ac481075287da331d5184f590f8c0fa" | 12 | SRCREV = "3744375dfaa350e31c9b360eb1e1a517bbeb5c47" |
13 | SRC_URI = "git://github.com/owfs/owfs \ | 13 | SRC_URI = "git://github.com/owfs/owfs \ |
14 | file://0001-Add-build-rule-for-README.patch \ | ||
14 | file://owhttpd \ | 15 | file://owhttpd \ |
15 | file://owserver \ | 16 | file://owserver \ |
16 | file://0001-include-sys-sysmacros.h-for-major.patch \ | ||
17 | " | 17 | " |
18 | 18 | ||
19 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |