3 files changed, 8 insertions, 2 deletions

diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index 501456dba7..8e340d9f5c 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -21,6 +21,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d
 # - tools-testapps      - tools usable to make some device tests
 # - tools-sdk           - SDK (C/C++ compiler, autotools, etc.)
 # - nfs-server          - NFS server
+# - nfs-client          - NFS client
 # - ssh-server-dropbear - SSH server (dropbear)
 # - ssh-server-openssh  - SSH server (openssh)
 # - qt4-pkgs            - Qt4/X11 and demo applications
@@ -42,6 +43,7 @@ FEATURE_PACKAGES_tools-profile = "packagegroup-core-tools-profile"
 FEATURE_PACKAGES_tools-testapps = "packagegroup-core-tools-testapps"
 FEATURE_PACKAGES_tools-sdk = "packagegroup-core-sdk packagegroup-core-standalone-sdk-target"
 FEATURE_PACKAGES_nfs-server = "packagegroup-core-nfs-server"
+FEATURE_PACKAGES_nfs-client = "packagegroup-core-nfs-client"
 FEATURE_PACKAGES_ssh-server-dropbear = "packagegroup-core-ssh-dropbear"
 FEATURE_PACKAGES_ssh-server-openssh = "packagegroup-core-ssh-openssh"
 FEATURE_PACKAGES_qt4-pkgs = "packagegroup-core-qt-demoapps"
diff --git a/meta/recipes-core/glibc/glibc-testing.inc b/meta/recipes-core/glibc/glibc-testing.inc
index fd1af39922..a9bbf37a17 100644
--- a/meta/recipes-core/glibc/glibc-testing.inc
+++ b/meta/recipes-core/glibc/glibc-testing.inc
@@ -54,7 +54,7 @@ then
         echo "1. You dont have passwordless ssh setup to access \$target"
         echo "2. NFS share on \$target is not mounted or if mounted then not matching the build tree layout."
         echo "   The tree should be accessible at same location on build host and target"
-        echo "   You can add nfs-server to IMAGE_FEATURES to get the nfs client on target"
+        echo "   You can add nfs-client to IMAGE_FEATURES to get the nfs client on target"
         echo "3. nfs server on build host is not running."
         echo "   Please make sure that you have 'no_root_squash' added in /etc/exports if you want"
         echo "   to test as root user on target (usually its recommended to create a non"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
index 247a30e063..1882d3ad16 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
@@ -8,7 +8,11 @@ PR = "r2"
 
 inherit packagegroup
 
-PACKAGES = "${PN}-server"
+PROVIDES = "${PACKAGES}"
+PACKAGES = "${PN}-server ${PN}-client"
+
+SUMMARY_${PN}-client = "NFS client"
+RDEPENDS_${PN}-client = "nfs-utils-client"
 
 SUMMARY_${PN}-server = "NFS server"
 RDEPENDS_${PN}-server = "\