diff options
| -rw-r--r-- | conf/distro/include/angstrom-2007-for-openmoko.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 4 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 8 | ||||
| -rw-r--r-- | packages/freesmartphone/frameworkd-devel_git.bb | 4 | ||||
| -rw-r--r-- | packages/freesmartphone/fso-apm_git.bb | 20 | ||||
| -rw-r--r-- | packages/freesmartphone/multicat_git.bb | 21 |
6 files changed, 52 insertions, 7 deletions
diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc index 22a2c98a16..7a4d498539 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc @@ -218,7 +218,7 @@ DISTRO_EXTRA_DEPENDS += " \ DISTRO_EXTRA_RDEPENDS += "\ update-modules \ - ${@base_contains("MACHINE_FEATURES", "screen", "exquisite", "",d)} \ +# ${@base_contains("MACHINE_FEATURES", "screen", "exquisite", "",d)} \ angstrom-version \ opkg opkg-collateral distro-feed-configs \ util-linux-mount util-linux-umount \ diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 656d6b2219..107e808c48 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -459,8 +459,8 @@ PREFERRED_VERSION_gift ?= "0.11.5" PREFERRED_VERSION_giftcurs ?= "0.6.2" PREFERRED_VERSION_gimp ?= "2.3.19" PREFERRED_VERSION_ginspector ?= "20050529" -PREFERRED_VERSION_git ?= "1.5.2.3" -PREFERRED_VERSION_git-native ?= "1.5.2.3" +PREFERRED_VERSION_git ?= "1.6.0.4" +PREFERRED_VERSION_git-native ?= "1.6.0.4" PREFERRED_VERSION_gizmod ?= "2.3" PREFERRED_VERSION_gkrellm ?= "2.2.10" PREFERRED_VERSION_glib-1.2 ?= "1.2.10" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index d0bd784a97..eb6a98eebd 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -48,6 +48,7 @@ SRCREV_pn-flashrom ?= "3682" SRCREV_pn-frameworkd ?= "d8a55311c5d29bb2946c76e8445748e04049eb1a" SRCREV_pn-frameworkd-devel ?= "e8ad25f2e36e31e0a8afe08fbe11e54b9305aa8f" SRCREV_pn-fsod ?= "9ab5e9884839c9745ecd878a9cf562a1c1b73411" +SRCREV_pn-fso-apm ?= "d5d3c4da59fd0ef28bf2789341ba6d42bc28a98b" SRCREV_pn-fso-gpsd ?= "8f82d35ae83fdc00f2c4786257e98551b9dea995" SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2" SRCREV_pn-fstests ?= "204" @@ -99,14 +100,15 @@ SRCREV_pn-matchbox-keyboard ?= "1910" SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910" SRCREV_pn-matchbox-panel-2 ?= "1626" SRCREV_pn-matchbox-stroke ?= "1820" -SRCREV_pn-mickeydbus ?= "e2698d54e2bec9a61ac858f9773d9ca1b78cc9a5" -SRCREV_pn-mickeyterm ?= "e2698d54e2bec9a61ac858f9773d9ca1b78cc9a5" +SRCREV_pn-mickeydbus ?= "d5d3c4da59fd0ef28bf2789341ba6d42bc28a98b" +SRCREV_pn-mickeyterm ?= "d5d3c4da59fd0ef28bf2789341ba6d42bc28a98b" SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce" SRCREV_pn-moko-gtk-engine ?= "4734" SRCREV_pn-mokoko ?= "119" SRCREV_pn-mpd-alsa ?= "6952" SRCREV_pn-mplayer ?= "27659" SRCREV_pn-mplayer-maemo ?= "342" +SRCREV_pn-multicat ?= "d5d3c4da59fd0ef28bf2789341ba6d42bc28a98b" SRCREV_pn-multitap-pad ?= "373" SRCREV_pn-navit ?= "1096" SRCREV_pn-neod ?= "4617" @@ -184,7 +186,7 @@ SRCREV_pn-python-connexion ?= "1283" SRCREV_pn-python-formencode = "3148" SRCREV_pn-python-gsmd = "148" SRCREV_pn-python-lightmediascanner = "68" -SRCREV_pn-python-pyrtc = "d1f32060474767582dd4248d5e5c2adc63931d5a" +SRCREV_pn-python-pyrtc = "d5d3c4da59fd0ef28bf2789341ba6d42bc28a98b" SRCREV_pn-python-pyyaml = "294" QEMUSRCREV = "4242" SRCREV_pn-tslib ?= "53" diff --git a/packages/freesmartphone/frameworkd-devel_git.bb b/packages/freesmartphone/frameworkd-devel_git.bb index 9438b6d768..acd41dcaf5 100644 --- a/packages/freesmartphone/frameworkd-devel_git.bb +++ b/packages/freesmartphone/frameworkd-devel_git.bb @@ -1,7 +1,9 @@ require frameworkd_git.bb FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/frameworkd', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +PROVIDES = "frameworkd" +DEFAULT_PREFERENCE = "-1" -PR="r1" +PR = "r2" SRC_URI = "\ ${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \ diff --git a/packages/freesmartphone/fso-apm_git.bb b/packages/freesmartphone/fso-apm_git.bb new file mode 100644 index 0000000000..df8894852b --- /dev/null +++ b/packages/freesmartphone/fso-apm_git.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "freesmartphone.org apm compatibility utility" +AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" +HOMEPAGE = "http://www.freesmartphone.org" +SECTION = "console" +LICENSE = "GPLv2" +PV = "0.0.0+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${bindir} + install -m 0755 fso-apm/apm ${D}${bindir} +} + +PACKAGE_ARCH_${PN} = "all" +RDEPENDS_${PN} = "python-dbus frameworkd" +RPROVIDES_${PN} = "apm" +RCONFLICTS_${PN} = "apm" diff --git a/packages/freesmartphone/multicat_git.bb b/packages/freesmartphone/multicat_git.bb new file mode 100644 index 0000000000..fb2b332143 --- /dev/null +++ b/packages/freesmartphone/multicat_git.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Multiple cat utility" +AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" +HOMEPAGE = "http://www.freesmartphone.org" +SECTION = "console" +LICENSE = "GPLv2" +PV = "0.0.0+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${bindir} + install -m 0755 multicat/multicat ${D}${bindir} +} + +RDEPENDS_${PN} = "\ + python-core \ +" + +PACKAGE_ARCH_${PN} = "all" |