From 440d78ee0713d56b60320ac0bd9a4b38a42739dd Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 17 Jul 2005 12:38:14 +0000 Subject: patcher on FreeBSD: -Patch patcher to use gpatch on FreeBSD --- packages/patcher/files/.mtn2git_empty | 0 packages/patcher/files/freebsd_gpatch.patch | 28 ++++++++++++++++++++++++++++ packages/patcher/patcher-native_20040913.bb | 1 + 3 files changed, 29 insertions(+) create mode 100644 packages/patcher/files/.mtn2git_empty create mode 100644 packages/patcher/files/freebsd_gpatch.patch diff --git a/packages/patcher/files/.mtn2git_empty b/packages/patcher/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/patcher/files/freebsd_gpatch.patch b/packages/patcher/files/freebsd_gpatch.patch new file mode 100644 index 0000000000..f7e107a410 --- /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.py.old Mon Sep 13 21:59:05 2004 ++++ 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..1d49d0e035 100644 --- a/packages/patcher/patcher-native_20040913.bb +++ b/packages/patcher/patcher-native_20040913.bb @@ -11,6 +11,7 @@ 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 " S = "${WORKDIR}/patcher" PATCHCLEANCMD = "" -- cgit v1.2.3 From c4a4b2905d3ffbc85217a48843d07e4fd887e203 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 17 Jul 2005 13:02:31 +0000 Subject: 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/ --- conf/bitbake.conf | 2 +- packages/patcher/files/freebsd_gpatch.patch | 4 ++-- packages/patcher/patcher-native_20040913.bb | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) 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 '_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 f7e107a410..ee6365f49d 100644 --- 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 1d49d0e035..833ca21a53 100644 --- 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 -- cgit v1.2.3 From a7ad3651f6fc5ecf543246094a4786310e24bcb1 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 17 Jul 2005 13:21:20 +0000 Subject: base.bbclass: Make it compatible with FreeBSD Replace --no-derefence with -P according to the GNU cp manpage this option is the same as --no-derenfe and FreeBSD knows -P as well --- classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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/ -- cgit v1.2.3 From 3e2660b9ae1c96b9cd44231a9f1dd280b6f48334 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 17 Jul 2005 15:12:21 +0000 Subject: upgrade python-imdbpy to 2.0 --- packages/python/python-imdbpy_1.9.bb | 12 ------------ packages/python/python-imdbpy_2.0.bb | 13 +++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 packages/python/python-imdbpy_1.9.bb create mode 100644 packages/python/python-imdbpy_2.0.bb diff --git a/packages/python/python-imdbpy_1.9.bb b/packages/python/python-imdbpy_1.9.bb deleted file mode 100644 index 5e098478b2..0000000000 --- a/packages/python/python-imdbpy_1.9.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "IMDbPY is a Python package useful to retrieve and manage the data of the IMDb movie database." -SECTION = "devel/python" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -LICENSE = "GPL" -SRCNAME = "imdbpy" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/IMDbPY-${PV}" - -inherit distutils - diff --git a/packages/python/python-imdbpy_2.0.bb b/packages/python/python-imdbpy_2.0.bb new file mode 100644 index 0000000000..2df3b4229c --- /dev/null +++ b/packages/python/python-imdbpy_2.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "IMDbPY is a Python package useful to retrieve and manage the data of the IMDb movie database." +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " +LICENSE = "GPL" +SRCNAME = "IMDbPY" +PR = "ml0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/imbdbpy/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils + -- cgit v1.2.3