summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2013-04-02 13:33:10 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-04 14:13:45 +0100
commitc47dfebff69e5352a70a7a59c1a3ebd5ed36166e (patch)
tree9b11a3f03f21bb92231776559de839e649835b25 /documentation
parent0e0ee9618656797cbeb3322a1ab2b96e196f5d9e (diff)
downloadpoky-c47dfebff69e5352a70a7a59c1a3ebd5ed36166e.tar.gz
dev-manual: General clean-up edits to the customizing images section
Edits to add a link and create a more active voice throughout this section. (From yocto-docs rev: 2cb62dab03d5ca4de9c9310c4d075fc643b7e68a) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/dev-manual/dev-manual-common-tasks.xml58
1 files changed, 34 insertions, 24 deletions
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 9096ea61a4..b28b7e21ec 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -606,38 +606,48 @@
606 <filename>EXTRA_IMAGE_FEATURES</filename></title> 606 <filename>EXTRA_IMAGE_FEATURES</filename></title>
607 607
608 <para> 608 <para>
609 Ultimately users might want to add extra image features to the set by using the 609 Ultimately, you might want to add extra image features to the
610 set by using the
610 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-IMAGE_FEATURES'>IMAGE_FEATURES</ulink></filename> 611 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-IMAGE_FEATURES'>IMAGE_FEATURES</ulink></filename>
611 variable. 612 variable.
612 To create these features, the best reference is 613 To create these features, the best reference is
613 <filename>meta/classes/core-image.bbclass</filename>, which shows how this is 614 <filename>meta/classes/core-image.bbclass</filename>, which
614 achieved. 615 shows how you can add features.
615 In summary, the file looks at the contents of the 616 In summary, the file looks at the contents of the
616 <filename>IMAGE_FEATURES</filename> 617 <filename>IMAGE_FEATURES</filename> variable and then maps those
617 variable and then maps that into a set of tasks or packages. 618 contents into a set of tasks or packages.
618 Based on this information, the 619 Based on this information, the build system automatically
620 generates the
619 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-IMAGE_INSTALL'> IMAGE_INSTALL</ulink></filename> 621 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-IMAGE_INSTALL'> IMAGE_INSTALL</ulink></filename>
620 variable is generated automatically. 622 variable.
621 Users can add extra features by extending the class or creating a custom class for use 623 You can add extra features by extending the class or creating a
622 with specialized image <filename>.bb</filename> files. 624 custom class for use with specialized image
625 <filename>.bb</filename> files.
623 You can also add more features by configuring the 626 You can also add more features by configuring the
624 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-EXTRA_IMAGE_FEATURES'>EXTRA_IMAGE_FEATURES</ulink></filename> 627 <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-EXTRA_IMAGE_FEATURES'>EXTRA_IMAGE_FEATURES</ulink></filename>
625 variable in the <filename>local.conf</filename> file found in the Source Directory 628 variable in the <filename>local.conf</filename> file found in
626 located in the Build Directory. 629 the <filename>local.conf</filename> file, which is located in
627 </para> 630 the <link linkend='build-directory'>Build Directory</link>.
628 631 </para>
629 <para> 632
630 The Yocto Project ships with two SSH servers you can use in your images: 633 <para>
631 Dropbear and OpenSSH. 634 The Yocto Project ships with two SSH servers you can use in your
632 Dropbear is a minimal SSH server appropriate for resource-constrained environments, 635 images: Dropbear and OpenSSH.
633 while OpenSSH is a well-known standard SSH server implementation. 636 Dropbear is a minimal SSH server appropriate for
634 By default, the <filename>core-image-sato</filename> image is configured to use Dropbear. 637 resource-constrained environments, while OpenSSH is a well-known
635 The <filename>core-image-basic</filename> and <filename>core-image-lsb</filename> 638 standard SSH server implementation.
636 images both include OpenSSH. 639 By default, the <filename>core-image-sato</filename> image is
637 The <filename>core-image-minimal</filename> image does not contain an SSH server. 640 configured to use Dropbear.
638 To change these defaults, edit the <filename>IMAGE_FEATURES</filename> variable 641 The <filename>core-image-basic</filename> and
642 <filename>core-image-lsb</filename> images both
643 include OpenSSH.
644 The <filename>core-image-minimal</filename> image does not
645 contain an SSH server.
646 To change these defaults, edit the
647 <filename>IMAGE_FEATURES</filename> variable
639 so that it sets the image you are working with to include 648 so that it sets the image you are working with to include
640 <filename>ssh-server-dropbear</filename> or <filename>ssh-server-openssh</filename>. 649 <filename>ssh-server-dropbear</filename> or
650 <filename>ssh-server-openssh</filename>.
641 </para> 651 </para>
642 </section> 652 </section>
643 653