]> git.openpandora.org Git - openembedded.git/commitdiff
merge of '08b850dd4e1df4e1751532b79a9685dd41464df7'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 13 Oct 2006 10:27:56 +0000 (10:27 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 13 Oct 2006 10:27:56 +0000 (10:27 +0000)
     and 'e79716efdd36e7696ebd0ad656d58dbc0edd904c'

1  2 
packages/p4/p4.inc
packages/tasks/task-bootstrap-unionroot.bb
packages/tasks/task-bootstrap.bb

index 3b8303fe4e72436e608e378d3698e3334c4d2417,5a0342f14c5149130273e2d10a10035686469fd0..9439f736744bb313f18b9cb042507b2ddd534855
@@@ -2,11 -2,18 +2,10 @@@
  # Copyright (C) 2006, Advanced Micro Devices, Inc.  All Rights Reserved
  # Released under the MIT license (see /COPYING)
  
 -HOMEPAGE = "http://www.perforce.com"
  DESCRIPTION = "Perforce client and server binaries"
- MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 +HOMEPAGE = "http://www.perforce.com"
  LICENSE = "Perforce"
  
 -def get_kernelmajorversion(p):
 -      import re
 -      r = re.compile("([0-9]+\.[0-9]+).*")
 -      m = r.match(p);
 -      if m:
 -              return m.group(1)
 -      return None
 -
  def p4_arch(d):
        import bb, re
        arch = bb.data.getVar('TARGET_ARCH', d, 1)
Simple merge