From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 13 Oct 2006 10:27:56 +0000 (+0000)
Subject: merge of '08b850dd4e1df4e1751532b79a9685dd41464df7'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~212
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32aea580856e66c6fedad2f1dd7246f7c1a8eee0;p=openembedded.git

Merge ... '08b850dd4e1df4e1751532b79a9685dd41464df7'
     and 'e79716efdd36e7696ebd0ad656d58dbc0edd904c'
---

32aea580856e66c6fedad2f1dd7246f7c1a8eee0
diff --cc packages/p4/p4.inc
index 3b8303fe4e,5a0342f14c..9439f73674
--- a/packages/p4/p4.inc
+++ b/packages/p4/p4.inc
@@@ -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"
 +HOMEPAGE = "http://www.perforce.com"
- MAINTAINER = "Raymond Danks <info-linux@geode.amd.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)