Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev

8 files changed, 39 insertions, 25 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index d72c2d50a7..c07d11116d 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -3274,6 +3274,10 @@ sha256=2d1c6b2cfdc17d6348f25f0830e1fa5c1c1dd3f014caff74005294c9ed6a0cbf
 md5=77a1ba78f37bdd7f024b67e1e36ad151
 sha256=c674f1182f4c20f1e6d038feceb0a6617fc3e7658dfbbac89396043b49612a26
 
+[http://sodium.resophonic.com/boost-cmake/1.40.0.cmake2/boost-1.40.0.cmake2.tar.gz]
+md5=1a0926fe4c8228f14a2622b4182b801e
+sha256=ce6e6c3a6b9a3e7695cb7a0f83d4dbb58f1fb246eb706e3caf3fce3b77e186c0
+
 [http://downloads.sourceforge.net/boost/boost-jam-3.1.11.tgz]
 md5=b86fb56a824d4a3dedcbda12f8b1a2b3
 sha256=6cdb945ac41b5ac78e05435e742b3a9928e5d1a5ff22728656deff29249edc66
@@ -3322,10 +3326,6 @@ sha256=9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef
 md5=328bfec66c312150e4c2a78dcecb504b
 sha256=9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef
 
-[http://sodium.resophonic.com/boost-cmake/1.40.0.cmake2/boost-1.40.0.cmake2.tar.gz]
-md5=1a0926fe4c8228f14a2622b4182b801e
-sha256=ce6e6c3a6b9a3e7695cb7a0f83d4dbb58f1fb246eb706e3caf3fce3b77e186c0
-
 [http://downloads.sourceforge.net/asio/boost_asio_0_3_7.tar.bz2]
 md5=e006cde4b4a28cfce95e43710cd126a9
 sha256=ade3663edc611d558f5a383abccd0a9ab87d6168f422ef4c2a38775e8b7ca575
@@ -26334,6 +26334,10 @@ sha256=16971189b3cb95648b9574eb7c4c7cc0dff9978458aff7f3f7c54ab823ada721
 md5=7d11fcddb2bd30b9ecbdacfaa20f2769
 sha256=ebb1afbb0a61dd8f5f8ef13512e789697e98d5ad5f98739120f3b3cc02d46d8f
 
+[http://download.gnome.org/sources/vala/0.7/vala-0.7.8.tar.bz2]
+md5=accd0d350c6d6de7527a0a65c40f8be2
+sha256=b2daf636d95ef66ffd5132eacf18335073b71bfaa18f7ad06f25bcf9673aa747
+
 [http://ftp.acc.umu.se/pub/GNOME/sources/vala/0.7/vala-0.7.8.tar.bz2]
 md5=accd0d350c6d6de7527a0a65c40f8be2
 sha256=b2daf636d95ef66ffd5132eacf18335073b71bfaa18f7ad06f25bcf9673aa747
diff --git a/docs/usermanual/chapters/getting_oe.xml b/docs/usermanual/chapters/getting_oe.xml
index e8d1f2cc9d..4ec5fecb1f 100644
--- a/docs/usermanual/chapters/getting_oe.xml
+++ b/docs/usermanual/chapters/getting_oe.xml
@@ -30,9 +30,9 @@ $ <command>cd</command> $OEBASE</screen>
 	you to build your applications and images.
     </para>
 
-	<para>The <varname>$OEBASE</varname> will also contain both bitbake/ and
-	openembedded/ directories. These will be discussed in
-	<xref linkend="gettingoe_getting_bitbake"/> and
+	<para>The <varname>$OEBASE</varname> will also contain both of the
+	<literal>bitbake/<literal> and <literal>openembedded/</literal> directories.
+	These will be discussed in <xref linkend="gettingoe_getting_bitbake"/> and
 	<xref linkend="gettingoe_getting_oe"/>.
 	</para>
   </section>
@@ -47,19 +47,19 @@ $ <command>cd</command> $OEBASE</screen>
     directory of <literal>openembedded/</literal>
     and <literal>build/</literal> directories. Indeed, as bitbake is written
     in python it does not need compilation for being used. You'll just have to
-    set the PATH variable so that the BitBake tools are accessible (see
-    <xref linkend="gettingoe_configuring_oe"/>).</para>
+    set the <varname>PATH</varname> variable so that the BitBake tools are
+    accessible (see <xref linkend="gettingoe_configuring_oe"/>).</para>
 
 	<section><title>Downloading a <application>BitBake</application> release</title>
 	  <para>Releases are available from the berlios project website. The current
           release series is <application>BitBake</application> <emphasis>1.8</emphasis>
-          and the current release is <emphasis>1.8.12</emphasis>. To download execute
+          and the current release is <emphasis>1.8.16</emphasis>. To download execute
 	  the following commands:
 		<screen>
 $ <command>cd</command> $OEBASE
-$ <command>wget</command>http://download.berlios.de/bitbake/bitbake-1.8.12.tar.gz
-$ <command>tar</command> -xvzf bitbake-1.8.12.tar.gz
-$ <command>mv</command> bitbake-1.8.12 bitbake
+$ <command>wget</command> http://download.berlios.de/bitbake/bitbake-1.8.16.tar.gz
+$ <command>tar</command> -xvzf bitbake-1.8.16.tar.gz
+$ <command>mv</command> bitbake-1.8.16 bitbake
 </screen>
 	  </para>
 
@@ -257,7 +257,13 @@ MACHINE = "om-gta01"</screen>
         If your system does not provide
         the <filename>/etc/sysctl.conf</filename> mechanism, you can try adding
         the above <command>echo</command> command line to
-        your <filename>/etc/rc.local</filename>.
+        your <filename>/etc/rc.local</filename>.  But that's not all.
+
+        On some systems (such as Fedora 11), changing that kernel setting
+        will cause an SELinux violation if you're running SELinux in enforcing
+        mode. If that's the case, you can either disable SELinux or run:
+
+        <screen>$ setsebool -P allow_unconfirmed_mmap_low 1</screen>
       </para>
     </note>
 
@@ -270,7 +276,7 @@ MACHINE = "om-gta01"</screen>
       BitBake file is a logical unit of tasks to be executed. Normally this is
       a package to be built. Inter-recipe dependencies are obeyed. The recipes
       are located by BitBake via the <varname>BBFILES</varname> variable (set
-      in your <filename>$OEBASE/build/conf/local/conf</filename>), which is a
+      in your <filename>$OEBASE/build/conf/local.conf</filename>), which is a
       space separated list of <filename>.bb</filename> files, and does handle
       wildcards.
     </para>
diff --git a/docs/usermanual/chapters/introduction.xml b/docs/usermanual/chapters/introduction.xml
index 31f1f1f516..28e7725add 100644
--- a/docs/usermanual/chapters/introduction.xml
+++ b/docs/usermanual/chapters/introduction.xml
@@ -30,7 +30,7 @@
         </listitem>
 
         <listitem>
-          <para>Must be able to emit packages (tar, rpm, deb,ipk)</para>
+          <para>Must be able to emit packages (tar, rpm, deb, ipk)</para>
         </listitem>
 
         <listitem>
diff --git a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
index f21bf99645..8fc80a64f1 100644
--- a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
+++ b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
@@ -1,6 +1,9 @@
+require squashfs-tools_${PV}.bb
+
 inherit native
 
-require squashfs-tools_${PV}.bb
+DEPENDS = "zlib-native lzma-native "
+
 PR = "${INC_PR}.1"
 
 PACKAGES = ""
diff --git a/recipes/squashfs-tools/squashfs-tools_4.0.bb b/recipes/squashfs-tools/squashfs-tools_4.0.bb
index a4503fcf0f..17ab6dc61b 100644
--- a/recipes/squashfs-tools/squashfs-tools_4.0.bb
+++ b/recipes/squashfs-tools/squashfs-tools_4.0.bb
@@ -7,6 +7,8 @@ EXTRA_OEMAKE = "USE_LZMA=1 \
                 LZMA_LIB='${STAGING_LIBDIR}/liblzma.a'"
 
 DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_angstrom = "1"
+
 SRC_URI += " file://portability.patch;patch=1;pnum=2 \
              file://lzma-support.patch;patch=1;pnum=2"
 
diff --git a/recipes/transmission/transmission.inc b/recipes/transmission/transmission.inc
index 7f3ca2a035..9c8b395b07 100644
--- a/recipes/transmission/transmission.inc
+++ b/recipes/transmission/transmission.inc
@@ -3,7 +3,7 @@ SECTION = "network"
 HOMEPAGE = "www.transmissionbt.com/"
 DEPENDS = "gtk+ gnutls openssl gettext libtool intltool-native curl glib-2.0-native"
 LICENSE = "GPLv2"
-PR = "r3"
+PR = "r4"
 SRC_URI = "http://mirrors.m0k.org/transmission/files/transmission-${PV}.tar.bz2 \
            file://init \
            file://config"
@@ -21,12 +21,12 @@ do_install_append() {
 	install -d ${D}${localstatedir}/lib/transmission-daemon
 }
 
-PACKAGES =+ "${PN}-daemon ${PN}-client"
+PACKAGES += "${PN}-gui ${PN}-client"
 
-FILES_${PN}-daemon = "${bindir}/transmission-daemon ${datadir}/transmission ${sysconfdir} ${localstatedir}/lib/${PN}-daemon"
+FILES_${PN} = "${bindir}/transmission-daemon ${datadir}/transmission ${sysconfdir} ${localstatedir}/lib/${PN}-daemon"
 FILES_${PN}-client = "${bindir}/transmissioncli ${bindir}/transmission-remote"
-FILES_${PN} += "${datadir}/icons"
-CONFFILES_${PN}-daemon = "${sysconfdir}/default/transmission-daemon"
+FILES_${PN}-gui += "${bindir}/transmission ${datadir}/icons ${datadir}/applications ${datadir}/pixmaps"
+CONFFILES_${PN} = "${sysconfdir}/default/transmission-daemon"
 
 # No need for online check, since update-rc.d will prepend it to here
 pkg_postinst_${PN}() {
@@ -39,4 +39,3 @@ pkg_postrm_${PN}() {
 delgroup transmission
 deluser transmission
 }
-
diff --git a/recipes/vala/vala-native_0.7.8.bb b/recipes/vala/vala-native_0.7.8.bb
index 0be4626488..7a5cad2d30 100644
--- a/recipes/vala/vala-native_0.7.8.bb
+++ b/recipes/vala/vala-native_0.7.8.bb
@@ -5,4 +5,4 @@ PR = "r0"
 
 DEPENDS = "glib-2.0-native"
 
-SRC_URI = "http://download.gnome.org/sources/vala/0.7/vala-${PV}.tar.bz2"
+SRC_URI = "${GNOME_MIRROR}/vala/0.7/vala-${PV}.tar.bz2"
diff --git a/recipes/vala/vala_0.7.8.bb b/recipes/vala/vala_0.7.8.bb
index 0b93248116..2d0b5b7765 100644
--- a/recipes/vala/vala_0.7.8.bb
+++ b/recipes/vala/vala_0.7.8.bb
@@ -1,4 +1,4 @@
 require vala.inc
 PR = "r0"
 
-SRC_URI = "http://download.gnome.org/sources/vala/0.7/vala-${PV}.tar.bz2"
+SRC_URI = "${GNOME_MIRROR}/vala/0.7/vala-${PV}.tar.bz2"