summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/base.bbclass2
-rw-r--r--conf/bitbake.conf2
-rw-r--r--packages/patcher/files/.mtn2git_empty0
-rw-r--r--packages/patcher/files/freebsd_gpatch.patch28
-rw-r--r--packages/patcher/patcher-native_20040913.bb2
-rw-r--r--packages/python/python-imdbpy_2.0.bb (renamed from packages/python/python-imdbpy_1.9.bb)7
6 files changed, 36 insertions, 5 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 0d29de144a..1da58a924e 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -199,7 +199,7 @@ oe_libinstall() {
oefatal "oe_libinstall: $dir/$f not found."
fi
elif [ -L "$f" ]; then
- __runcmd cp --no-dereference "$f" $destpath/
+ __runcmd cp -P "$f" $destpath/
elif [ ! -L "$f" ]; then
libfile="$f"
__runcmd install -m 0755 $libfile $destpath/
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index caba7b51d5..1df713f2eb 100644
--- 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/.mtn2git_empty b/packages/patcher/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/patcher/files/.mtn2git_empty
diff --git a/packages/patcher/files/freebsd_gpatch.patch b/packages/patcher/files/freebsd_gpatch.patch
new file mode 100644
index 0000000000..ee6365f49d
--- /dev/null
+++ b/packages/patcher/files/freebsd_gpatch.patch
@@ -0,0 +1,28 @@
+On FreeBSD the default patch program has a different command line
+interface than GNU patch. Make patcher use the GNU patch.
+
+
+--- 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;
+
+ # ... then we look if the patch would apply cleanly ...
+- print "DEBUG: patch --dry-run $opt\n" if $debug > 1;
+- $res = system("patch --dry-run $opt >$patchlog 2>/dev/null");
++ print "DEBUG: gpatch --dry-run $opt\n" if $debug > 1;
++ $res = system("gpatch --dry-run $opt >$patchlog 2>/dev/null");
+ if ($res != 0) {
+ unless ($do_force) {
+ unlink($patchlog);
+@@ -669,8 +669,8 @@
+ # Finally we apply the patch. No need to create backup copies with -b,
+ # that has been done by PutIntoPatch()
+ $opt = "-f $opt" if $do_force;
+- print "DEBUG: patch $opt\n" if $debug > 1;
+- $res = system("patch $opt >$patchlog");
++ print "DEBUG: gpatch $opt\n" if $debug > 1;
++ $res = system("gpatch $opt >$patchlog");
+ unlink($patchlog);
+ $res = 0 if $do_force && $res == 256;
+ if ($res != 0) {
diff --git a/packages/patcher/patcher-native_20040913.bb b/packages/patcher/patcher-native_20040913.bb
index e1ac1c1ca2..833ca21a53 100644
--- a/packages/patcher/patcher-native_20040913.bb
+++ b/packages/patcher/patcher-native_20040913.bb
@@ -11,10 +11,12 @@ PR = "r1"
inherit native
SRC_URI = "http://www.holgerschurig.de/files/linux/patcher-${PV}.tar.bz2"
+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
diff --git a/packages/python/python-imdbpy_1.9.bb b/packages/python/python-imdbpy_2.0.bb
index 5e098478b2..2df3b4229c 100644
--- a/packages/python/python-imdbpy_1.9.bb
+++ b/packages/python/python-imdbpy_2.0.bb
@@ -3,10 +3,11 @@ SECTION = "devel/python"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-SRCNAME = "imdbpy"
+SRCNAME = "IMDbPY"
+PR = "ml0"
-SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-S = "${WORKDIR}/IMDbPY-${PV}"
+SRC_URI = "${SOURCEFORGE_MIRROR}/imbdbpy/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit distutils