From 78c6b57a701ede9ee58fad101a6e373f5f5a3d91 Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Sat, 28 Nov 2009 15:41:22 +0100 Subject: sane-srcrevs-fso: bump fsodeviced to get the alsa player ringtone fix Signed-off-by: Klaus Kurzmann --- conf/distro/include/sane-srcrevs-fso.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index bc9dfc6a45..6cb423db13 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -3,7 +3,7 @@ # FSO Projects -- Cornucopia FSO_CORNUCOPIA_SRCREV ?= "1dcf546fb0423930f938129a51f538874c172226" SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsodeviced ?= "690dc75efcc8e4dbcb53e361d48c54e104955921" +SRCREV_pn-fsodeviced ?= "0ea5c80742a4f788a29258e9e01d9ebc25dad2dc" SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsogpsd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}" -- cgit v1.2.3 From 052e3287b44148cd0cd155602de201b5b58411eb Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sat, 28 Nov 2009 16:40:48 +0100 Subject: fsodeviced: explicitly enable the rfkill and canberra player plugins --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 194078c831..bdfb729b2d 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -162,7 +162,7 @@ SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1089" SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7" -SRCREV_pn-linux-openmoko-2.6.28 ?= "8aa6cdde17381dd8865d10ba15ee62c092ec2ba5" +SRCREV_pn-linux-openmoko-2.6.28 ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5" SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9" SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12" SRCREV_pn-linux-openmoko-shr-devel ?= "b90406de472c1aa5371ab593a2bb79136d5de658" -- cgit v1.2.3 From b160b530768a35d82518f0f3ff56eb1a72b8bd82 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sat, 28 Nov 2009 16:45:50 +0100 Subject: fsodatad: new recipe; FSO data storage service fsomusicd: new recipe; FSO music player service --- conf/distro/include/fso-autorev.inc | 2 ++ conf/distro/include/sane-srcrevs-fso.inc | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc index ba8cdac1f5..658a4390f3 100644 --- a/conf/distro/include/fso-autorev.inc +++ b/conf/distro/include/fso-autorev.inc @@ -2,9 +2,11 @@ SRCREV_pn-dbus-hlid = "${AUTOREV}" SRCREV_pn-frameworkd = "${AUTOREV}" SRCREV_pn-frameworkd-devel = "${AUTOREV}" +SRCREV_pn-fsodatad = "${AUTOREV}" SRCREV_pn-fsodeviced = "${AUTOREV}" SRCREV_pn-fsogsmd = "${AUTOREV}" SRCREV_pn-fsogpsd = "${AUTOREV}" +SRCREV_pn-fsomusicd = "${AUTOREV}" SRCREV_pn-fsonetworkd = "${AUTOREV}" SRCREV_pn-fsotimed = "${AUTOREV}" SRCREV_pn-fsousaged = "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index 6cb423db13..1b56add7bf 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -3,9 +3,11 @@ # FSO Projects -- Cornucopia FSO_CORNUCOPIA_SRCREV ?= "1dcf546fb0423930f938129a51f538874c172226" SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsodeviced ?= "0ea5c80742a4f788a29258e9e01d9ebc25dad2dc" +SRCREV_pn-fsodatad ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2" +SRCREV_pn-fsodeviced ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2" SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsogpsd ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-fsomusicd ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2" SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsousaged ?= "fe2ec3260b73233c414de584aa1b4a5e49c24a0d" -- cgit v1.2.3 From 13920da39c263b1cea866a01df6678eb8758cddf Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sat, 28 Nov 2009 18:09:34 +0100 Subject: fsolocationd: renamed recipe; source was fsogpsd --- conf/distro/include/fso-autorev.inc | 2 +- conf/distro/include/sane-srcrevs-fso.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc index 658a4390f3..70f8f9019b 100644 --- a/conf/distro/include/fso-autorev.inc +++ b/conf/distro/include/fso-autorev.inc @@ -5,7 +5,7 @@ SRCREV_pn-frameworkd-devel = "${AUTOREV}" SRCREV_pn-fsodatad = "${AUTOREV}" SRCREV_pn-fsodeviced = "${AUTOREV}" SRCREV_pn-fsogsmd = "${AUTOREV}" -SRCREV_pn-fsogpsd = "${AUTOREV}" +SRCREV_pn-fsolocationd = "${AUTOREV}" SRCREV_pn-fsomusicd = "${AUTOREV}" SRCREV_pn-fsonetworkd = "${AUTOREV}" SRCREV_pn-fsotimed = "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index 1b56add7bf..6eb1004cfd 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -6,7 +6,7 @@ SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsodatad ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2" SRCREV_pn-fsodeviced ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2" SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsogpsd ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsomusicd ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2" SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}" -- cgit v1.2.3 From a5d21cde984b2c6ec5b14f0bae268e07289df9fb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 28 Nov 2009 19:55:44 +0100 Subject: shr: bump linux-libc-headers to 2.6.31, use EFL_SRCREV from sane-srcrevs Signed-off-by: Martin Jansa --- conf/distro/include/preferred-shr-versions.inc | 22 ++++++++++++---------- conf/distro/include/sane-srcrevs-fso.inc | 2 +- conf/distro/include/sane-srcrevs.inc | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index 5970f2da14..b1948e8c02 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -1,22 +1,24 @@ # Upgraded # use newer version then preferred by default -PREFERRED_VERSION_boost ?= "1.40.0" -PREFERRED_VERSION_dbus ?= "1.3.0" +PREFERRED_VERSION_boost = "1.40.0" +PREFERRED_VERSION_dbus = "1.3.0" PREFERRED_VERSION_autoconf = "2.63" PREFERRED_VERSION_autoconf-native = "2.63" -PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2" -PREFERRED_VERSION_mtd-utils-native ?= "1.2.0+git" -PREFERRED_VERSION_strace ?= "4.5.15" +PREFERRED_VERSION_libmikmod = "3.2.0-beta2" +PREFERRED_VERSION_mtd-utils-native = "1.2.0+git" +PREFERRED_VERSION_strace = "4.5.15" # We need this for jamvm -PREFERRED_VERSION_classpath ?= "0.98" -PREFERRED_VERSION_classpath-native ?= "0.98" +PREFERRED_VERSION_classpath = "0.98" +PREFERRED_VERSION_classpath-native = "0.98" # we need new headers for libc, now OLDEST_KERNEL_linux-gnueabi = "2.6.24" -PREFERRED_VERSION_linux-libc-headers = "2.6.29" +# and 2.6.31 for fsodeviced +PREFERRED_VERSION_linux-libc-headers = "2.6.31" # override EFL_SRCREV from sane-srcrevs.inc -EFL_SRCREV ?= "43898" +# now is EFL_SRCREV newer in sane-srcrevs.inc +# EFL_SRCREV ?= "43898" # upgrades used in Angstrom PREFERRED_VERSION_gtk+ = "2.18.3" @@ -32,4 +34,4 @@ UDEV_GE_141 = "1" # Downgraded # python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py -PREFERRED_VERSION_python-pygtk ?= "2.10.4" +PREFERRED_VERSION_python-pygtk = "2.10.4" diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index 6eb1004cfd..f99b44945c 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -19,7 +19,7 @@ SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}" # FSO Projects -- Misc SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb" SRCREV_pn-frameworkd ?= "d48bd43c430322b26744e31829f9c76e9b725819" -SRCREV_pn-frameworkd-config-shr_FSO_REV = ${SRCREV_pn-frameworkd} +SRCREV_pn-frameworkd-config-shr_FSO_REV ?= ${SRCREV_pn-frameworkd} SRCREV_pn-fso-abyss ?= "7f271311e2e0b63235139859169bd248920ade30" SRCREV_pn-fso-term ?= "aa0b9c26dee3918a5e9d2809bb36335bda276a0d" SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index bdfb729b2d..9210ef7fe6 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -80,7 +80,7 @@ SRCREV_pn-ffalarms ?= "67" SRCREV_pn-flashrom ?= "3682" SRCREV_pn-fltk2 ?= "6671" SRCREV_pn-frameworkd-config-shr ?= "cb4159e653d770da8e8f9fc9a65135839533d4c5" -SRCREV_pn-frameworkd-config-shr_SHR_REV = ${SRCREV_pn-frameworkd-config-shr} +SRCREV_pn-frameworkd-config-shr_SHR_REV ?= ${SRCREV_pn-frameworkd-config-shr} SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b" SRCREV_pn-fsoraw ?= "20" SRCREV_pn-fstests ?= "204" -- cgit v1.2.3 From e6266efb6ea5fad9415d210be59a775361e8db21 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 29 Nov 2009 14:27:58 +0100 Subject: om-gta02: create also ubinized image from ubifs --- conf/machine/om-gta02.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index d47320e59d..5fc96ec4ed 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -51,7 +51,7 @@ USE_VT = "0" # used by some images ROOT_FLASH_SIZE = "256" -IMAGE_FSTYPES += "tar.gz jffs2 ubifs" +IMAGE_FSTYPES += "tar.gz jffs2 ubifs ubi" # extra jffs2 tweaks EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \ -- cgit v1.2.3