1 files changed, 92 insertions, 45 deletions
diff --git a/documentation/toaster-manual/toaster-manual-start.xml b/documentation/toaster-manual/toaster-manual-start.xml
index b884036035..608a505fac 100644
--- a/documentation/toaster-manual/toaster-manual-start.xml
+++ b/documentation/toaster-manual/toaster-manual-start.xml
@@ -9,8 +9,6 @@
    <para>
        This chapter describes how you need to prepare your system in order to
        use Toaster.
-        Toaster requires some packages that you must have installed before
-        trying to run Toaster.
    </para>
    <section id='toaster-setting-up-the-basic-system-requirements'>
@@ -30,54 +28,103 @@
        <title>Establishing Toaster System Dependencies</title>
        <para>
-            Toaster requires extra Python dependencies that Bitbake
+            Toaster requires extra Python dependencies and
-            does not need in order to run.
+            <ulink url='http://www.libslack.org/daemon/'><filename>daemon</filename></ulink>
-            In order to make it easy to run Toaster, a requirements file
+            in order to run.
-            located in the root directory of
+            A Toaster requirements file named
+            <filename>toaster-requirements.txt</filename> defines the
+            Python dependencies.
+            The requirements file is located in the
+            <filename>bitbake</filename> directory, which is located in the
+            root directory of the
            <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>
-            <filename>bitbake/</filename>
            (e.g. <filename>poky/bitbake/toaster-requirements.txt</filename>).
            The dependencies appear in a <filename>pip</filename>,
-            install-compatible format:
+            install-compatible format.
-            <literallayout class='monospaced'>
+        </para>
-     Django==1.6
-     South==0.8.4
+        <section id='toaster-optional-virtual-environment'>
-     argparse==1.2.1
+            <title>Optionally Setting Up a Python Virtual Environment</title>
-     wsgiref==0.1.2
-            </literallayout>
+            <para>
-            Follow these steps to get set up:
+                It is highly recommended that you use a Python virtual
-            <orderedlist>
+                environment that allows you to maintain a dedicated Python
-                <listitem><para><emphasis>Install <filename>virtualenv</filename>:</emphasis>
+                executable and its own set of installed modules.
-                    <filename>virtualenv</filename> is a tool to create
+                Doing so separates the executable from the Python and modules
-                    isolated Python environments by creating folders that
+                provided by the operating system and therefore avoids any
-                    contain all the necessary executables to use the packages
+                version conflicts.
-                    that Python projects need.
+            </para>
-                    You can use <filename>pip</filename> to install
-                    <filename>virtualenv</filename>:
+            <para>
-                    <literallayout class='monospaced'>
+                Follow these steps to set up your virtual environment.
-     $ pip install virtualenv
+                These steps assume a Ubuntu distribution:
-                    </literallayout>
+                <orderedlist>
-                    </para></listitem>
+                    <listitem><para><emphasis>Install <filename>virtualenv</filename>:</emphasis>
-                <listitem><para><emphasis>Create and activate a virtual environment:</emphasis>
+                        Install the supported
-                    <literallayout class='monospaced'>
+                        <filename>python-virtualenv</filename> package from your
+                        distribution rather than using <filename>pip</filename>.
+                        <literallayout class='monospaced'>
+     $ sudo apt-get install python-virtualenv
+                        </literallayout>
+                        </para></listitem>
+                    <listitem><para><emphasis>Create and Activate a Virtual Environment:</emphasis>
+                        <literallayout class='monospaced'>
     $ virtualenv venv
     $ source venv/bin/activate
-                    </literallayout>
+                        </literallayout>
-                    </para></listitem>
+                        </para></listitem>
-                <listitem><para><emphasis>Use <filename>pip</filename> to install needed packages:</emphasis>
+                </orderedlist>
-                    <literallayout class='monospaced'>
+            </para>
+        </section>
+        <section id='toaster-load-packages'>
+            <title>Install Toaster Packages</title>
+            <para>
+                You need to install the packages that Toaster requires.
+                Use this command:
+                <literallayout class='monospaced'>
     $ pip install -r bitbake/toaster-requirements.txt
