From b0af751964f049cf38ee8144486dc4f0a722ec34 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 17 Jan 2011 16:44:55 +0100 Subject: [PATCH] frameworkd: fix init.d script permissions and force frameworkd-config-shr removal with RCONFLICTS Signed-off-by: Martin Jansa --- recipes/freesmartphone/frameworkd_git.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/recipes/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb index 1b34c95a0c..03c2ec67af 100644 --- a/recipes/freesmartphone/frameworkd_git.bb +++ b/recipes/freesmartphone/frameworkd_git.bb @@ -6,7 +6,7 @@ DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" SRCREV = "64d40c68c656b7926dfd7eb91101f1f9547a948b" PV = "0.9.5.9+gitr${SRCPV}" -PR = "r8" +PR = "r9" PE = "1" inherit distutils update-rc.d python-dir @@ -26,7 +26,9 @@ do_configure_append() { } do_install_append() { - #Check for machine specific conf. + # Fix permissions + chmod 755 ${D}${sysconfdir}/init.d/frameworkd + # Check for machine specific conf. CONF_PATH="${S}/etc" CONF_PATH_MACHINE="${CONF_PATH}" if [ -d "${CONF_PATH}/${MACHINE}" ] ; then @@ -35,7 +37,7 @@ do_install_append() { # Install machine specific files install -m 0644 ${CONF_PATH_MACHINE}/frameworkd.conf ${D}${sysconfdir} - #Check for machine specific conf. + # Check for machine specific conf. CONF_PATH="${S}/etc/freesmartphone/oevents" CONF_PATH_MACHINE="${CONF_PATH}" if [ -d "${CONF_PATH}/${MACHINE}" ] ; then @@ -82,6 +84,7 @@ PACKAGE_ARCH_${PN}-config = "${MACHINE_ARCH}" # - add wmiconfig for wireless configuration RDEPENDS_${PN}-config_append_om-gta02 = " wmiconfig" RREPLACES_${PN}-config = "frameworkd-config-shr" +RCONFLICTS_${PN}-config = "frameworkd-config-shr" FILES_${PN}-config = "\ ${sysconfdir}/frameworkd.conf \ -- 2.11.4.GIT