From 5d32aebe36281790e43af5434fb7eb4137d7d05d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 10 Dec 2015 13:57:45 +0200 Subject: unfs3: update to r497 Drop fix_warnings.patch as it's been merged upstream. (From OE-Core rev: 8c1f4cbb789a5b32c8b33b3863359897f32bd49d) Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../unfs3/unfs3/fix_warnings.patch | 53 ---------------------- meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb | 37 --------------- meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb | 36 +++++++++++++++ 3 files changed, 36 insertions(+), 90 deletions(-) delete mode 100644 meta/recipes-devtools/unfs3/unfs3/fix_warnings.patch delete mode 100644 meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb create mode 100644 meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb 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 @@ -exports.*: fix warnings. - -Fix these warnings: -lex.yy.c:1207: warning: 'yyunput' defined but not used -lex.yy.c:1248: warning: 'input' defined but not used -exports.y: In function 'set_hostname': -exports.y:334: warning: large integer implicitly truncated to unsigned type -exports.y: In function 'set_ipaddr': -exports.y:350: warning: large integer implicitly truncated to unsigned type - -Signed-off-by: Jason Wessel - -Upstream-Status: Submitted http://sourceforge.net/p/unfs3/bugs/5/ - ---- - Config/exports.l | 3 +++ - Config/exports.y | 6 ++++-- - 2 files changed, 7 insertions(+), 2 deletions(-) - ---- a/Config/exports.l -+++ b/Config/exports.l -@@ -48,6 +48,9 @@ NETCOMP [0-9]{1,2} - NET {IP}"/"{NETCOMP} - OLDNET {IP}"/"{IP} - -+%option nounput -+%option noinput -+ - %% - - ^{WHITE}*\n { /* eat empty line */ } ---- a/Config/exports.y -+++ b/Config/exports.y -@@ -331,7 +331,8 @@ static void set_hostname(const char *nam - if (ent) { - memcpy(&cur_host.addr, ent->h_addr_list[0], - sizeof(struct in_addr)); -- cur_host.mask.s_addr = ~0UL; -+ cur_host.mask.s_addr = 0; -+ cur_host.mask.s_addr = ~cur_host.mask.s_addr; - } else { - logmsg(LOG_CRIT, "could not resolve hostname '%s'", name); - e_error = TRUE; -@@ -347,7 +348,8 @@ static void set_ipaddr(const char *addr) - - if (!inet_aton(addr, &cur_host.addr)) - e_error = TRUE; -- cur_host.mask.s_addr = ~0UL; -+ cur_host.mask.s_addr = 0; -+ cur_host.mask.s_addr = ~cur_host.mask.s_addr; - } - - /* diff --git a/meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb b/meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb deleted file mode 100644 index 51308955dd..0000000000 --- a/meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Userspace NFS server v3 protocol" -SECTION = "console/network" -LICENSE = "unfs3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9475885294e17c0cc0067820d042792e" - -# SVN support for upstream version check isn't implemented yet -RECIPE_UPSTREAM_VERSION = "0.9.22.r495" -RECIPE_UPSTREAM_DATE = "Feb 05, 2015" -CHECK_DATE = "Jun 10, 2015" - -DEPENDS = "flex-native bison-native flex" -DEPENDS_append_class-nativesdk += "flex-nativesdk" - -SRC_URI[md5sum] = "3687acc4ee992e536472365dd99712a7" -SRC_URI[sha256sum] = "274b43ada9c6eea1da26eb7010d72889c5278984ba0b50dff4e093057d4d64f8" - -MOD_PV = "490" -S = "${WORKDIR}/trunk" -SRC_URI = "svn://svn.code.sf.net/p/unfs3/code;module=trunk;rev=${MOD_PV} \ - file://unfs3_parallel_build.patch \ - file://alternate_rpc_ports.patch \ - file://fix_pid_race_parent_writes_child_pid.patch \ - file://fix_compile_warning.patch \ - file://rename_fh_cache.patch \ - file://relative_max_socket_path_len.patch \ - file://fix_warnings.patch \ - file://tcp_no_delay.patch \ - " -BBCLASSEXTEND = "native nativesdk" - -inherit autotools -EXTRA_OECONF_append_class-native = " --sbindir=${bindir}" - -# Turn off these header detects else the inode search -# will walk entire file systems and this is a real problem -# if you have 2 TB of files to walk in your file system -CACHED_CONFIGUREVARS = "ac_cv_header_mntent_h=no ac_cv_header_sys_mnttab_h=no" diff --git a/meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb b/meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb new file mode 100644 index 0000000000..7e9d659671 --- /dev/null +++ b/meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb @@ -0,0 +1,36 @@ +SUMMARY = "Userspace NFS server v3 protocol" +SECTION = "console/network" +LICENSE = "unfs3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9475885294e17c0cc0067820d042792e" + +# SVN support for upstream version check isn't implemented yet +RECIPE_UPSTREAM_VERSION = "0.9.22.r497" +RECIPE_UPSTREAM_DATE = "Oct 08, 2015" +CHECK_DATE = "Dec 10, 2015" + +DEPENDS = "flex-native bison-native flex" +DEPENDS_append_class-nativesdk += "flex-nativesdk" + +SRC_URI[md5sum] = "3687acc4ee992e536472365dd99712a7" +SRC_URI[sha256sum] = "274b43ada9c6eea1da26eb7010d72889c5278984ba0b50dff4e093057d4d64f8" + +MOD_PV = "497" +S = "${WORKDIR}/trunk" +SRC_URI = "svn://svn.code.sf.net/p/unfs3/code;module=trunk;rev=${MOD_PV};protocol=http \ + file://unfs3_parallel_build.patch \ + file://alternate_rpc_ports.patch \ + file://fix_pid_race_parent_writes_child_pid.patch \ + file://fix_compile_warning.patch \ + file://rename_fh_cache.patch \ + file://relative_max_socket_path_len.patch \ + file://tcp_no_delay.patch \ + " +BBCLASSEXTEND = "native nativesdk" + +inherit autotools +EXTRA_OECONF_append_class-native = " --sbindir=${bindir}" + +# Turn off these header detects else the inode search +# will walk entire file systems and this is a real problem +# if you have 2 TB of files to walk in your file system +CACHED_CONFIGUREVARS = "ac_cv_header_mntent_h=no ac_cv_header_sys_mnttab_h=no" -- cgit v1.2.3-54-g00ecf