summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-12-10 13:57:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-16 12:12:17 +0000
commit5d32aebe36281790e43af5434fb7eb4137d7d05d (patch)
tree2597f903bd0acd63a2e4a10b1fa7989fbc39259e
parent4e653b52125d0979504f873ce829e1c8681518cf (diff)
downloadpoky-5d32aebe36281790e43af5434fb7eb4137d7d05d.tar.gz
unfs3: update to r497
Drop fix_warnings.patch as it's been merged upstream. (From OE-Core rev: 8c1f4cbb789a5b32c8b33b3863359897f32bd49d) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/unfs3/unfs3/fix_warnings.patch53
-rw-r--r--meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb (renamed from meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb)11
2 files changed, 5 insertions, 59 deletions
diff --git a/meta/recipes-devtools/unfs3/unfs3/fix_warnings.patch b/meta/recipes-devtools/unfs3/unfs3/fix_warnings.patch
deleted file mode 100644
index cda8655b96..0000000000
--- a/meta/recipes-devtools/unfs3/unfs3/fix_warnings.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1exports.*: fix warnings.
2
3Fix these warnings:
4lex.yy.c:1207: warning: 'yyunput' defined but not used
5lex.yy.c:1248: warning: 'input' defined but not used
6exports.y: In function 'set_hostname':
7exports.y:334: warning: large integer implicitly truncated to unsigned type
8exports.y: In function 'set_ipaddr':
9exports.y:350: warning: large integer implicitly truncated to unsigned type
10
11Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
12
13Upstream-Status: Submitted http://sourceforge.net/p/unfs3/bugs/5/
14
15---
16 Config/exports.l | 3 +++
17 Config/exports.y | 6 ++++--
18 2 files changed, 7 insertions(+), 2 deletions(-)
19
20--- a/Config/exports.l
21+++ b/Config/exports.l
22@@ -48,6 +48,9 @@ NETCOMP [0-9]{1,2}
23 NET {IP}"/"{NETCOMP}
24 OLDNET {IP}"/"{IP}
25
26+%option nounput
27+%option noinput
28+
29 %%
30
31 ^{WHITE}*\n { /* eat empty line */ }
32--- a/Config/exports.y
33+++ b/Config/exports.y
34@@ -331,7 +331,8 @@ static void set_hostname(const char *nam
35 if (ent) {
36 memcpy(&cur_host.addr, ent->h_addr_list[0],
37 sizeof(struct in_addr));
38- cur_host.mask.s_addr = ~0UL;
39+ cur_host.mask.s_addr = 0;
40+ cur_host.mask.s_addr = ~cur_host.mask.s_addr;
41 } else {
42 logmsg(LOG_CRIT, "could not resolve hostname '%s'", name);
43 e_error = TRUE;
44@@ -347,7 +348,8 @@ static void set_ipaddr(const char *addr)
45
46 if (!inet_aton(addr, &cur_host.addr))
47 e_error = TRUE;
48- cur_host.mask.s_addr = ~0UL;
49+ cur_host.mask.s_addr = 0;
50+ cur_host.mask.s_addr = ~cur_host.mask.s_addr;
51 }
52
53 /*
diff --git a/meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb b/meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb
index 51308955dd..7e9d659671 100644
--- a/meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb
+++ b/meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb
@@ -4,9 +4,9 @@ LICENSE = "unfs3"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=9475885294e17c0cc0067820d042792e" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=9475885294e17c0cc0067820d042792e"
5 5
6# SVN support for upstream version check isn't implemented yet 6# SVN support for upstream version check isn't implemented yet
7RECIPE_UPSTREAM_VERSION = "0.9.22.r495" 7RECIPE_UPSTREAM_VERSION = "0.9.22.r497"
8RECIPE_UPSTREAM_DATE = "Feb 05, 2015" 8RECIPE_UPSTREAM_DATE = "Oct 08, 2015"
9CHECK_DATE = "Jun 10, 2015" 9CHECK_DATE = "Dec 10, 2015"
10 10
11DEPENDS = "flex-native bison-native flex" 11DEPENDS = "flex-native bison-native flex"
12DEPENDS_append_class-nativesdk += "flex-nativesdk" 12DEPENDS_append_class-nativesdk += "flex-nativesdk"
@@ -14,16 +14,15 @@ DEPENDS_append_class-nativesdk += "flex-nativesdk"
14SRC_URI[md5sum] = "3687acc4ee992e536472365dd99712a7" 14SRC_URI[md5sum] = "3687acc4ee992e536472365dd99712a7"
15SRC_URI[sha256sum] = "274b43ada9c6eea1da26eb7010d72889c5278984ba0b50dff4e093057d4d64f8" 15SRC_URI[sha256sum] = "274b43ada9c6eea1da26eb7010d72889c5278984ba0b50dff4e093057d4d64f8"
16 16
17MOD_PV = "490" 17MOD_PV = "497"
18S = "${WORKDIR}/trunk" 18S = "${WORKDIR}/trunk"
19SRC_URI = "svn://svn.code.sf.net/p/unfs3/code;module=trunk;rev=${MOD_PV} \ 19SRC_URI = "svn://svn.code.sf.net/p/unfs3/code;module=trunk;rev=${MOD_PV};protocol=http \
20 file://unfs3_parallel_build.patch \ 20 file://unfs3_parallel_build.patch \
21 file://alternate_rpc_ports.patch \ 21 file://alternate_rpc_ports.patch \
22 file://fix_pid_race_parent_writes_child_pid.patch \ 22 file://fix_pid_race_parent_writes_child_pid.patch \
23 file://fix_compile_warning.patch \ 23 file://fix_compile_warning.patch \
24 file://rename_fh_cache.patch \ 24 file://rename_fh_cache.patch \
25 file://relative_max_socket_path_len.patch \ 25 file://relative_max_socket_path_len.patch \
26 file://fix_warnings.patch \
27 file://tcp_no_delay.patch \ 26 file://tcp_no_delay.patch \
28 " 27 "
29BBCLASSEXTEND = "native nativesdk" 28BBCLASSEXTEND = "native nativesdk"