diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2007-12-28 16:30:46 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2007-12-28 16:30:46 +0000 |
| commit | fd5705c7b2b033c340e2396d69e7af5c7d1f00a4 (patch) | |
| tree | f3024fe38dc776afa39438726db72a546b35e0be | |
| parent | d996f889787afbfbc8245f989545aeacd04a98fb (diff) | |
| parent | 872cb9dc7ffd37e5c059efd0e017649fd3551435 (diff) | |
merge of '0aec671c9ce897a91bee8ce4cd1731b505b08c94'
and 'efc89b66950503726077461acaa664f7705ed559'
| -rw-r--r-- | conf/distro/include/moko-autorev.inc | 2 | ||||
| -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.bb | 4 | ||||
| -rw-r--r-- | packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb | 2 |
4 files changed, 6 insertions, 4 deletions
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 |