summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2014-01-29 08:57:33 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-29 17:38:48 +0000
commit8ef4a3c0e85508e6cc604d1e10d0d7b14a5b8508 (patch)
tree6e70a9044ab0dff3f36165451d0c68ae1e7cf9ae
parent321cd5a25e3bb93d00892b97cb0861eba029a17f (diff)
downloadpoky-8ef4a3c0e85508e6cc604d1e10d0d7b14a5b8508.tar.gz
unfs3: Fix dependencies and allow target builds
Fixed in this patch: * All patches marked as submitted to the upstream * Remove the pseudo dependency because unfs3 can fully stand alone or be used with pseudo and it does not link against pseudo * Dependencies to flex for nativesdk and target builds are fixed such that unfs3 can be deployed into an image * Add unfs3 references in separatebuilddir.inc because unfs3 works correctly with autotools. (From OE-Core rev: 7d8075c64bd0734cb70d16acef36c1a17276b359) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/seperatebuilddir.inc7
-rw-r--r--meta/recipes-devtools/unfs3/unfs3/alternate_rpc_ports.patch2
-rw-r--r--meta/recipes-devtools/unfs3/unfs3/fix_compile_warning.patch2
-rw-r--r--meta/recipes-devtools/unfs3/unfs3/fix_pid_race_parent_writes_child_pid.patch2
-rw-r--r--meta/recipes-devtools/unfs3/unfs3/fix_warnings.patch2
-rw-r--r--meta/recipes-devtools/unfs3/unfs3/relative_max_socket_path_len.patch2
-rw-r--r--meta/recipes-devtools/unfs3/unfs3/rename_fh_cache.patch2
-rw-r--r--meta/recipes-devtools/unfs3/unfs3/tcp_no_delay.patch2
-rw-r--r--meta/recipes-devtools/unfs3/unfs3/unfs3_parallel_build.patch2
-rw-r--r--meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb17
10 files changed, 13 insertions, 27 deletions
diff --git a/meta/conf/distro/include/seperatebuilddir.inc b/meta/conf/distro/include/seperatebuilddir.inc
index 64e8f6de7d..c6897a593a 100644
--- a/meta/conf/distro/include/seperatebuilddir.inc
+++ b/meta/conf/distro/include/seperatebuilddir.inc
@@ -527,8 +527,7 @@ B_pn-nativesdk-readline = "${SEPB}"
527B_pn-nativesdk-renderproto = "${SEPB}" 527B_pn-nativesdk-renderproto = "${SEPB}"
528B_pn-nativesdk-sqlite3 = "${SEPB}" 528B_pn-nativesdk-sqlite3 = "${SEPB}"
529B_pn-nativesdk-systemtap = "${SEPB}" 529B_pn-nativesdk-systemtap = "${SEPB}"
530# Not automake, no out of tree build support 530B_pn-nativesdk-unfs3 = "${SEPB}"
531#B_pn-nativesdk-unfs3 = "${SEPB}"
532B_pn-nativesdk-util-macros = "${SEPB}" 531B_pn-nativesdk-util-macros = "${SEPB}"
533B_pn-nativesdk-xcb-proto = "${SEPB}" 532B_pn-nativesdk-xcb-proto = "${SEPB}"
534B_pn-nativesdk-xcmiscproto = "${SEPB}" 533B_pn-nativesdk-xcmiscproto = "${SEPB}"
@@ -675,8 +674,8 @@ B_pn-time = "${SEPB}"
675B_pn-tremor = "${SEPB}" 674B_pn-tremor = "${SEPB}"
676B_pn-tslib = "${SEPB}" 675B_pn-tslib = "${SEPB}"
677B_pn-udev = "${SEPB}" 676B_pn-udev = "${SEPB}"
678# Not automake, no out of tree build support 677B_pn-unfs3 = "${SEPB}"
679#B_pn-unfs3-native = "${SEPB}" 678B_pn-unfs3-native = "${SEPB}"
680B_pn-usbutils = "${SEPB}" 679B_pn-usbutils = "${SEPB}"
681B_pn-util-linux = "${SEPB}" 680B_pn-util-linux = "${SEPB}"
682B_pn-util-linux-native = "${SEPB}" 681B_pn-util-linux-native = "${SEPB}"
diff --git a/meta/recipes-devtools/unfs3/unfs3/alternate_rpc_ports.patch b/meta/recipes-devtools/unfs3/unfs3/alternate_rpc_ports.patch
index 029582ea1d..ff745d4774 100644
--- a/meta/recipes-devtools/unfs3/unfs3/alternate_rpc_ports.patch
+++ b/meta/recipes-devtools/unfs3/unfs3/alternate_rpc_ports.patch
@@ -5,7 +5,7 @@ be able to specify alternate rpc port numbers.
5 5
6Jason Wessel <jason.wessel@windriver.com> 6Jason Wessel <jason.wessel@windriver.com>
7 7
8Upstream-Status: Pending 8Upstream-Status: Submitted http://sourceforge.net/p/unfs3/bugs/5/
9 9
10--- 10---
11 daemon.c | 44 +++++++++++++++++++++++++++++++------------- 11 daemon.c | 44 +++++++++++++++++++++++++++++++-------------
diff --git a/meta/recipes-devtools/unfs3/unfs3/fix_compile_warning.patch b/meta/recipes-devtools/unfs3/unfs3/fix_compile_warning.patch
index 604824a230..aada014117 100644
--- a/meta/recipes-devtools/unfs3/unfs3/fix_compile_warning.patch
+++ b/meta/recipes-devtools/unfs3/unfs3/fix_compile_warning.patch
@@ -5,7 +5,7 @@ If this one does fail something is very, very wrong.
5 5
6Signed-off-by: Jason Wessel <jason.wessel@windriver.com> 6Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
7 7
8Upstream-Status: Pending 8Upstream-Status: Submitted http://sourceforge.net/p/unfs3/bugs/5/
9 9
10--- 10---
11 daemon.c | 3 ++- 11 daemon.c | 3 ++-
diff --git a/meta/recipes-devtools/unfs3/unfs3/fix_pid_race_parent_writes_child_pid.patch b/meta/recipes-devtools/unfs3/unfs3/fix_pid_race_parent_writes_child_pid.patch
index 76d7555ea9..46b187e5f3 100644
--- a/meta/recipes-devtools/unfs3/unfs3/fix_pid_race_parent_writes_child_pid.patch
+++ b/meta/recipes-devtools/unfs3/unfs3/fix_pid_race_parent_writes_child_pid.patch
@@ -10,7 +10,7 @@ on a busy system.
10 10
11Signed-off-by: Jason Wessel <jason.wessel@windriver.com> 11Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
12 12
13Upstream-Status: Pending 13Upstream-Status: Submitted http://sourceforge.net/p/unfs3/bugs/5/
14 14
15--- 15---
16 daemon.c | 12 +++++++++--- 16 daemon.c | 12 +++++++++---
diff --git a/meta/recipes-devtools/unfs3/unfs3/fix_warnings.patch b/meta/recipes-devtools/unfs3/unfs3/fix_warnings.patch
index ed61ea16fe..cda8655b96 100644
--- a/meta/recipes-devtools/unfs3/unfs3/fix_warnings.patch
+++ b/meta/recipes-devtools/unfs3/unfs3/fix_warnings.patch
@@ -10,7 +10,7 @@ exports.y:350: warning: large integer implicitly truncated to unsigned type
10 10
11Signed-off-by: Jason Wessel <jason.wessel@windriver.com> 11Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
12 12
13Upstream-Status: Pending 13Upstream-Status: Submitted http://sourceforge.net/p/unfs3/bugs/5/
14 14
15--- 15---
16 Config/exports.l | 3 +++ 16 Config/exports.l | 3 +++
diff --git a/meta/recipes-devtools/unfs3/unfs3/relative_max_socket_path_len.patch b/meta/recipes-devtools/unfs3/unfs3/relative_max_socket_path_len.patch
index 17ad7b6feb..219dd35aec 100644
--- a/meta/recipes-devtools/unfs3/unfs3/relative_max_socket_path_len.patch
+++ b/meta/recipes-devtools/unfs3/unfs3/relative_max_socket_path_len.patch
@@ -12,7 +12,7 @@ heavy use of named sockets with long names.
12 12
13Signed-off-by: Jason Wessel <jason.wessel@windriver.com> 13Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
14 14
15Upstream-Status: Pending 15Upstream-Status: Submitted http://sourceforge.net/p/unfs3/bugs/5/
16 16
17--- 17---
18 nfs.c | 29 +++++++++++++++++++++++++++-- 18 nfs.c | 29 +++++++++++++++++++++++++++--
diff --git a/meta/recipes-devtools/unfs3/unfs3/rename_fh_cache.patch b/meta/recipes-devtools/unfs3/unfs3/rename_fh_cache.patch
index 37de8c3ca2..e6d89530f8 100644
--- a/meta/recipes-devtools/unfs3/unfs3/rename_fh_cache.patch
+++ b/meta/recipes-devtools/unfs3/unfs3/rename_fh_cache.patch
@@ -13,7 +13,7 @@ location of the inode, when it moves directories.
13 13
14Signed-off-by: Jason Wessel <jason.wessel@windriver.com> 14Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
15 15
16Upstream-Status: Pending 16Upstream-Status: Submitted http://sourceforge.net/p/unfs3/bugs/5/
17 17
18--- 18---
19 fh_cache.c | 12 ++++++++++++ 19 fh_cache.c | 12 ++++++++++++
diff --git a/meta/recipes-devtools/unfs3/unfs3/tcp_no_delay.patch b/meta/recipes-devtools/unfs3/unfs3/tcp_no_delay.patch
index bc78dee361..b3521c63eb 100644
--- a/meta/recipes-devtools/unfs3/unfs3/tcp_no_delay.patch
+++ b/meta/recipes-devtools/unfs3/unfs3/tcp_no_delay.patch
@@ -2,7 +2,7 @@ daemon.c: Add option for tcp no delay
2 2
3Allow the NFS tcp sockets to conditionally use TCP_NODELAY 3Allow the NFS tcp sockets to conditionally use TCP_NODELAY
4 4
5Upstream-Status: Pending 5Upstream-Status: Submitted http://sourceforge.net/p/unfs3/bugs/5/
6 6
7--- 7---
8 daemon.c | 9 ++++++++- 8 daemon.c | 9 ++++++++-
diff --git a/meta/recipes-devtools/unfs3/unfs3/unfs3_parallel_build.patch b/meta/recipes-devtools/unfs3/unfs3/unfs3_parallel_build.patch
index c7fe3d7c6b..67777695d5 100644
--- a/meta/recipes-devtools/unfs3/unfs3/unfs3_parallel_build.patch
+++ b/meta/recipes-devtools/unfs3/unfs3/unfs3_parallel_build.patch
@@ -4,7 +4,7 @@ If building with make -j2 the lib.a will not get built in time.
4 4
5Jason Wessel <jason.wessel@windriver.com> 5Jason Wessel <jason.wessel@windriver.com>
6 6
7Upstream-Status: Pending 7Upstream-Status: Submitted http://sourceforge.net/p/unfs3/bugs/5/
8 8
9--- 9---
10 Config/Makefile.in | 2 ++ 10 Config/Makefile.in | 2 ++
diff --git a/meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb b/meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb
index 3d88b42733..af2f3bbcb0 100644
--- a/meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb
+++ b/meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb
@@ -3,11 +3,8 @@ SECTION = "console/network"
3LICENSE = "unfs3" 3LICENSE = "unfs3"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=9475885294e17c0cc0067820d042792e" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=9475885294e17c0cc0067820d042792e"
5 5
6RDEPENDS_${PN} = "pseudo" 6DEPENDS = "flex-native bison-native flex"
7RDEPENDS_${PN}_class-native = "pseudo-native" 7DEPENDS_append_class-nativesdk += "flex-nativesdk"
8RDEPENDS_${PN}_class-nativesdk = "pseudo-nativesdk"
9DEPENDS = "flex-native bison-native"
10DEPENDS_class-nativesdk += "flex-nativesdk"
11 8
12SRC_URI[md5sum] = "3687acc4ee992e536472365dd99712a7" 9SRC_URI[md5sum] = "3687acc4ee992e536472365dd99712a7"
13SRC_URI[sha256sum] = "274b43ada9c6eea1da26eb7010d72889c5278984ba0b50dff4e093057d4d64f8" 10SRC_URI[sha256sum] = "274b43ada9c6eea1da26eb7010d72889c5278984ba0b50dff4e093057d4d64f8"
@@ -32,13 +29,3 @@ inherit autotools
32# will walk entire file systems and this is a real problem 29# will walk entire file systems and this is a real problem
33# if you have 2 TB of files to walk in your file system 30# if you have 2 TB of files to walk in your file system
34CACHED_CONFIGUREVARS = "ac_cv_header_mntent_h=no ac_cv_header_sys_mnttab_h=no" 31CACHED_CONFIGUREVARS = "ac_cv_header_mntent_h=no ac_cv_header_sys_mnttab_h=no"
35
36# This recipe is intended for -native and -nativesdk builds only,
37# not target installs:
38python __anonymous () {
39 import re
40
41 pn = d.getVar("PN", True)
42 if not pn.endswith('-native') and not pn.startswith('nativesdk-'):
43 raise bb.parse.SkipPackage("unfs3 is intended for native/nativesdk builds only")
44}