From 55f1bbed28e78a1f327b5ac198a0e54d02263890 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 17 Feb 2008 18:20:56 +0000 Subject: sane-srvrevs.inc: bump gsm0710muxd to r77 --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/distro') diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 4d92f48928..755b874083 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -26,7 +26,7 @@ SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gpe-contacts ?= "9312" -SRCREV_pn-gsm0710muxd ?= "73" +SRCREV_pn-gsm0710muxd ?= "77" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "56" SRCREV_pn-hildon-1 ?= "14429" -- cgit v1.2.3 From 3f4428a1a467d2e10b64d849699008476bcd0830 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 18 Feb 2008 15:24:49 +0000 Subject: preferred-om-2008-versions.inc: prefer libtool 1.5.24 (PA 0.9.9 needs it) --- conf/distro/include/preferred-om-2008-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/distro') diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 5641c8ee39..9d002f617b 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1,7 +1,7 @@ PREFERRED_VERSION_dbus = "1.1.4" PREFERRED_VERSION_busybox = "1.9.1" PREFERRED_VERSION_gst-pulse = "0.9.7" -PREFERRED_VERSION_libtool = "1.2.14" +PREFERRED_VERSION_libtool = "1.5.24" PREFERRED_VERSION_pulseaudio = "0.9.9" PREFERRED_VERSION_udev = "118" PREFERRED_VERSION_vte = "0.16.10" -- cgit v1.2.3 From ad9ce746358d5bf6d0147670304e8ed05131e2ae Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 18 Feb 2008 15:43:27 +0000 Subject: sane-srcrevs.inc : bump OM kernel to get SD working --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/distro') diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 755b874083..e0df400ab1 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -47,7 +47,7 @@ SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1039" -SRCREV_pn-linux-openmoko ?= "4014" +SRCREV_pn-linux-openmoko ?= "4082" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-maemo-mapper ?= "118" -- cgit v1.2.3 From 7d427c988107e61e6d9b9f949af49398caa204e4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 18 Feb 2008 16:20:58 +0000 Subject: calibrateproto, libxcalibrate: Update recipes to SRCREV and a new tag since the patches were merged upstream --- conf/distro/include/preferred-xorg-versions-X11R7.0.inc | 6 ++++++ conf/distro/include/preferred-xorg-versions-X11R7.1.inc | 6 ++++++ conf/distro/include/preferred-xorg-versions-X11R7.2.inc | 5 +++++ conf/distro/include/preferred-xorg-versions-X11R7.3.inc | 5 +++++ conf/distro/include/preferred-xorg-versions-X11R7.4.inc | 6 ++++++ conf/distro/include/preferred-xorg-versions.inc | 4 ++++ 6 files changed, 32 insertions(+) (limited to 'conf/distro') diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc index 6db9d92f71..5a391aa45a 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc @@ -339,3 +339,9 @@ PREFERRED_VERSION_util-macros-native = "X11R7.0-1.0.1" PREFERRED_VERSION_util-macros = "X11R7.0-1.0.1" PREFERRED_VERSION_xorg-cf-files = "X11R7.0-1.0.1" PREFERRED_VERSION_xserver-xorg = "X11R7.0-1.0.1" + +# Unreleased Packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc index 782549589d..c387161577 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc @@ -183,3 +183,9 @@ PREFERRED_VERSION_util-macros ?= "X11R7.1-1.0.2" PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2" PREFERRED_VERSION_xserver-kdrive ?= "X11R7.1-1.1.0" PREFERRED_VERSION_xserver-xorg ?= "X11R7.1-1.1.0" + +# Unreleased packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc index 59a481a104..dc34a99340 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc @@ -269,3 +269,8 @@ PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2" PREFERRED_VERSION_xserver-kdrive ?= "1.2.0" PREFERRED_VERSION_xserver-xorg ?= "1.2.0" +# Unreleased packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc index d7e19284bc..648472e9b6 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc @@ -280,3 +280,8 @@ PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" PREFERRED_VERSION_xserver-kdrive ?= "1.4" PREFERRED_VERSION_xserver-xorg ?= "1.4" +# Unreleased packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc index b04f72180d..4af2405aa7 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc @@ -284,3 +284,9 @@ PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" # xserver PREFERRED_VERSION_xserver-kdrive ?= "1.4" PREFERRED_VERSION_xserver-xorg ?= "1.4" + +# Unreleased packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc index f34b29f147..05136138fc 100644 --- a/conf/distro/include/preferred-xorg-versions.inc +++ b/conf/distro/include/preferred-xorg-versions.inc @@ -109,3 +109,7 @@ PREFERRED_VERSION_xtrans ?= "1.0.3" PREFERRED_VERSION_xtrans-native ?= "1.0.3" PREFERRED_VERSION_xinit ?= "1.0.4" PREFERRED_VERSION_xev ?= "1.0.2" +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" -- cgit v1.2.3 From 0d3f844b104f15d15a7a328800d49e4fabcd0317 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 18 Feb 2008 20:06:40 +0000 Subject: openmoko.conf: change OVERRIDES line to catch up with DISTRO = angstrom in angstrom.inc * We need an openmoko override for where we diverge from Angstrom. --- conf/distro/openmoko.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/distro') diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index b08e5f2ddb..f6968cee00 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -15,7 +15,7 @@ DISTRO_VERSION = "P1-Snapshot-${DATE}" #DISTRO_TYPE = "release" DISTRO_TYPE = "debug" -OVERRIDES = "local:${MACHINE}:${DISTRO}:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" +OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/" -- cgit v1.2.3 From 9ca92436dd93bfd5ef5042e7999d07beb42344c7 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Mon, 18 Feb 2008 21:38:24 +0000 Subject: Hastily reverting back to a version of the kernel that will not risk corrupting SD cards. --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/distro') diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index e0df400ab1..3784303d19 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -47,7 +47,7 @@ SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1039" -SRCREV_pn-linux-openmoko ?= "4082" +SRCREV_pn-linux-openmoko ?= "4079" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-maemo-mapper ?= "118" -- cgit v1.2.3