summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2015-09-08 17:33:02 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-12 22:48:32 +0100
commitd0abea0133ab3090ee7b92d133dabdd1b6b70a28 (patch)
treef06baa437aca31fde8b15c946734245f29be2bfa
parent59f822d8b5dc7fb8c593eaaf16021521033c0414 (diff)
downloadpoky-d0abea0133ab3090ee7b92d133dabdd1b6b70a28.tar.gz
packagegroup-core-nfs: provide the nfs-client IMAGE_FEATURES
provide the nfs-client IMAGE_FEATURES, to ease a user to only install nfs client related files to image (From OE-Core rev: bbdc808a8ea76369a36473c906991e25ca49c323) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/core-image.bbclass2
-rw-r--r--meta/recipes-core/glibc/glibc-testing.inc2
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-nfs.bb6
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
21# - tools-testapps - tools usable to make some device tests 21# - tools-testapps - tools usable to make some device tests
22# - tools-sdk - SDK (C/C++ compiler, autotools, etc.) 22# - tools-sdk - SDK (C/C++ compiler, autotools, etc.)
23# - nfs-server - NFS server 23# - nfs-server - NFS server
24# - nfs-client - NFS client
24# - ssh-server-dropbear - SSH server (dropbear) 25# - ssh-server-dropbear - SSH server (dropbear)
25# - ssh-server-openssh - SSH server (openssh) 26# - ssh-server-openssh - SSH server (openssh)
26# - qt4-pkgs - Qt4/X11 and demo applications 27# - qt4-pkgs - Qt4/X11 and demo applications
@@ -42,6 +43,7 @@ FEATURE_PACKAGES_tools-profile = "packagegroup-core-tools-profile"
42FEATURE_PACKAGES_tools-testapps = "packagegroup-core-tools-testapps" 43FEATURE_PACKAGES_tools-testapps = "packagegroup-core-tools-testapps"
43FEATURE_PACKAGES_tools-sdk = "packagegroup-core-sdk packagegroup-core-standalone-sdk-target" 44FEATURE_PACKAGES_tools-sdk = "packagegroup-core-sdk packagegroup-core-standalone-sdk-target"
44FEATURE_PACKAGES_nfs-server = "packagegroup-core-nfs-server" 45FEATURE_PACKAGES_nfs-server = "packagegroup-core-nfs-server"
46FEATURE_PACKAGES_nfs-client = "packagegroup-core-nfs-client"
45FEATURE_PACKAGES_ssh-server-dropbear = "packagegroup-core-ssh-dropbear" 47FEATURE_PACKAGES_ssh-server-dropbear = "packagegroup-core-ssh-dropbear"
46FEATURE_PACKAGES_ssh-server-openssh = "packagegroup-core-ssh-openssh" 48FEATURE_PACKAGES_ssh-server-openssh = "packagegroup-core-ssh-openssh"
47FEATURE_PACKAGES_qt4-pkgs = "packagegroup-core-qt-demoapps" 49FEATURE_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
54 echo "1. You dont have passwordless ssh setup to access \$target" 54 echo "1. You dont have passwordless ssh setup to access \$target"
55 echo "2. NFS share on \$target is not mounted or if mounted then not matching the build tree layout." 55 echo "2. NFS share on \$target is not mounted or if mounted then not matching the build tree layout."
56 echo " The tree should be accessible at same location on build host and target" 56 echo " The tree should be accessible at same location on build host and target"
57 echo " You can add nfs-server to IMAGE_FEATURES to get the nfs client on target" 57 echo " You can add nfs-client to IMAGE_FEATURES to get the nfs client on target"
58 echo "3. nfs server on build host is not running." 58 echo "3. nfs server on build host is not running."
59 echo " Please make sure that you have 'no_root_squash' added in /etc/exports if you want" 59 echo " Please make sure that you have 'no_root_squash' added in /etc/exports if you want"
60 echo " to test as root user on target (usually its recommended to create a non" 60 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"
8 8
9inherit packagegroup 9inherit packagegroup
10 10
11PACKAGES = "${PN}-server" 11PROVIDES = "${PACKAGES}"
12PACKAGES = "${PN}-server ${PN}-client"
13
14SUMMARY_${PN}-client = "NFS client"
15RDEPENDS_${PN}-client = "nfs-utils-client"
12 16
13SUMMARY_${PN}-server = "NFS server" 17SUMMARY_${PN}-server = "NFS server"
14RDEPENDS_${PN}-server = "\ 18RDEPENDS_${PN}-server = "\