diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-10-17 13:29:32 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-10-17 13:29:32 +0000 |
| commit | 72a99a8872c4afe0b53ad760c2c9ca63de9f0e7f (patch) | |
| tree | 2d2de4ae847eedae32a78a34c504954f6529a46a | |
| parent | 162930b4adb978a06d6ca2a918e6d91e5112f010 (diff) | |
| parent | eeedcd7cd3db7a3aa84364f199751d8c1ae08863 (diff) | |
merge of '0c8907e0f2b5bf5a3285e92be17c709e5d0ffa79'
and '908d37bd47fa2dc11cfb3cb7a8925330fbf6163d'
| -rw-r--r-- | packages/gpe-conf/gpe-conf_0.2.6.bb | 4 | ||||
| -rw-r--r-- | packages/uboot/uboot-openmoko_svn.bb | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/packages/gpe-conf/gpe-conf_0.2.6.bb b/packages/gpe-conf/gpe-conf_0.2.6.bb index 1256ce5291..b56b780210 100644 --- a/packages/gpe-conf/gpe-conf_0.2.6.bb +++ b/packages/gpe-conf/gpe-conf_0.2.6.bb @@ -4,13 +4,13 @@ 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" diff --git a/packages/uboot/uboot-openmoko_svn.bb b/packages/uboot/uboot-openmoko_svn.bb index 3669b409da..2564d4b066 100644 --- a/packages/uboot/uboot-openmoko_svn.bb +++ b/packages/uboot/uboot-openmoko_svn.bb @@ -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" |