Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

4 files changed, 17 insertions, 4 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 30ee0ae9bc..9c4efe3c22 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -211,9 +211,14 @@ PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
 PACKAGES_DYNAMIC = "${PN}-locale-*"
 FILES = ""
 
+# NB: ${base_libdir}/*${SOLIBSDEV} is included here because the shared libraries
+# in ${base_libdir} do not follow the usual *.so.* naming convention, for instance
+# libproc-3.2.7.so
 FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \
-            ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*${SOLIBS} ${datadir}/${PN} ${libdir}/${PN}/* \
+            ${base_bindir}/* ${base_sbindir}/* \
+            ${base_libdir}/*${SOLIBS} ${base_libdir}/*${SOLIBSDEV} \
+            ${datadir}/${PN} ${libdir}/${PN}/* \
             ${datadir}/pixmaps ${datadir}/applications \
             ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
             ${libdir}/bonobo/servers"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 2ba903eed3..f7e5b09541 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -14622,6 +14622,10 @@ sha256=62d5997fdb41afa9400adcdb040d04a1f5fa950045df96e3e3f593e8f0de5739
 md5=5db3204d57436a032f899ff9dbce793f
 sha256=97d0ac5957745eeaf311ec38ebbbf3b30a5316b01c320a759af47129c994c20c
 
+[http://www.lighttpd.net/download/lighttpd-1.4.22.tar.gz]
+md5=949c33a81e83f7718a47280bef21b90c
+sha256=197bd2b57c5e2b9bfc30bb565a4c44fbea82daa20a31fa8ba490dd61dad69f2a
+
 [http://www-users.cs.york.ac.uk/~aw/pylinda/dist/linda-0.6.tar.gz]
 md5=c3e1b6c428218968e2963182c1df1fdc
 sha256=cba8ac22d77bbf8f6ed4a98933242b89ee2426cbc216f54415eafcac1274547a
@@ -23210,6 +23214,10 @@ sha256=b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b
 md5=af9d9e03038481fbf79ea3ac33f116f9
 sha256=b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b
 
+[http://kernel.org/pub/linux/utils/util-linux-ng/v2.13/util-linux-ng-2.13.1.tar.bz2]
+md5=424badc1832e4b5291a2ec04e9e244f4
+sha256=e67d86683adef0855220b6f5a4b7ca2c51a15faa142e2ecd69925ede76854a4d
+
 [http://kernel.org/pub/linux/utils/util-linux-ng/v2.14/util-linux-ng-2.14.tar.bz2]
 md5=23f227da49df36f33fe47e917e332cd8
 sha256=7736d8d7d3b39654e350416585b3e00af9f55670cce8b3dddd2c2494cbaae81c
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index d1c0eda01f..6a7e1ab5aa 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -61,7 +61,7 @@ SRCREV_pn-fso-abyss ?= "0c713f42f078ae4aa3138ea487f044b9cd9d525b"
 SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
 SRCREV_pn-fso-term ?= "2cd15459c689d56e3ddde761129f4b00beab68ef"
 SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0"
-SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
+SRCREV_pn-fso-gsm0710muxd ?= "af1b80c7ded08b697730c3191d110dfd6dd872d3"
 SRCREV_pn-fso-monitord ?= "0f64979a11d6263c7b7ed0e945a0889744f295f1"
 SRCREV_pn-fso-sounds ?= "3d2cf5231cb0e81770a246530574142bd2b8bbff"
 SRCREV_pn-fstests ?= "204"
@@ -258,7 +258,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "40125"
+EFL_SRCREV ?= "40244"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/conf/machine/hipox.conf b/conf/machine/hipox.conf
index f3a31cf63b..7a2ac6f6e9 100644
--- a/conf/machine/hipox.conf
+++ b/conf/machine/hipox.conf
@@ -6,7 +6,7 @@ TARGET_ARCH = "arm"
 
 MACHINE_FEATURES = "kernel26 ext2 pci usbhost ethernet serial raid uboot"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = "115200 ttyS1"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"