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

21 files changed, 153 insertions, 60 deletions

diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index e947833453..2a1b7b059c 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -1,9 +1,10 @@
 # eglibc:
 require conf/distro/include/eglibc.inc
 
-TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
+TARGET_OS = "linux"
 
-TARGET_OS = "linux${@['','-gnuspe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', 'powerpc'] and bb.data.getVar('MACHINE',d) in ['calamari']]}"
+TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
+TARGET_OS .= "${@['','-gnuspe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', 'powerpc'] and bb.data.getVar('MACHINE',d) in ['calamari']]}"
 
 #TARGET_OS = "linux-gnuspe"
 
diff --git a/recipes/libtool/libtool-cross_1.5.10.bb b/recipes/libtool/libtool-cross_1.5.10.bb
index 256e71c05a..910ff12066 100644
--- a/recipes/libtool/libtool-cross_1.5.10.bb
+++ b/recipes/libtool/libtool-cross_1.5.10.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
diff --git a/recipes/libtool/libtool-cross_1.5.22.bb b/recipes/libtool/libtool-cross_1.5.22.bb
index 949031146c..b0cee4eebb 100644
--- a/recipes/libtool/libtool-cross_1.5.22.bb
+++ b/recipes/libtool/libtool-cross_1.5.22.bb
@@ -1,6 +1,5 @@
 DEFAULT_PREFERENCE = "-1"
 
-require libtool.inc
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
diff --git a/recipes/libtool/libtool-cross_1.5.24.bb b/recipes/libtool/libtool-cross_1.5.24.bb
index 2a7e4d7288..1f8527873f 100644
--- a/recipes/libtool/libtool-cross_1.5.24.bb
+++ b/recipes/libtool/libtool-cross_1.5.24.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
diff --git a/recipes/libtool/libtool-cross_2.2.4.bb b/recipes/libtool/libtool-cross_2.2.4.bb
index e2c6bbeb6a..31a67f5bd1 100644
--- a/recipes/libtool/libtool-cross_2.2.4.bb
+++ b/recipes/libtool/libtool-cross_2.2.4.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 PR = "${INC_PR}.0"
 
@@ -22,11 +21,6 @@ prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
 exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
-# skip ac_cv_... setting for cross build: host paths must be used
-do_configure_prepend () {
-	export LIBTOOL_BB_DO_NOT_SET_PATHS=1
-}
-
 do_compile () {
 	:
 }
diff --git a/recipes/libtool/libtool-cross_2.2.6a.bb b/recipes/libtool/libtool-cross_2.2.6a.bb
index b26e7cc26a..23c16829ab 100644
--- a/recipes/libtool/libtool-cross_2.2.6a.bb
+++ b/recipes/libtool/libtool-cross_2.2.6a.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 PR = "${INC_PR}.0"
 
@@ -20,11 +19,6 @@ prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
 exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
-# skip ac_cv_... setting for cross build: host paths must be used
-do_configure_prepend () {
-	export LIBTOOL_BB_DO_NOT_SET_PATHS=1
-}
-
 do_compile () {
 	:
 }
diff --git a/recipes/libtool/libtool-native_1.5.10.bb b/recipes/libtool/libtool-native_1.5.10.bb
index 362aea22f7..76cbb4baf0 100644
--- a/recipes/libtool/libtool-native_1.5.10.bb
+++ b/recipes/libtool/libtool-native_1.5.10.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
diff --git a/recipes/libtool/libtool-native_1.5.22.bb b/recipes/libtool/libtool-native_1.5.22.bb
index 4d660f4965..3aadb2be01 100644
--- a/recipes/libtool/libtool-native_1.5.22.bb
+++ b/recipes/libtool/libtool-native_1.5.22.bb
@@ -1,6 +1,5 @@
 DEFAULT_PREFERENCE = "-1"
 