-                    </literallayout>
+                </literallayout>
-                    </para></listitem>
+            </para>
-            </orderedlist>
+        </section>
-            Once you complete these steps, you execute in a lightweight
-            "virtual environment” with its own site directories that are
-            optionally isolated from system site directories.
-            The virtual environment has its own Python binary
-            (allowing creation of environments with various Python versions)
-            and can have its own independent set of installed Python packages
-            in its site directories.
-        </para>
-    </section>
+        <section id='toaster-install-daemon'>
+            <title>Install <filename>daemon</filename></title>
+            <para>
+                Toaster depends on
+                <ulink url='http://www.libslack.org/daemon/'><filename>daemon</filename></ulink>.
+                Depending on your distribution, how you install
+                <filename>daemon</filename> differs:
+                <itemizedlist>
+                    <listitem><para><emphasis>Debian-Based Systems:</emphasis>
+                        If you are running a Debian-based distribution,
+                        install <filename>daemon</filename> using the
+                        following command:
+                        <literallayout class='monospaced'>
+     $ sudo apt-get install daemon
+                        </literallayout>
+                        </para></listitem>
+                    <listitem><para><emphasis>Non-Debian-Based Systems:</emphasis>
+                        If you are not running a Debian-based distribution
+                        (Redhat-based distribution such as Fedora),
+                        you need to download the file relevant to the
+                        architecture and then install
+                        <filename>daemon</filename> manually.
+                        Following are the commands for 64-bit distributions:
+                        <literallayout class='monospaced'>
+     $ wget http://libslack.org/daemon/download/daemon-0.6.4-1.x86_64.rpm
+     $ sudo rpm -i daemon-0.6.4-1.x86_64.rpm
+                        </literallayout>
+                        Here are the commands for a 32-bit distribution:
+                        <literallayout class='monospaced'>
+     $ wget http://libslack.org/daemon/download/daemon-0.6.4-1.i686.rpm
+     $ sudo rpm -i daemon-0.6.4-1.i686.rpm
+                        </literallayout>
+                        </para></listitem>
+                </itemizedlist>
+            </para>
+        </section>
+    </section>
 </chapter>

diff --git a/documentation/toaster-manual/toaster-manual-start.xml b/documentation/toaster-manual/toaster-manual-start.xml index b884036035..608a505fac 100644 --- a/documentation/toaster-manual/toaster-manual-start.xml +++ b/documentation/toaster-manual/toaster-manual-start.xml
@@ -9,8 +9,6 @@
9	<para>	9	<para>
10	This chapter describes how you need to prepare your system in order to	10	This chapter describes how you need to prepare your system in order to
11	use Toaster.	11	use Toaster.
12	Toaster requires some packages that you must have installed before
13	trying to run Toaster.
14	</para>	12	</para>
15		13
16	<section id='toaster-setting-up-the-basic-system-requirements'>	14	<section id='toaster-setting-up-the-basic-system-requirements'>
@@ -30,54 +28,103 @@
30	<title>Establishing Toaster System Dependencies</title>	28	<title>Establishing Toaster System Dependencies</title>
31		29
32	<para>	30	<para>
33	Toaster requires extra Python dependencies that Bitbake	31	Toaster requires extra Python dependencies and
34	does not need in order to run.	32	<ulink url='http://www.libslack.org/daemon/'><filename>daemon</filename></ulink>
35	In order to make it easy to run Toaster, a requirements file	33	in order to run.
36	located in the root directory of	34	A Toaster requirements file named
		35	<filename>toaster-requirements.txt</filename> defines the
		36	Python dependencies.
		37	The requirements file is located in the
		38	<filename>bitbake</filename> directory, which is located in the
		39	root directory of the
