diff --git a/bitbake/lib/bb/fetch/hg.py b/bitbake/lib/bb/fetch/hg.py index c7d2e62c13..1cd5a8aa5c 100644 --- a/bitbake/lib/bb/fetch/hg.py +++ b/bitbake/lib/bb/fetch/hg.py @@ -94,7 +94,10 @@ class Hg(Fetch): if command is "fetch": cmd = "%s clone %s %s://%s/%s %s" % (basecmd, " ".join(options), proto, hgroot, ud.module, ud.module) elif command is "pull": - cmd = "%s pull %s" % (basecmd, " ".join(options)) + # do not pass options list; limiting pull to rev causes the local + # repo not to contain it and immediately following "update" command + # will crash + cmd = "%s pull" % (basecmd) elif command is "update": cmd = "%s update -C %s" % (basecmd, " ".join(options)) else: diff --git a/meta/packages/gaku/gaku_svn.bb b/meta/packages/gaku/gaku_svn.bb index 12fc545d74..66055f129b 100644 --- a/meta/packages/gaku/gaku_svn.bb +++ b/meta/packages/gaku/gaku_svn.bb @@ -1,15 +1,20 @@ DESCRIPTION = "Music player" LICENSE = "GPL" DEPENDS = "gtk+ gstreamer" -PV = "0.0+svnr${SRCREV}" RDEPENDS = "gst-plugin-audioconvert \ gst-plugin-audioresample \ - gst-plugin-alsa \ gst-plugin-typefindfunctions \ - gst-plugin-id3demux \ gst-plugin-playbin" -RRECOMMENDS = "gst-plugin-mad gst-plugin-ivorbis gst-plugin-ogg" + +RRECOMMENDS = "gst-plugin-mad \ + gst-plugin-id3demux \ + gst-plugin-ivorbis \ + gst-plugin-alsa \ + gst-plugin-ogg" + +PV = "0.0+svnr${SRCREV}" +PR = "r1" S = "${WORKDIR}/${PN}"