diff options
author | Jason Wessel <jason.wessel@windriver.com> | 2014-01-23 08:32:42 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-28 00:52:35 +0000 |
commit | cac76ff693f5ed7518bff30fb625047808c1568f (patch) | |
tree | aa5f9aaf40d91f1ed65bb3972304005acb318a76 | |
parent | 162dd389301ce238b5003d6b4f6031256532508b (diff) | |
download | poky-cac76ff693f5ed7518bff30fb625047808c1568f.tar.gz |
unfs3, unfs-server: Replace all instances of unfs-server with unfs3
Other recipes dependencies and even some comments need to be updated
for the removal of unfs-server and the replacement with unfs3. The
unfs3 is a complete drop in replacement providing all the prior
functionality of NFSv2 but also adding NFSv3.
[YOCTO #5639]
(From OE-Core rev: d577c56519a448b142da5b43e46d5bd9d3a3b4bd)
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
7 files changed, 8 insertions, 8 deletions
diff --git a/meta/conf/distro/include/seperatebuilddir.inc b/meta/conf/distro/include/seperatebuilddir.inc index 3c36c2232a..64e8f6de7d 100644 --- a/meta/conf/distro/include/seperatebuilddir.inc +++ b/meta/conf/distro/include/seperatebuilddir.inc | |||
@@ -528,7 +528,7 @@ B_pn-nativesdk-renderproto = "${SEPB}" | |||
528 | B_pn-nativesdk-sqlite3 = "${SEPB}" | 528 | B_pn-nativesdk-sqlite3 = "${SEPB}" |
529 | B_pn-nativesdk-systemtap = "${SEPB}" | 529 | B_pn-nativesdk-systemtap = "${SEPB}" |
530 | # Not automake, no out of tree build support | 530 | # Not automake, no out of tree build support |
531 | #B_pn-nativesdk-unfs-server = "${SEPB}" | 531 | #B_pn-nativesdk-unfs3 = "${SEPB}" |
532 | B_pn-nativesdk-util-macros = "${SEPB}" | 532 | B_pn-nativesdk-util-macros = "${SEPB}" |
533 | B_pn-nativesdk-xcb-proto = "${SEPB}" | 533 | B_pn-nativesdk-xcb-proto = "${SEPB}" |
534 | B_pn-nativesdk-xcmiscproto = "${SEPB}" | 534 | B_pn-nativesdk-xcmiscproto = "${SEPB}" |
@@ -676,7 +676,7 @@ B_pn-tremor = "${SEPB}" | |||
676 | B_pn-tslib = "${SEPB}" | 676 | B_pn-tslib = "${SEPB}" |
677 | B_pn-udev = "${SEPB}" | 677 | B_pn-udev = "${SEPB}" |
678 | # Not automake, no out of tree build support | 678 | # Not automake, no out of tree build support |
679 | #B_pn-unfs-server-native = "${SEPB}" | 679 | #B_pn-unfs3-native = "${SEPB}" |
680 | B_pn-usbutils = "${SEPB}" | 680 | B_pn-usbutils = "${SEPB}" |
681 | B_pn-util-linux = "${SEPB}" | 681 | B_pn-util-linux = "${SEPB}" |
682 | B_pn-util-linux-native = "${SEPB}" | 682 | B_pn-util-linux-native = "${SEPB}" |
diff --git a/meta/recipes-core/meta/meta-ide-support.bb b/meta/recipes-core/meta/meta-ide-support.bb index d4c410ef2c..40bda28949 100644 --- a/meta/recipes-core/meta/meta-ide-support.bb +++ b/meta/recipes-core/meta/meta-ide-support.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "MIT" | |||
4 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ | 4 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ |
5 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 5 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
6 | 6 | ||
7 | DEPENDS = "virtual/libc gdb-cross qemu-native qemu-helper-native unfs-server-native" | 7 | DEPENDS = "virtual/libc gdb-cross qemu-native qemu-helper-native unfs3-native" |
8 | PR = "r3" | 8 | PR = "r3" |
9 | 9 | ||
10 | inherit meta toolchain-scripts | 10 | inherit meta toolchain-scripts |
diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb index 1065f30b2b..855fe4e625 100644 --- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb +++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb | |||
@@ -15,7 +15,7 @@ RDEPENDS_${PN} = "\ | |||
15 | nativesdk-qemu \ | 15 | nativesdk-qemu \ |
16 | nativesdk-qemu-helper \ | 16 | nativesdk-qemu-helper \ |
17 | nativesdk-pseudo \ | 17 | nativesdk-pseudo \ |
18 | nativesdk-unfs-server \ | 18 | nativesdk-unfs3 \ |
19 | nativesdk-opkg \ | 19 | nativesdk-opkg \ |
20 | nativesdk-libtool \ | 20 | nativesdk-libtool \ |
21 | nativesdk-autoconf \ | 21 | nativesdk-autoconf \ |
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal index 2fef7b0eed..e3422f5046 100755 --- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | |||
@@ -146,7 +146,7 @@ fi | |||
146 | 146 | ||
147 | if [ "$YOCTOADT_NFS_UTIL" == "Y" ] || [ "$YOCTOADT_NFS_UTIL" == "y" ]; then | 147 | if [ "$YOCTOADT_NFS_UTIL" == "Y" ] || [ "$YOCTOADT_NFS_UTIL" == "y" ]; then |
148 | echo_info "\nInstalling unfs ..." | 148 | echo_info "\nInstalling unfs ..." |
149 | $OPKG_INSTALL_NATIVE_CMD nativesdk-unfs-server &>> $YOCTOADT_INSTALL_LOG_FILE | 149 | $OPKG_INSTALL_NATIVE_CMD nativesdk-unfs3 &>> $YOCTOADT_INSTALL_LOG_FILE |
150 | check_result | 150 | check_result |
151 | fi | 151 | fi |
152 | 152 | ||
diff --git a/meta/recipes-gnome/packagegroups/packagegroup-toolset-native.bb b/meta/recipes-gnome/packagegroups/packagegroup-toolset-native.bb index c88f82a0ee..07d4f1d7a9 100644 --- a/meta/recipes-gnome/packagegroups/packagegroup-toolset-native.bb +++ b/meta/recipes-gnome/packagegroups/packagegroup-toolset-native.bb | |||
@@ -213,7 +213,7 @@ DEPENDS = "\ | |||
213 | tiff-native \ | 213 | tiff-native \ |
214 | tzcode-native \ | 214 | tzcode-native \ |
215 | u-boot-mkimage-native \ | 215 | u-boot-mkimage-native \ |
216 | unfs-server-native \ | 216 | unfs3-native \ |
217 | unifdef-native \ | 217 | unifdef-native \ |
218 | unzip-native \ | 218 | unzip-native \ |
219 | update-rc.d-native \ | 219 | update-rc.d-native \ |
diff --git a/meta/site/ix86-common b/meta/site/ix86-common index 21fcf38142..5cd2ce262c 100644 --- a/meta/site/ix86-common +++ b/meta/site/ix86-common | |||
@@ -216,7 +216,7 @@ moz_cv_size_of_JS_BYTES_PER_DOUBLE=8 | |||
216 | #ofono | 216 | #ofono |
217 | ac_cv_lib_c_signalfd=${ac_cv_lib_c_signalfd=yes} | 217 | ac_cv_lib_c_signalfd=${ac_cv_lib_c_signalfd=yes} |
218 | 218 | ||
219 | #unfs-server | 219 | #unfs3 |
220 | nfsd_cv_broken_setfsuid=${nfsd_cv_broken_setfsuid=0} | 220 | nfsd_cv_broken_setfsuid=${nfsd_cv_broken_setfsuid=0} |
221 | nfsd_cv_func_statfs=${nfsd_cv_func_statfs=statfs2_bsize} | 221 | nfsd_cv_func_statfs=${nfsd_cv_func_statfs=statfs2_bsize} |
222 | nfsd_cv_bsd_signals=${nfsd_cv_bsd_signals=yes} | 222 | nfsd_cv_bsd_signals=${nfsd_cv_bsd_signals=yes} |
diff --git a/meta/site/x86_64-linux b/meta/site/x86_64-linux index b4434fe640..573a9070ee 100644 --- a/meta/site/x86_64-linux +++ b/meta/site/x86_64-linux | |||
@@ -98,7 +98,7 @@ ac_cv_alignof_CORBA_wchar=2 | |||
98 | lf_cv_sane_realloc=yes | 98 | lf_cv_sane_realloc=yes |
99 | as_cv_unaligned_access=${as_cv_unaligned_access=yes} | 99 | as_cv_unaligned_access=${as_cv_unaligned_access=yes} |
100 | 100 | ||
101 | #unfs-server | 101 | #unfs3 |
102 | nfsd_cv_broken_setfsuid=${nfsd_cv_broken_setfsuid=0} | 102 | nfsd_cv_broken_setfsuid=${nfsd_cv_broken_setfsuid=0} |
103 | nfsd_cv_func_statfs=${nfsd_cv_func_statfs=statfs2_bsize} | 103 | nfsd_cv_func_statfs=${nfsd_cv_func_statfs=statfs2_bsize} |
104 | nfsd_cv_bsd_signals=${nfsd_cv_bsd_signals=yes} | 104 | nfsd_cv_bsd_signals=${nfsd_cv_bsd_signals=yes} |