summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-20 17:25:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-21 13:08:45 +0100
commite9b17e3fa7f15740d8e5cfdfe19c0565a74c0d20 (patch)
treed5bbbbe052a51dc4494e4913a03c95045682efd6
parentb3d84fb35a2d11587d973c59a6d0851c1988d409 (diff)
downloadpoky-e9b17e3fa7f15740d8e5cfdfe19c0565a74c0d20.tar.gz
Rename poky-image-* -> core-image-* and task-poky-* -> task-core-*
(From yocto-docs rev: 0feb6b8f9621087ba5fd77d3c8f3e23132c97187) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--documentation/bsp-guide/bsp.xml2
-rw-r--r--documentation/kernel-manual/kernel-how-to.xml2
-rw-r--r--documentation/poky-ref-manual/development.xml10
-rw-r--r--documentation/poky-ref-manual/extendpoky.xml12
-rw-r--r--documentation/poky-ref-manual/ref-bitbake.xml6
-rw-r--r--documentation/poky-ref-manual/ref-images.xml16
-rw-r--r--documentation/yocto-project-qs/yocto-project-qs.xml4
7 files changed, 26 insertions, 26 deletions
diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index 36715f33b7..c65901252b 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -588,7 +588,7 @@ FILESEXTRAPATHS := "${THISDIR}/${PN}"
588 </para> 588 </para>
589 589
590 <programlisting> 590 <programlisting>
591 $ BSPKEY_&lt;keydomain&gt;=&lt;key&gt; bitbake poky-image-sato 591 $ BSPKEY_&lt;keydomain&gt;=&lt;key&gt; bitbake core-image-sato
592 </programlisting> 592 </programlisting>
593 593
594 <para> 594 <para>
diff --git a/documentation/kernel-manual/kernel-how-to.xml b/documentation/kernel-manual/kernel-how-to.xml
index 96325fe2a5..0cb715404b 100644
--- a/documentation/kernel-manual/kernel-how-to.xml
+++ b/documentation/kernel-manual/kernel-how-to.xml
@@ -1126,7 +1126,7 @@ That's it. Configure and build.
1126 <para> 1126 <para>
1127 You should now be able to build and boot an image with the new kernel: 1127 You should now be able to build and boot an image with the new kernel:
1128 <literallayout class='monospaced'> 1128 <literallayout class='monospaced'>
1129 $ bitbake poky-image-sato-live 1129 $ bitbake core-image-sato-live
1130 </literallayout> 1130 </literallayout>
1131 </para></listitem> 1131 </para></listitem>
1132 1132
diff --git a/documentation/poky-ref-manual/development.xml b/documentation/poky-ref-manual/development.xml
index 45df028f86..cee865a4a4 100644
--- a/documentation/poky-ref-manual/development.xml
+++ b/documentation/poky-ref-manual/development.xml
@@ -384,7 +384,7 @@
384 <listitem><para>Kernel: Use the file chooser to select the kernel used with QEMU.</para></listitem> 384 <listitem><para>Kernel: Use the file chooser to select the kernel used with QEMU.</para></listitem>
385 <listitem><para>Root filesystem: Use the file chooser to select the root 385 <listitem><para>Root filesystem: Use the file chooser to select the root
386 filesystem directory. This directory is where you use "poky-extract-sdk" to extract the 386 filesystem directory. This directory is where you use "poky-extract-sdk" to extract the
387 poky-image-sdk tarball.</para></listitem> 387 core-image-sdk tarball.</para></listitem>
388 </itemizedlist> 388 </itemizedlist>
389 </para> 389 </para>
390 </section> 390 </section>
@@ -738,7 +738,7 @@ tmp/sysroots/&lt;host-arch&gt;/usr/bin/&lt;target-abi&gt;-gdb
738 <para> 738 <para>
739 Perhaps the easiest is to have an 'sdk' image that corresponds to the plain 739 Perhaps the easiest is to have an 'sdk' image that corresponds to the plain
740 image installed on the device. 740 image installed on the device.
741 In the case of 'poky-image-sato', 'poky-image-sdk' would contain suitable symbols. 741 In the case of 'core-image-sato', 'core-image-sdk' would contain suitable symbols.
742 Because the sdk images already have the debugging symbols installed it is just a 742 Because the sdk images already have the debugging symbols installed it is just a
743 question of expanding the archive to some location and then informing GDB. 743 question of expanding the archive to some location and then informing GDB.
744 </para> 744 </para>
@@ -764,17 +764,17 @@ tmp/sysroots/&lt;host-arch&gt;/usr/bin/&lt;target-abi&gt;-gdb
764 <filename>tmp/rootfs</filename>: 764 <filename>tmp/rootfs</filename>:
765 <programlisting> 765 <programlisting>
766tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \ 766tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \
767tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/opkg.conf -o \ 767tmp/work/&lt;target-abi&gt;/core-image-sato-1.0-r0/temp/opkg.conf -o \
768tmp/rootfs/ update 768tmp/rootfs/ update
769 </programlisting></para></listitem> 769 </programlisting></para></listitem>
770 <listitem><para>Install the debugging information: 770 <listitem><para>Install the debugging information:
771 <programlisting> 771 <programlisting>
772tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \ 772tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \
773tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/opkg.conf \ 773tmp/work/&lt;target-abi&gt;/core-image-sato-1.0-r0/temp/opkg.conf \
774-o tmp/rootfs install foo 774-o tmp/rootfs install foo
775 775
776tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \ 776tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \
777tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/opkg.conf \ 777tmp/work/&lt;target-abi&gt;/core-image-sato-1.0-r0/temp/opkg.conf \
778-o tmp/rootfs install foo-dbg 778-o tmp/rootfs install foo-dbg
779 </programlisting></para></listitem> 779 </programlisting></para></listitem>
780 </orderedlist> 780 </orderedlist>
diff --git a/documentation/poky-ref-manual/extendpoky.xml b/documentation/poky-ref-manual/extendpoky.xml
index 6a5e1a5d8a..69ff4e2a52 100644
--- a/documentation/poky-ref-manual/extendpoky.xml
+++ b/documentation/poky-ref-manual/extendpoky.xml
@@ -269,7 +269,7 @@ fi
269 The following example shows the form for the two lines you need: 269 The following example shows the form for the two lines you need:
270 </para> 270 </para>
271 <programlisting> 271 <programlisting>
272IMAGE_INSTALL = "task-poky-x11-base package1 package2" 272IMAGE_INSTALL = "task-core-x11-base package1 package2"
273 273
274inherit poky-image 274inherit poky-image
275 </programlisting> 275 </programlisting>
@@ -283,11 +283,11 @@ inherit poky-image
283 </para> 283 </para>
284 <para> 284 <para>
285 The other method for creating a custom image is to modify an existing image. 285 The other method for creating a custom image is to modify an existing image.
286 For example, if a developer wants to add "strace" into "poky-image-sato", they can use 286 For example, if a developer wants to add "strace" into "core-image-sato", they can use
287 the following recipe: 287 the following recipe:
288 </para> 288 </para>
289 <programlisting> 289 <programlisting>
290require poky-image-sato.bb 290require core-image-sato.bb
291 291
292IMAGE_INSTALL += "strace" 292IMAGE_INSTALL += "strace"
293 </programlisting> 293 </programlisting>
@@ -368,8 +368,8 @@ RRECOMMENDS_task-custom-tools = "\
368 Poky ships with two SSH servers you can use in your images: Dropbear and OpenSSH. 368 Poky ships with two SSH servers you can use in your images: Dropbear and OpenSSH.
369 Dropbear is a minimal SSH server appropriate for resource-constrained environments, 369 Dropbear is a minimal SSH server appropriate for resource-constrained environments,
370 while OpenSSH is a well-known standard SSH server implementation. 370 while OpenSSH is a well-known standard SSH server implementation.
371 By default, poky-image-sato is configured to use Dropbear. 371 By default, core-image-sato is configured to use Dropbear.
372 The poky-image-basic and poky-image-lsb images both include OpenSSH. 372 The core-image-basic and core-image-lsb images both include OpenSSH.
373 To change these defaults, edit the <filename>IMAGE_FEATURES</filename> variable 373 To change these defaults, edit the <filename>IMAGE_FEATURES</filename> variable
374 so that it sets the image you are working with to include ssh-server-dropbear 374 so that it sets the image you are working with to include ssh-server-dropbear
375 or ssh-server-openssh. 375 or ssh-server-openssh.
@@ -412,7 +412,7 @@ DISTRO_EXTRA_RDEPENDS += "strace"
412 </para> 412 </para>
413 <programlisting> 413 <programlisting>
414$ bitbake -c clean task-boot task-base task-poky 414$ bitbake -c clean task-boot task-base task-poky
415$ bitbake poky-image-sato 415$ bitbake core-image-sato
416 </programlisting> 416 </programlisting>
417 </section> 417 </section>
418 418
diff --git a/documentation/poky-ref-manual/ref-bitbake.xml b/documentation/poky-ref-manual/ref-bitbake.xml
index 75b3bf5e54..df8432c91b 100644
--- a/documentation/poky-ref-manual/ref-bitbake.xml
+++ b/documentation/poky-ref-manual/ref-bitbake.xml
@@ -9,7 +9,7 @@
9 BitBake is a program written in Python that interprets the metadata that makes up Poky. 9 BitBake is a program written in Python that interprets the metadata that makes up Poky.
10 At some point, people wonder what actually happens when you enter: 10 At some point, people wonder what actually happens when you enter:
11 <literallayout class='monospaced'> 11 <literallayout class='monospaced'>
12 $ bitbake poky-image-sato 12 $ bitbake core-image-sato
13 </literallayout> 13 </literallayout>
14 </para> 14 </para>
15 15
@@ -111,11 +111,11 @@
111 111
112 <para> 112 <para>
113 Once all the <filename>.bb</filename> files have been 113 Once all the <filename>.bb</filename> files have been
114 parsed, BitBake starts to build the target (poky-image-sato in the previous section's 114 parsed, BitBake starts to build the target (core-image-sato in the previous section's
115 example) and looks for providers of that target. 115 example) and looks for providers of that target.
116 Once a provider is selected, BitBake resolves all the dependencies for 116 Once a provider is selected, BitBake resolves all the dependencies for
117 the target. 117 the target.
118 In the case of "poky-image-sato", it would lead to <filename>task-base.bb</filename>, 118 In the case of "core-image-sato", it would lead to <filename>task-base.bb</filename>,
119 which in turn leads to packages like <application>Contacts</application>, 119 which in turn leads to packages like <application>Contacts</application>,
120 <application>Dates</application> and <application>BusyBox</application>. 120 <application>Dates</application> and <application>BusyBox</application>.
121 These packages in turn depend on glibc and the toolchain. 121 These packages in turn depend on glibc and the toolchain.
diff --git a/documentation/poky-ref-manual/ref-images.xml b/documentation/poky-ref-manual/ref-images.xml
index 03cc624504..955fae59b5 100644
--- a/documentation/poky-ref-manual/ref-images.xml
+++ b/documentation/poky-ref-manual/ref-images.xml
@@ -28,41 +28,41 @@
28 <itemizedlist> 28 <itemizedlist>
29 <listitem> 29 <listitem>
30 <para> 30 <para>
31 <emphasis>poky-image-minimal</emphasis> - A small image just capable 31 <emphasis>core-image-minimal</emphasis> - A small image just capable
32 of allowing a device to boot. 32 of allowing a device to boot.
33 </para> 33 </para>
34 </listitem> 34 </listitem>
35 <listitem> 35 <listitem>
36 <para> 36 <para>
37 <emphasis>poky-image-base</emphasis> - A console-only image that fully 37 <emphasis>core-image-base</emphasis> - A console-only image that fully
38 supports the target device hardware. 38 supports the target device hardware.
39 </para> 39 </para>
40 </listitem> 40 </listitem>
41 <listitem> 41 <listitem>
42 <para> 42 <para>
43 <emphasis>poky-image-core</emphasis> - An X11 image with simple 43 <emphasis>core-image-core</emphasis> - An X11 image with simple
44 applications such as terminal, editor, and file manager. 44 applications such as terminal, editor, and file manager.
45 </para> 45 </para>
46 </listitem> 46 </listitem>
47 <listitem> 47 <listitem>
48 <para> 48 <para>
49 <emphasis>poky-image-sato</emphasis> - An X11 image with Sato theme and 49 <emphasis>core-image-sato</emphasis> - An X11 image with Sato theme and
50 Pimlico applications. 50 Pimlico applications.
51 The image also contains terminal, editor, and file manager. 51 The image also contains terminal, editor, and file manager.
52 </para> 52 </para>
53 </listitem> 53 </listitem>
54 <listitem> 54 <listitem>
55 <para> 55 <para>
56 <emphasis>poky-image-sato-dev</emphasis> - An X11 image similar to 56 <emphasis>core-image-sato-dev</emphasis> - An X11 image similar to
57 poky-image-sato but 57 core-image-sato but
58 also includes a native toolchain and libraries needed to build applications 58 also includes a native toolchain and libraries needed to build applications
59 on the device itself. The image also includes testing and profiling tools 59 on the device itself. The image also includes testing and profiling tools
60 as well as debug symbols. This image was formerly poky-image-sdk. 60 as well as debug symbols. This image was formerly core-image-sdk.
61 </para> 61 </para>
62 </listitem> 62 </listitem>
63 <listitem> 63 <listitem>
64 <para> 64 <para>
65 <emphasis>poky-image-lsb</emphasis> - An image suitable for implementations 65 <emphasis>core-image-lsb</emphasis> - An image suitable for implementations
66 that conform to Linux Standard Base (LSB). 66 that conform to Linux Standard Base (LSB).
67 </para> 67 </para>
68 </listitem> 68 </listitem>
diff --git a/documentation/yocto-project-qs/yocto-project-qs.xml b/documentation/yocto-project-qs/yocto-project-qs.xml
index 9e930cbe09..9297236356 100644
--- a/documentation/yocto-project-qs/yocto-project-qs.xml
+++ b/documentation/yocto-project-qs/yocto-project-qs.xml
@@ -289,9 +289,9 @@
289 </para> 289 </para>
290 <para> 290 <para>
291 Continue with the following command to build an OS image for the target, which is 291 Continue with the following command to build an OS image for the target, which is
292 <filename>poky-image-sato</filename> in this example. 292 <filename>core-image-sato</filename> in this example.
293 <literallayout class='monospaced'> 293 <literallayout class='monospaced'>
294 $ bitbake poky-image-sato 294 $ bitbake core-image-sato
295 </literallayout> 295 </literallayout>
296 <note><para> 296 <note><para>
297 BitBake requires Python 2.6. For more information on this requirement, 297 BitBake requires Python 2.6. For more information on this requirement,