37	<ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>	40	<ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>
38	<filename>bitbake/</filename>
39	(e.g. <filename>poky/bitbake/toaster-requirements.txt</filename>).	41	(e.g. <filename>poky/bitbake/toaster-requirements.txt</filename>).
40	The dependencies appear in a <filename>pip</filename>,	42	The dependencies appear in a <filename>pip</filename>,
41	install-compatible format:	43	install-compatible format.
42	<literallayout class='monospaced'>	44	</para>
43	Django==1.6	45
44	South==0.8.4	46	<section id='toaster-optional-virtual-environment'>
45	argparse==1.2.1	47	<title>Optionally Setting Up a Python Virtual Environment</title>
46	wsgiref==0.1.2	48
47	</literallayout>	49	<para>
48	Follow these steps to get set up:	50	It is highly recommended that you use a Python virtual
49	<orderedlist>	51	environment that allows you to maintain a dedicated Python
50	<listitem><para><emphasis>Install <filename>virtualenv</filename>:</emphasis>	52	executable and its own set of installed modules.
51	<filename>virtualenv</filename> is a tool to create	53	Doing so separates the executable from the Python and modules
52	isolated Python environments by creating folders that	54	provided by the operating system and therefore avoids any
53	contain all the necessary executables to use the packages	55	version conflicts.
54	that Python projects need.	56	</para>
55	You can use <filename>pip</filename> to install	57
56	<filename>virtualenv</filename>:	58	<para>
57	<literallayout class='monospaced'>	59	Follow these steps to set up your virtual environment.
58	$ pip install virtualenv	60	These steps assume a Ubuntu distribution:
59	</literallayout>	61	<orderedlist>
60	</para></listitem>	62	<listitem><para><emphasis>Install <filename>virtualenv</filename>:</emphasis>
61	<listitem><para><emphasis>Create and activate a virtual environment:</emphasis>	63	Install the supported
62	<literallayout class='monospaced'>	64	<filename>python-virtualenv</filename> package from your
		65	distribution rather than using <filename>pip</filename>.
		66	<literallayout class='monospaced'>
		67	$ sudo apt-get install python-virtualenv
		68	</literallayout>
		69	</para></listitem>
		70	<listitem><para><emphasis>Create and Activate a Virtual Environment:</emphasis>
		71	<literallayout class='monospaced'>
63	$ virtualenv venv	72	$ virtualenv venv
64	$ source venv/bin/activate	73	$ source venv/bin/activate
65	</literallayout>	74	</literallayout>
66	</para></listitem>	75	</para></listitem>
67	<listitem><para><emphasis>Use <filename>pip</filename> to install needed packages:</emphasis>	76	</orderedlist>
68	<literallayout class='monospaced'>	77	</para>
		78	</section>
		79
		80	<section id='toaster-load-packages'>
		81	<title>Install Toaster Packages</title>
		82
		83	<para>
		84	You need to install the packages that Toaster requires.
		85	Use this command:
		86	<literallayout class='monospaced'>
69	$ pip install -r bitbake/toaster-requirements.txt	87	$ pip install -r bitbake/toaster-requirements.txt
70	</literallayout>	88	</literallayout>
71	</para></listitem>	89	</para>
72	</orderedlist>	90	</section>
73	Once you complete these steps, you execute in a lightweight
74	"virtual environment” with its own site directories that are
75	optionally isolated from system site directories.
76	The virtual environment has its own Python binary
77	(allowing creation of environments with various Python versions)
78	and can have its own independent set of installed Python packages
79	in its site directories.
80	</para>
81	</section>
82		91
		92	<section id='toaster-install-daemon'>
		93	<title>Install <filename>daemon</filename></title>
		94
		95	<para>
		96	Toaster depends on
		97	<ulink url='http://www.libslack.org/daemon/'><filename>daemon</filename></ulink>.
		98	Depending on your distribution, how you install
		99	<filename>daemon</filename> differs:
		100	<itemizedlist>
		101	<listitem><para><emphasis>Debian-Based Systems:</emphasis>
		102	If you are running a Debian-based distribution,
		103	install <filename>daemon</filename> using the
		104	following command:
		105	<literallayout class='monospaced'>
		106	$ sudo apt-get install daemon
		107	</literallayout>
		108	</para></listitem>
		109	<listitem><para><emphasis>Non-Debian-Based Systems:</emphasis>
		110	If you are not running a Debian-based distribution
		111	(Redhat-based distribution such as Fedora),
		112	you need to download the file relevant to the
		113	architecture and then install
		114	<filename>daemon</filename> manually.
		115	Following are the commands for 64-bit distributions:
		116	<literallayout class='monospaced'>
		117	$ wget http://libslack.org/daemon/download/daemon-0.6.4-1.x86_64.rpm
		118	$ sudo rpm -i daemon-0.6.4-1.x86_64.rpm
		119	</literallayout>
		120	Here are the commands for a 32-bit distribution:
		121	<literallayout class='monospaced'>
		122	$ wget http://libslack.org/daemon/download/daemon-0.6.4-1.i686.rpm
		123	$ sudo rpm -i daemon-0.6.4-1.i686.rpm
		124	</literallayout>
		125	</para></listitem>
		126	</itemizedlist>
		127	</para>
		128	</section>
		129	</section>
83	</chapter>	130	</chapter>