Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/11 12:24:12-07:00 amd.com!jcrouse
bitbake.conf:
  Add PATCH_GET to make patch ignore RCS

BKrev: 42825f86qHc9dlyuCLozBs8i9hv5XQ

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index ff3c634..b7ecda9 100644 (file)
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -321,6 +321,12 @@ PATCHCLEANCMD = 'if [ -n "`quilt applied`" ]; then quilt pop -a -R -f || exit 1;
 PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -n $name $patch; chmod u+w patches/$name; quilt push"
 PATCH_DEPENDS = "quilt-native"
 
+# GNU patch tries to be intellgent about checking out read-only files from
+# a RCS, which freaks out those special folks with active Perforce clients
+# the following makes patch ignore RCS:
+
+export PATCH_GET=0
+
 # Program to be used to build ipkg packages
 
 IPKGBUILDCMD = "ipkg-build -o 0 -g 0"