-require libtool.inc
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
diff --git a/recipes/libtool/libtool-native_1.5.24.bb b/recipes/libtool/libtool-native_1.5.24.bb
index 95368819bb..f767afcd63 100644
--- a/recipes/libtool/libtool-native_1.5.24.bb
+++ b/recipes/libtool/libtool-native_1.5.24.bb
@@ -1,6 +1,5 @@
 SECTION = "devel"
 
-require libtool.inc
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
diff --git a/recipes/libtool/libtool-native_2.2.4.bb b/recipes/libtool/libtool-native_2.2.4.bb
index 06564c74c3..a7ad685909 100644
--- a/recipes/libtool/libtool-native_2.2.4.bb
+++ b/recipes/libtool/libtool-native_2.2.4.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 PR = "${INC_PR}.0"
 
diff --git a/recipes/libtool/libtool-native_2.2.6a.bb b/recipes/libtool/libtool-native_2.2.6a.bb
index e699a2f33c..082663a280 100644
--- a/recipes/libtool/libtool-native_2.2.6a.bb
+++ b/recipes/libtool/libtool-native_2.2.6a.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 PR = "${INC_PR}.0"
 
diff --git a/recipes/libtool/libtool-sdk_1.5.10.bb b/recipes/libtool/libtool-sdk_1.5.10.bb
index 21e408dc73..ac188bdecd 100644
--- a/recipes/libtool/libtool-sdk_1.5.10.bb
+++ b/recipes/libtool/libtool-sdk_1.5.10.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
diff --git a/recipes/libtool/libtool-sdk_2.2.4.bb b/recipes/libtool/libtool-sdk_2.2.4.bb
index 0e9ae9b66e..c934a6e390 100644
--- a/recipes/libtool/libtool-sdk_2.2.4.bb
+++ b/recipes/libtool/libtool-sdk_2.2.4.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
@@ -9,11 +8,6 @@ S = "${WORKDIR}/libtool-${PV}"
 
 inherit sdk
 
