MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged revisions 5169-5170 via svnmerge from

Browse Source 
https://svn.o-hand.com/repos/poky/trunk

........
  r5169 | ross | 2008-09-10 17:17:54 +0100 (Wed, 10 Sep 2008) | 1 line
  
  gaku: clean up depends/recommends
........
  r5170 | richard | 2008-09-10 17:25:46 +0100 (Wed, 10 Sep 2008) | 20 lines
  
  bitbake hg fetcher: Add fix from Matt Hoosier
  
  The Mercurial fetcher right now will fail when used to incrementally
  fetch an update to a local clone of a repository already fetched at
  some prior revision. The culprit is the sequence:
  
   hg pull -r <rev>
   hg update -C <rev>
    
  A subtlety in the way that Mercurial stores its tags (in a normally
  version-controlled file called .hgtags) has the side-effect that a
  repository fetched at a tag "foo" will not actually contain a
  new-enough copy of the .hgtags file to be self-aware of the foo tag's
  existence.
    
  The solution is just to get all the changesets in the repository on
  incremental upgrades, so that the following "hg update" will be able
  to resolve the tag.
    
........


git-svn-id: https://svn.o-hand.com/repos/poky/branches/elroy@5282 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Ross Burton 2008-09-26 08:46:30 +00:00
parent a96187d660
commit 148459e611
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bitbake/lib/bb/fetch/hg.py
View File

@ -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:

13
meta/packages/gaku/gaku_svn.bb
View File

@ -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}"