diff options
| author | Khem Raj <raj.khem@gmail.com> | 2009-03-24 10:35:10 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2009-03-24 10:35:10 -0700 |
| commit | 25183a96de2634875d9720e70903f2fcb78199a3 (patch) | |
| tree | fed89bb49afb52e6aa2b67dccb126699d46f81f3 | |
| parent | c20e6cd2364611ecda9fee490840b5301c1546ce (diff) | |
| parent | 362512f7d3db15d729ecee055c9f9aa2ba68ec4b (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
82 files changed, 136543 insertions, 21932 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index b19794038c..a11c1d5691 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -13,7 +13,6 @@ PREFERRED_VERSION_gtk+ = "2.16.0" PREFERRED_VERSION_gtkmm = "2.14.1" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" -PREFERRED_VERSION_libosip2 = "2.2.2" PREFERRED_VERSION_libsdl-x11 = "1.2.11" PREFERRED_VERSION_libtool = "2.2.4" PREFERRED_VERSION_libtool-native = "2.2.4" diff --git a/conf/machine/wrap.conf b/conf/machine/wrap.conf index 1fc75ebe94..8dbd6619d9 100644 --- a/conf/machine/wrap.conf +++ b/conf/machine/wrap.conf @@ -3,7 +3,8 @@ #@DESCRIPTION: Machine configuration for the PC Engines WRAP (Wireless Router Application Platform) boards. TARGET_ARCH = "i486" -PACKAGE_EXTRA_ARCHS = "i386 x86" + +require conf/machine/include/tune-x86.inc PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" diff --git a/docs/usermanual/chapters/common_use_cases.xml b/docs/usermanual/chapters/common_use_cases.xml index 4497683fa9..143cbe0fe7 100644 --- a/docs/usermanual/chapters/common_use_cases.xml +++ b/docs/usermanual/chapters/common_use_cases.xml @@ -252,10 +252,10 @@ export LOCALDIR=$PWD/secret-isv <screen> DL_DIR = "${OEDIR}/sources" -BBFILES := "${OEDIR}/openembedded/packages/*/*.bb ${LOCALDIR}/packages/*/*.bb" +BBFILES := "${OEDIR}/openembedded/recipes/*/*.bb ${LOCALDIR}/recipes/*/*.bb" BBFILE_COLLECTIONS = "upstream local" -BBFILE_PATTERN_upstream = "^${OEDIR}/openembedded/packages/" -BBFILE_PATTERN_local = "^${LOCALDIR}/packages/" +BBFILE_PATTERN_upstream = "^${OEDIR}/openembedded/recipes/" +BBFILE_PATTERN_local = "^${LOCALDIR}/recipes/" BBFILE_PRIORITY_upstream = "5" BBFILE_PRIORITY_local = "10" BBMASK = "" diff --git a/docs/usermanual/chapters/features.xml b/docs/usermanual/chapters/features.xml index 8eecaa9ed4..3cbf1d8d1d 100644 --- a/docs/usermanual/chapters/features.xml +++ b/docs/usermanual/chapters/features.xml @@ -39,10 +39,10 @@ <para>This section is a stub, help us by expanding it</para> <para><screen> -BBFILES := "${OEDIR}/openembedded/packages/*/*.bb ${LOCALDIR}/packages/*/*.bb" +BBFILES := "${OEDIR}/openembedded/recipes/*/*.bb ${LOCALDIR}/recipes/*/*.bb" BBFILE_COLLECTIONS = "upstream local" -BBFILE_PATTERN_upstream = "^${OEDIR}/openembedded/packages/" -BBFILE_PATTERN_local = "^${LOCALDIR}/packages/" +BBFILE_PATTERN_upstream = "^${OEDIR}/openembedded/recipes/" +BBFILE_PATTERN_local = "^${LOCALDIR}/recipes/" BBFILE_PRIORITY_upstream = "5" BBFILE_PRIORITY_local = "10" </screen></para> @@ -75,4 +75,4 @@ MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget" <para>This section is a stub, help us by expanding it</para> </section> -</chapter>
\ No newline at end of file +</chapter> diff --git a/docs/usermanual/chapters/getting_oe.xml b/docs/usermanual/chapters/getting_oe.xml index d71ea71e72..ed7fd11005 100644 --- a/docs/usermanual/chapters/getting_oe.xml +++ b/docs/usermanual/chapters/getting_oe.xml @@ -232,7 +232,7 @@ $ vi build/conf/local.conf</screen> distribution and the Openmoko gta01 machine: <screen> -BBFILES = "${OEBASE}/openembedded/packages/*/*.bb" +BBFILES = "${OEBASE}/openembedded/recipes/*/*.bb" DISTRO = "angstrom-2008.1" MACHINE = "om-gta01"</screen> </para> @@ -297,11 +297,11 @@ MACHINE = "om-gta01"</screen> <para>To build a single package, bypassing the long parse step (and therefore its dependencies -- use with care): - <screen>$ bitbake -b $OEBASE/openembedded/packages/blah/blah.bb</screen> + <screen>$ bitbake -b $OEBASE/openembedded/recipes/blah/blah.bb</screen> </para> <para>There are a few groups of special recipes located in subdirectories - of the <filename>$OEBASE/openembedded/packages/</filename> + of the <filename>$OEBASE/openembedded/recipes/</filename> directory. These groups are: <variablelist> diff --git a/docs/usermanual/chapters/metadata.xml b/docs/usermanual/chapters/metadata.xml index 54fb523553..3e76b2ddbb 100644 --- a/docs/usermanual/chapters/metadata.xml +++ b/docs/usermanual/chapters/metadata.xml @@ -65,7 +65,7 @@ </varlistentry> <varlistentry> - <term><filename>packages/</filename></term> + <term><filename>recipes/</filename></term> <listitem> <para>Conatins all of the <application>BitBake</application> <filename>.bb</filename> diff --git a/docs/usermanual/chapters/recipes.xml b/docs/usermanual/chapters/recipes.xml index c1ca456fa0..11078735eb 100644 --- a/docs/usermanual/chapters/recipes.xml +++ b/docs/usermanual/chapters/recipes.xml @@ -1081,9 +1081,9 @@ ${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"</screen></para> <para>First we'll create the myhelloworld.c file and a readme file. We'll place this in the files subdirectory, which is one of the places - that is searched for file:// URI's:<screen>mkdir packages/myhelloworld -mkdir packages/myhelloworld/files -cat > packages/myhelloworld/files/myhelloworld.c + that is searched for file:// URI's:<screen>mkdir recipes/myhelloworld +mkdir recipes/myhelloworld/files +cat > recipes/myhelloworld/files/myhelloworld.c #include <stdio.h> int main(int argc, char** argv) @@ -1092,11 +1092,11 @@ int main(int argc, char** argv) return 0; } ^D -cat > packages/myhelloworld/files/README.txt +cat > recipes/myhelloworld/files/README.txt Readme file for myhelloworld. ^D</screen></para> - <para>Now we have a directory for our recipe, packages/myhelloworld, and + <para>Now we have a directory for our recipe, recipes/myhelloworld, and we've created a files subdirectory in there to store our local files. We've created two local files, the C source code for our helloworld program and a readme file. Now we need to create the bitbake @@ -1186,7 +1186,7 @@ PR = "r0"</screen></para> </itemizedlist> <para>We'll consider this release 0 and version 0.1 of a program called - helloworld. So we'll name the recipe myhelloworld_0.1.bb:<screen>cat > packages/myhelloworld/myhelloworld_0.1.bb + helloworld. So we'll name the recipe myhelloworld_0.1.bb:<screen>cat > recipes/myhelloworld/myhelloworld_0.1.bb DESCRIPTION = "Hello world program" PR = "r0" @@ -1203,13 +1203,13 @@ do_install() { install -m 0644 ${WORKDIR}/README.txt ${D}${docdir}/myhelloworld } ^D</screen>Now we are ready to build our package, hopefully it'll all work - since it's such a simple example:<screen>~/oe%> bitbake -b packages/myhelloworld/myhelloworld_0.1.bb + since it's such a simple example:<screen>~/oe%> bitbake -b recipes/myhelloworld/myhelloworld_0.1.bb NOTE: package myhelloworld-0.1: started NOTE: package myhelloworld-0.1-r0: task do_fetch: started NOTE: package myhelloworld-0.1-r0: task do_fetch: completed NOTE: package myhelloworld-0.1-r0: task do_unpack: started -NOTE: Unpacking /home/lenehan/devel/oe/local-packages/myhelloworld/files/helloworld.c to /home/lenehan/devel/oe/build/titan-glibc-25/tmp/work/myhelloworld-0.1-r0/ -NOTE: Unpacking /home/lenehan/devel/oe/local-packages/myhelloworld/files/README.txt to /home/lenehan/devel/oe/build/titan-glibc-25/tmp/work/myhelloworld-0.1-r0/ +NOTE: Unpacking /home/lenehan/devel/oe/local-recipes/myhelloworld/files/helloworld.c to /home/lenehan/devel/oe/build/titan-glibc-25/tmp/work/myhelloworld-0.1-r0/ +NOTE: Unpacking /home/lenehan/devel/oe/local-recipes/myhelloworld/files/README.txt to /home/lenehan/devel/oe/build/titan-glibc-25/tmp/work/myhelloworld-0.1-r0/ NOTE: package myhelloworld-0.1-r0: task do_unpack: completed NOTE: package myhelloworld-0.1-r0: task do_patch: started NOTE: package myhelloworld-0.1-r0: task do_patch: completed @@ -1354,7 +1354,7 @@ tmp/work/myhelloworld-0.1-r0/install/myhelloworld/usr/bin/myhelloworld: ELF 32-b of building an autotools based packages.</para> <para>Let's take a look at the tuxnes recipe which is an example of a - very simple autotools based recipe:<screen>%~oe> cat packages/tuxnes/tuxnes_0.75.bb + very simple autotools based recipe:<screen>%~oe> cat recipes/tuxnes/tuxnes_0.75.bb DESCRIPTION = "Tuxnes Nintendo (8bit) Emulator" HOMEPAGE = "http://prdownloads.sourceforge.net/tuxnes/tuxnes-0.75.tar.gz" LICENSE = "GPLv2" @@ -3366,7 +3366,7 @@ do_configure() { via the <command>PV</command> variable).</para> <para>For example if we were to ask bitbake to build procps and the - following packages are available:<screen>~/oe%> ls packages/procps + following packages are available:<screen>~/oe%> ls recipes/procps procps-3.1.15/ procps-3.2.1/ procps-3.2.5/ procps-3.2.7/ procps.inc procps_3.1.15.bb procps_3.2.1.bb procps_3.2.5.bb procps_3.2.7.bb ~/oe%></screen>then we would expect it to select version @@ -3397,7 +3397,7 @@ procps_3.1.15.bb procps_3.2.1.bb procps_3.2.5.bb procps_3.2.7.bb version until it works. By adding:<screen>DEFAULT_PREFERENCE = "-1"</screen>to the recipe this is what will happen. Bitbake will now ignore this version (since all of the existing versions have a preference of 0). Note that you - can still call bitbake directly on the recipe:<screen>bitbake -b packages/procps/procps_4.0.0.bb</screen>This + can still call bitbake directly on the recipe:<screen>bitbake -b recipes/procps/procps_4.0.0.bb</screen>This enables you to test, and fix the package manually without having bitbake automatically select normally.</para> @@ -3406,7 +3406,7 @@ procps_3.1.15.bb procps_3.2.1.bb procps_3.2.5.bb procps_3.2.7.bb example from glibc shows that this version has been disabled for the sh3 architecture because it doesn't support sh3. This will force bitbake to try and select one of the other available versions of glibc - instead:<screen>packages/glibc/glibc_2.3.2+cvs20040726.bb:DEFAULT_PREFERENCE_sh3 = "-99"</screen></para> + instead:<screen>recipes/glibc/glibc_2.3.2+cvs20040726.bb:DEFAULT_PREFERENCE_sh3 = "-99"</screen></para> </section> <section id="recipes_initscripts" xreflabel="initscripts"> @@ -3634,7 +3634,7 @@ which find <listitem> <para>The only directories that you can assume exist are those listed in the default volatiles file: - <command>packages/initscripts/initscripts-1.0/volatiles</command>.</para> + <command>recipes/initscripts/initscripts-1.0/volatiles</command>.</para> </listitem> <listitem> @@ -3707,4 +3707,4 @@ which find <para></para> </section> -</chapter>
\ No newline at end of file +</chapter> diff --git a/docs/usermanual/chapters/usage.xml b/docs/usermanual/chapters/usage.xml index 9fe20faf8c..5dd00d68e5 100644 --- a/docs/usermanual/chapters/usage.xml +++ b/docs/usermanual/chapters/usage.xml @@ -574,51 +574,51 @@ NOTE: Resolving missing task queue dependencies NOTE: preferred version 2.5 of glibc not available (for item virtual/sh4-linux-libc-for-gcc) NOTE: Preparing Runqueue NOTE: Executing runqueue -NOTE: Running task 208 of 226 (ID: 11, /home/lenehan/devel/oe/build/titan-glibc-25/packages/lzo/lzo_1.08.bb, <emphasis +NOTE: Running task 208 of 226 (ID: 11, /home/lenehan/devel/oe/build/titan-glibc-25/recipes/lzo/lzo_1.08.bb, <emphasis role="bold">do_fetch</emphasis>) NOTE: package lzo-1.08: started NOTE: package lzo-1.08-r14: task <emphasis role="bold">do_fetch</emphasis>: started NOTE: package lzo-1.08-r14: task <emphasis role="bold">do_fetch</emphasis>: completed NOTE: package lzo-1.08: completed -NOTE: Running task 209 of 226 (ID: 2, /home/lenehan/devel/oe/build/titan-glibc-25/packages/lzo/lzo_1.08.bb, <emphasis +NOTE: Running task 209 of 226 (ID: 2, /home/lenehan/devel/oe/build/titan-glibc-25/recipes/lzo/lzo_1.08.bb, <emphasis role="bold">do_unpack</emphasis>) NOTE: package lzo-1.08: started NOTE: package lzo-1.08-r14: task <emphasis role="bo |