-# skip ac_cv_... setting for cross build: host paths must be used
-do_configure_prepend () {
-	export LIBTOOL_BB_DO_NOT_SET_PATHS=1
-}
-
 do_install () {
 	install -d ${D}${bindir}/
 	install -m 0755 libtool ${D}${bindir}/
diff --git a/recipes/libtool/libtool-sdk_2.2.6a.bb b/recipes/libtool/libtool-sdk_2.2.6a.bb
index 263879beeb..7e269ef381 100644
--- a/recipes/libtool/libtool-sdk_2.2.6a.bb
+++ b/recipes/libtool/libtool-sdk_2.2.6a.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
@@ -6,11 +5,6 @@ SRC_URI_append = " file://cross_compile.patch;patch=1"
 
 inherit sdk
 
-# skip ac_cv_... setting for cross build: host paths must be used
-do_configure_prepend () {
-	export LIBTOOL_BB_DO_NOT_SET_PATHS=1
-}
-
 do_install () {
 	install -d ${D}${bindir}/
 	install -m 0755 libtool ${D}${bindir}/
diff --git a/recipes/libtool/libtool.inc b/recipes/libtool/libtool.inc
index 9cc74010c6..838f029236 100644
--- a/recipes/libtool/libtool.inc
+++ b/recipes/libtool/libtool.inc
@@ -6,6 +6,16 @@ HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
 LICENSE = "GPL"
 SECTION = "devel"
 
-INC_PR = "r24"
+INC_PR = "r25"
 
 FILESPATHPKG=. "libtool-${PV}:"
+
+do_configure_prepend () {
+	if ${@['true', 'false'][bb.data.inherits_class('native', d) or bb.data.inherits_class('sdk', d) or (bb.data.getVar('PN', d, 1) == 'libtool-cross')]}
+	then
+		export ac_cv_path_SED="${ac_cv_path_SED=${base_bindir}/sed}"
+		export ac_cv_path_GREP="${ac_cv_path_GREP=${base_bindir}/grep}"
+		export ac_cv_path_EGREP="${ac_cv_path_EGREP=${base_bindir}/grep -E}"
+		export ac_cv_path_FGREP="${ac_cv_path_FGREP=${base_bindir}/grep -F}"
+	fi
+}
diff --git a/recipes/libtool/libtool_2.2.4.bb b/recipes/libtool/libtool_2.2.4.bb
index 6de7336406..65c2d178ab 100644
--- a/recipes/libtool/libtool_2.2.4.bb
+++ b/recipes/libtool/libtool_2.2.4.bb
@@ -14,18 +14,6 @@ inherit autotools
 
 EXTRA_AUTORECONF = "--exclude=libtoolize"
 
-do_configure_prepend () {
-	# Skip this for native build:
-	if test -n "$CONFIG_SITE" ; then
-	if test -z "$LIBTOOL_BB_DO_NOT_SET_PATHS" ; then
-			export ac_cv_path_SED="${ac_cv_path_SED=/bin/sed}"
-			export ac_cv_path_GREP="${ac_cv_path_GREP=/bin/grep}"
-			export ac_cv_path_EGREP="${ac_cv_path_EGREP=/bin/grep -E}"
-			export ac_cv_path_FGREP="${ac_cv_path_FGREP=/bin/grep -F}"
-		fi
-	fi
-}
-
 do_stage () {
        install -d ${STAGING_INCDIR}/libltdl
        install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
diff --git a/recipes/libtool/libtool_2.2.6a.bb b/recipes/libtool/libtool_2.2.6a.bb
index c69a937f16..0595613159 100644
--- a/recipes/libtool/libtool_2.2.6a.bb
+++ b/recipes/libtool/libtool_2.2.6a.bb
@@ -16,18 +16,6 @@ inherit autotools
 
 EXTRA_AUTORECONF = "--exclude=libtoolize"
 
-do_configure_prepend () {
-	# Skip this for native build:
-	if test -n "$CONFIG_SITE" ; then
-	if test -z "$LIBTOOL_BB_DO_NOT_SET_PATHS" ; then
-			export ac_cv_path_SED="${ac_cv_path_SED=/bin/sed}"
-			export ac_cv_path_GREP="${ac_cv_path_GREP=/bin/grep}"
-			export ac_cv_path_EGREP="${ac_cv_path_EGREP=/bin/grep -E}"
-			export ac_cv_path_FGREP="${ac_cv_path_FGREP=/bin/grep -F}"
-		fi
-	fi
-}
-
 do_stage () {
        install -d ${STAGING_INCDIR}/libltdl
        install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
diff --git a/recipes/shr/frameworkd-config-shr_git.bb b/recipes/shr/frameworkd-config-shr_git.bb
new file mode 100644
index 0000000000..0727091f0b
--- /dev/null
+++ b/recipes/shr/frameworkd-config-shr_git.bb
@@ -0,0 +1,87 @@
+DESCRIPTION = "SHR Configuration for frameworkd"
+HOMEPAGE = "http://www.freesmartphone.org"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de> et. al."
+SECTION = "console/network"
+DEPENDS = "python-cython-native python-pyrex-native"
+LICENSE = "GPL"
+SRCREV_FORMAT = "gitrFSO_REV-SHR_REV"
+PV = "0.9.5.9+${SRCREV}"
+PR = "r7"
+
+SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master;name=FSO_REV \
+           git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master;name=SHR_REV"
+S = "${WORKDIR}/git"
+
+PROVIDES_${PN} = "frameworkd-config"
+RPROVIDES_${PN} = "frameworkd-config"
+CONF_PATH = "${S}/frameworkd/${PN}"
+
+do_install_append() {
+	install -d ${D}${sysconfdir}
+	install -d ${D}${sysconfdir}/freesmartphone/opreferences/schema/
+	install -d ${D}${sysconfdir}/freesmartphone/opreferences/conf/profiles/
+	install -d ${D}${sysconfdir}/freesmartphone/opreferences/conf/phone/
+	install -d ${D}${sysconfdir}/freesmartphone/opreferences/conf/rules/
+	install -d ${D}${sysconfdir}/freesmartphone/oevents/
+	install -d ${D}${sysconfdir}/freesmartphone/ogsmd/
+	install -d ${D}${sysconfdir}/freesmartphone/persist/
+        install -d ${D}${sysconfdir}/freesmartphone/opim/
+	install -m 0644 ${S}/etc/freesmartphone/opreferences/schema/phone.yaml ${D}${sysconfdir}/freesmartphone/opreferences/schema/
+	install -m 0644 ${S}/etc/freesmartphone/opreferences/schema/profiles.yaml ${D}${sysconfdir}/freesmartphone/opreferences/schema/
+	install -m 0644 ${S}/etc/freesmartphone/opreferences/schema/rules.yaml ${D}${sysconfdir}/freesmartphone/opreferences/schema/
+	install -m 0644 ${S}/etc/freesmartphone/persist/README ${D}${sysconfdir}/freesmartphone/persist/
+	install -m 0644 ${S}/etc/freesmartphone/ogsmd/networks.tab ${D}${sysconfdir}/freesmartphone/ogsmd/
+        install -m 0644 ${S}/etc/freesmartphone/ogsmd/cell.db ${D}${sysconfdir}/freesmartphone/ogsmd/
+        install -m 0644 ${S}/etc/freesmartphone/ogsmd/la.db ${D}${sysconfdir}/freesmartphone/ogsmd/
+
+	#Check for machine specific conf.
+        CONF_PATH_MACHINE="${CONF_PATH}"
+        if [ -d "${CONF_PATH}/${MACHINE}" ] ; then
+                CONF_PATH_MACHINE="${CONF_PATH}/${MACHINE}"
+        fi
+        # Install SHR custom files
+        install -m 0644 ${CONF_PATH_MACHINE}/frameworkd.conf ${D}${sysconfdir}
+        install -m 0644 ${CONF_PATH_MACHINE}/rules.yaml ${D}${sysconfdir}/freesmartphone/oevents/
+        install -m 0644 ${CONF_PATH}/profiles/profiles/default.yaml ${D}${sysconfdir}/freesmartphone/opreferences/conf/profiles/
+
+        install -m 0644 ${CONF_PATH}/profiles/phone/default.yaml ${D}${sysconfdir}/freesmartphone/opreferences/conf/phone/
+        install -m 0644 ${CONF_PATH}/profiles/rules/default.yaml ${D}${sysconfdir}/freesmartphone/opreferences/conf/rules/
+
+        install -m 0644 ${CONF_PATH}/profiles/phone/ring.yaml ${D}${sysconfdir}/freesmartphone/opreferences/conf/phone/
+        install -m 0644 ${CONF_PATH}/profiles/rules/ring.yaml ${D}${sysconfdir}/freesmartphone/opreferences/conf/rules/
+
+        install -m 0644 ${CONF_PATH}/profiles/phone/vibrate.yaml ${D}${sysconfdir}/freesmartphone/opreferences/conf/phone/
+        install -m 0644 ${CONF_PATH}/profiles/rules/vibrate.yaml ${D}${sysconfdir}/freesmartphone/opreferences/conf/rules/
+
+        install -m 0644 ${CONF_PATH}/profiles/phone/silent.yaml ${D}${sysconfdir}/freesmartphone/opreferences/conf/phone/
+        install -m 0644 ${CONF_PATH}/profiles/rules/silent.yaml ${D}${sysconfdir}/freesmartphone/opreferences/conf/rules/
+
+        install -d ${D}${datadir}/sounds
+        install -m 0644 ${CONF_PATH}/*.wav ${D}${datadir}/sounds/
+}
+
+PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+
+# machine specific stuff, should ideally be elsewhere
+# - recommend MUXer on platforms that require one
+RDEPENDS_${PN}_append_om-gta01 = " fso-abyss"
+RDEPENDS_${PN}_append_om-gta02 = " fso-abyss"
+RDEPENDS_${PN}_append-om-3d7k  = " fso-abyss"
+# - add wmiconfig for wireless configuration
+RDEPENDS_${PN}_append_om-gta02 = " wmiconfig"
+
+FILES_${PN} = "\
+  ${sysconfdir}/frameworkd.conf \
+  ${sysconfdir}/freesmartphone \
+  ${datadir}/sounds \
+"
+CONFFILES_${PN} = "\
+  ${sysconfdir}/frameworkd.conf \
+  ${sysconfdir}/freesmartphone/opreferences/conf/phone/silent.yaml \
+  ${sysconfdir}/freesmartphone/opreferences/conf/phone/default.yaml \
+  ${sysconfdir}/freesmartphone/opreferences/conf/profiles/default.yaml \
+  ${sysconfdir}/freesmartphone/opreferences/conf/rules/silent.yaml \
+  ${sysconfdir}/freesmartphone/opreferences/conf/rules/default.yaml \
+  ${sysconfdir}/freesmartphone/oevents/rules.yaml \
+  ${sysconfdir}/freesmartphone/ogsmd/networks.tab \
+"
diff --git a/recipes/shr/libframeworkd-phonegui-efl2_git.bb b/recipes/shr/libframeworkd-phonegui-efl2_git.bb
new file mode 100644
index 0000000000..207658f807
--- /dev/null
+++ b/recipes/shr/libframeworkd-phonegui-efl2_git.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "frameworkd EFL phonegui 2"
+SECTION = "e/apps"
+DEPENDS += " dbus-glib libframeworkd-glib libframeworkd-phonegui etk evas ecore edje edje-native elementary"
+PV = "0.0.1+gitr${SRCREV}"
+PR = "r1"
+
+SRC_URI = "git://shr.bearstech.com/repo/libframeworkd-phonegui-efl2.git;protocol=http;branch=master"
+S = "${WORKDIR}/git"
+
+inherit pkgconfig autotools autotools_stage
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+
+
+do_configure_prepend() {
+        autopoint --force
+}
+
diff --git a/recipes/shr/libframeworkd-phonegui-efl_git.bb b/recipes/shr/libframeworkd-phonegui-efl_git.bb
new file mode 100644
index 0000000000..f8adabf415
--- /dev/null
+++ b/recipes/shr/libframeworkd-phonegui-efl_git.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "frameworkd EFL phonegui"
+HOMEPAGE = "http://shr-project.org/"
+LICENSE = "GPL"
+SECTION = "e/apps"
+DEPENDS += " dbus-glib libframeworkd-glib libframeworkd-phonegui etk evas ecore edje edje-native elementary"
+PV = "0.0.2+gitr${SRCREV}"
+PR = "r33"
+
+inherit pkgconfig autotools autotools_stage
+
+SRC_URI = "git://git.shr-project.org/repo/shr.git;protocol=http;branch=master"
+S = "${WORKDIR}/git/${PN}"
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+
+do_configure_prepend() {
+        autopoint --force
+}
+
diff --git a/recipes/shr/libframeworkd-phonegui_git.bb b/recipes/shr/libframeworkd-phonegui_git.bb
new file mode 100644
index 0000000000..50b546512a
--- /dev/null
+++ b/recipes/shr/libframeworkd-phonegui_git.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Frameworkd phonegui library"
+HOMEPAGE = "http://shr-project.org/"
+LICENSE = "GPL"
+SECTION = "libs"
+PV = "0.0.2+gitr${SRCREV}"
+PR = "r10"
+
+DEPENDS="glib-2.0 dbus-glib libframeworkd-glib libphone-utils"
+
+inherit pkgconfig autotools autotools_stage
+
+SRC_URI = "git://git.shr-project.org/repo/shr.git;protocol=http;branch=master"
+S = "${WORKDIR}/git/${PN}"
+
+CONFFILES_${PN} = "${sysconfdir}/frameworkd-phonegui.conf"