[oe-commits] org.oe.dev merge of '0c8907e0f2b5bf5a3285e92be17c709e5d0ffa79'

[koen commit]

merge of '0c8907e0f2b5bf5a3285e92be17c709e5d0ffa79'
     and '908d37bd47fa2dc11cfb3cb7a8925330fbf6163d'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: bc7f1f51525f7d568b5fe34877e1237d8d943cd6
ViewMTN: http://monotone.openembedded.org/revision/info/bc7f1f51525f7d568b5fe34877e1237d8d943cd6
Files:
1
packages/gpe-conf/gpe-conf_0.2.6.bb
packages/uboot/uboot-openmoko_svn.bb
classes/angstrom-mirrors.bbclass
conf/distro/openmoko.conf
Diffs:

#
# mt diff -r0c8907e0f2b5bf5a3285e92be17c709e5d0ffa79 -rbc7f1f51525f7d568b5fe34877e1237d8d943cd6
#
# 
# 
# patch "packages/gpe-conf/gpe-conf_0.2.6.bb"
#  from [ab00b228e49cc53742b5fcd1ecb6dd579a926ef3]
#    to [86e16babf4c0a37cb552a66f01e6d3fb2cd8fc2e]
# 
# patch "packages/uboot/uboot-openmoko_svn.bb"
#  from [32f83f5ac25253fffe2da4176c4bce6897bd83a1]
#    to [d69a1fdef9283935cf9aaf4246a079f43fbeb62a]
# 
============================================================
--- packages/gpe-conf/gpe-conf_0.2.6.bb	ab00b228e49cc53742b5fcd1ecb6dd579a926ef3
+++ packages/gpe-conf/gpe-conf_0.2.6.bb	86e16babf4c0a37cb552a66f01e6d3fb2cd8fc2e
@@ -1,16 +1,16 @@ DEPENDS = "gtk+ esound audiofile libgpew
 DESCRIPTION = "Configuration applets for GPE"
 SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
 DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client libxrandr"
-RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons tzdata xrandr"
+RDEPENDS_${PN} = "xst gpe-confd xset ntpdate gpe-icons tzdata xrandr"
 RDEPENDS_gpe-conf-panel = "gpe-conf"
 
 RPROVIDES_${PN} += " bl"
 RCONFLICTS_${PN} = "bl"
 
-PR = "r0"
+PR = "r1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
============================================================
--- packages/uboot/uboot-openmoko_svn.bb	32f83f5ac25253fffe2da4176c4bce6897bd83a1
+++ packages/uboot/uboot-openmoko_svn.bb	d69a1fdef9283935cf9aaf4246a079f43fbeb62a
@@ -18,6 +18,7 @@ SRC_URI = "\
   svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patches \
   file://uboot-eabi-fix-HACK.patch \
   file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
+  file://makefile-no-dirafter.patch;patch=1 \
 "
 S = "${WORKDIR}/git"
 


#
# mt diff -r908d37bd47fa2dc11cfb3cb7a8925330fbf6163d -rbc7f1f51525f7d568b5fe34877e1237d8d943cd6
#
# 
# 
# patch "classes/angstrom-mirrors.bbclass"
#  from [12843eb50eb15e995dc38e63bf1c31e35b879ff4]
#    to [5cb52a71d99b0e1e741b10beef5daa2a8a206bd0]
# 
# patch "conf/distro/openmoko.conf"
#  from [2ec30f54157022779b502f8ec721dfbf3505d89b]
#    to [6a2e6be73d20c7c96c92f46207a589f96df4b427]
# 
============================================================
--- classes/angstrom-mirrors.bbclass	12843eb50eb15e995dc38e63bf1c31e35b879ff4
+++ classes/angstrom-mirrors.bbclass	5cb52a71d99b0e1e741b10beef5daa2a8a206bd0
@@ -1,4 +1,4 @@ ftp://.*/.*/	http://www.angstrom-distrib
 MIRRORS_append () {
 ftp://.*/.*/	http://www.angstrom-distribution.org/unstable/sources/
-http://.*/.*/	http://www.angstrom-distribution.org/unstable/sources/
+https?$://.*/.*/	http://www.angstrom-distribution.org/unstable/sources/
 }
============================================================
--- conf/distro/openmoko.conf	2ec30f54157022779b502f8ec721dfbf3505d89b
+++ conf/distro/openmoko.conf	6a2e6be73d20c7c96c92f46207a589f96df4b427
@@ -19,7 +19,7 @@ CVS_TARBALL_STASH = "http://downloads.op
 
 CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/"
 
-PREMIRRORS = "(ftp|http)://.*/.*/ http://downloads.openmoko.org/sources/"
+PREMIRRORS = "(ftp|https?)$://.*/.*/ http://downloads.openmoko.org/sources/"
 
 FEED_URIS = "\
   snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \