diff options
| author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2008-11-20 18:05:24 +0100 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2008-11-20 18:06:21 +0100 |
| commit | f0f46dca8706b0c63174895afa5bd180df2c9e0e (patch) | |
| tree | 6902b670fe34d7349de10a4d6d63af45875f3f1f | |
| parent | de9c5b380e29790c4d3ad7ea7abbd41afebbd64f (diff) | |
fsod: make it build with python support
| -rw-r--r-- | packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf | 3 | ||||
| -rw-r--r-- | packages/freesmartphone/fsod/autofoo.patch | 13 | ||||
| -rw-r--r-- | packages/freesmartphone/fsod_git.bb | 21 |
3 files changed, 29 insertions, 8 deletions
diff --git a/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf index a2210a890e..796d4fb88a 100644 --- a/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf +++ b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf @@ -43,3 +43,6 @@ rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/u [oeventsd] rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml +[opimd] +disable = 1 + diff --git a/packages/freesmartphone/fsod/autofoo.patch b/packages/freesmartphone/fsod/autofoo.patch new file mode 100644 index 0000000000..3ed26aeb79 --- /dev/null +++ b/packages/freesmartphone/fsod/autofoo.patch @@ -0,0 +1,13 @@ +Index: fsod/configure.ac +=================================================================== +--- fsod/configure.ac ++++ ~fsod/configure.ac +@@ -85,7 +85,7 @@ if test "x$have_python" != "xno"; then + PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'` + PYTHON_LIBS="-lpython$PYTHON_VERSION" + PYTHON_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config" +- PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION" ++ PYTHON_CFLAGS="${PYTHON_INCLUDES}" # "-I`$PYTHON -c 'from distutils import sysconfig; print sysconfig.get_python_inc()'`" + PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile" + PYTHON_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` + PYTHON_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` diff --git a/packages/freesmartphone/fsod_git.bb b/packages/freesmartphone/fsod_git.bb index 278331326e..c0af2cace3 100644 --- a/packages/freesmartphone/fsod_git.bb +++ b/packages/freesmartphone/fsod_git.bb @@ -3,21 +3,26 @@ HOMEPAGE = "http://www.freesmartphone.org/" AUTHOR = "Sudharshan S" SECTION = "console/network" DEPENDS = "dbus dbus-glib libnl vala-native" +# for pygobject-codegen +DEPENDS += "python-pygtk" LICENSE = "LGPL" PV = "0.1+gitr${SRCREV}" -PR = "r0" +PR = "r1" + +inherit autotools pkgconfig update-rc.d distutils-base + +EXTRA_OECONF = "--enable-python --with-python-includes=${STAGING_INCDIR}/.." + +INITSCRIPT_NAME = "fsod" +INITSCRIPT_PARAMS = "defaults 21" SRC_URI = "\ ${FREESMARTPHONE_GIT}/openmoko-gsoc2008.git;protocol=git;branch=master \ + file://autofoo.patch;patch=1 \ # file://fsod \ " S = "${WORKDIR}/git/fsod" -inherit autotools pkgconfig update-rc.d - -INITSCRIPT_NAME = "fsod" -INITSCRIPT_PARAMS = "defaults 21" - do_install_append() { # install -d ${D}${sysconfdir}/init.d # install -m 0755 ${WORKDIR}/fsod ${D}${sysconfdir}/init.d/ @@ -26,9 +31,9 @@ do_install_append() { RCONFLICTS_${PN} = "frameworkd" RREPLACES_${PN} = "frameworkd" -FILES_${PN} += "${sysconfdir}" +FILES_${PN} += "${sysconfdir} ${datadir}" FILES_${PN}-dbg += "\ + ${bindir}/.debug \ ${libdir}/fsod/subsystems/.debug \ ${libdir}/fsod/subsystems/*/.debug \ " - |