conf/bitbake.conf:

	-Add the BUILD_OS to the overrides. This allows us for example
	to use gpatch on FreeBSD instead of patch
packages/patcher/patcher-native_...bb:
	-Change the PATCHCMD to use gpatch as well
	- s/build-fbsd/build-freebsd/

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index caba7b5..1df713f 100644 (file)
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -364,7 +364,7 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
 # when ${MACHINE} is 'ramses'. And finally '<foo>_local' overrides anything.
 #
 # This works for  functions as well, they are really just environment variables.
-OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}"
+OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}"
 
 ##################################################################
 # Include the rest of the config files.

diff --git a/packages/patcher/files/freebsd_gpatch.patch b/packages/patcher/files/freebsd_gpatch.patch
index f7e107a..ee6365f 100644 (file)
--- a/packages/patcher/files/freebsd_gpatch.patch
+++ b/packages/patcher/files/freebsd_gpatch.patch
@@ -2,8 +2,8 @@ On FreeBSD the default patch program has a different command line
 interface than GNU patch. Make patcher use the GNU patch.
 
 
---- patcher.py.old     Mon Sep 13 21:59:05 2004
-+++ patcher.py Sun Jul 17 14:24:50 2005
+--- patcher/patcher.py.old     Mon Sep 13 21:59:05 2004
++++ patcher/patcher.py Sun Jul 17 14:24:50 2005
 @@ -631,8 +631,8 @@
        my $res;
  

diff --git a/packages/patcher/patcher-native_20040913.bb b/packages/patcher/patcher-native_20040913.bb
index 1d49d0e..833ca21 100644 (file)
--- a/packages/patcher/patcher-native_20040913.bb
+++ b/packages/patcher/patcher-native_20040913.bb
@@ -11,11 +11,12 @@ PR = "r1"
 inherit native
 
 SRC_URI = "http://www.holgerschurig.de/files/linux/patcher-${PV}.tar.bz2"
-SRC_URI_append_build-fbsd = " file://freebsd_gpatch.patch;patch=1 "
+SRC_URI_append_build-freebsd = " file://freebsd_gpatch.patch;patch=1 "
 S = "${WORKDIR}/patcher"
 
 PATCHCLEANCMD = ""
 PATCHCMD = "num='%s'; name='%s'; file='%s'; patch -p "$num" -i "$file""
+PATCHCMD_build-freebsd = "num='%s'; name='%s'; file='%s'; gpatch -p "$num" -i "$file""
 
 do_stage() {
        install -m 0755 patcher.py ${STAGING_BINDIR}/patcher