summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/angstrom-2007.1.conf6
-rw-r--r--conf/distro/include/moko-autorev.inc2
-rw-r--r--packages/altboot/altboot_1.1.1+wip-SVNR73.bb (renamed from packages/altboot/altboot_1.1.1+wip-SVNR70.bb)2
-rw-r--r--packages/settings-daemon/settings-daemon_svn.bb4
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb2
5 files changed, 11 insertions, 5 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 80f1512acf..380c882c2c 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -6,7 +6,11 @@
#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de>
#@--------------------------------------------------------------------
-# The release will the 2007.12
+# If you want to use the angstrom 2007.12 release or if
+# you want to base you distro on angstrom 2007, switch to
+# the org.openembedded.angstrom-2007.12-stable branch
+# THIS FILE WILL GO AWAY IN JANUARY 2008!!
+
DISTRO_VERSION = "2007.11RC3"
DISTRO_REVISION = "51"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 74b930781b..9f8ae61fc3 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -44,7 +44,7 @@ SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
SRCREV_pn-openocd ?= "${AUTOREV}"
SRCREV_pn-openocd-native ?= "${AUTOREV}"
-SRCREV_pn-uboot-openmoko ?= "${AUTOREV}"
+SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}"
SRCREV_pn-dfu-util ?= "${AUTOREV}"
SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
SRCREV_pn-usbpath ?= "${AUTOREV}"
diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR70.bb b/packages/altboot/altboot_1.1.1+wip-SVNR73.bb
index e22e992cc9..58d5721dbf 100644
--- a/packages/altboot/altboot_1.1.1+wip-SVNR70.bb
+++ b/packages/altboot/altboot_1.1.1+wip-SVNR73.bb
@@ -2,7 +2,7 @@ require altboot.inc
PR = "r0"
-SVN_REV = "70"
+SVN_REV = "73"
SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
"
diff --git a/packages/settings-daemon/settings-daemon_svn.bb b/packages/settings-daemon/settings-daemon_svn.bb
index fb24fb1d75..eaffbfebb4 100644
--- a/packages/settings-daemon/settings-daemon_svn.bb
+++ b/packages/settings-daemon/settings-daemon_svn.bb
@@ -1,10 +1,12 @@
DESCRIPTION = "Settings-daemon provides a bridge between gconf and xsettings"
LICENSE = "GPL"
-DEPENDS = "gconf glib-2.0"
+DEPENDS = "gconf glib-2.0 gtk+"
RDEPENDS = "xrdb"
SECTION = "x11"
PV = "0.0+svnr${SRCREV}"
+PR = "r1"
+
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
file://70settings-daemon"
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb b/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb
index e7812a5ed0..08c0062fab 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb
@@ -1,4 +1,4 @@
-require uboot-openmoko_svn.bb
+require u-boot-openmoko_svn.bb
inherit native