diff options
| author | Holger Freyther <zecke@selfish.org> | 2005-07-17 12:38:14 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-17 12:38:14 +0000 |
| commit | 440d78ee0713d56b60320ac0bd9a4b38a42739dd (patch) | |
| tree | 3a8b99fd4726e7a0ffa3f628993a37b057155f44 | |
| parent | 93120a45883d73a32d67f004af3cf52d38f983e3 (diff) | |
patcher on FreeBSD:
-Patch patcher to use gpatch on FreeBSD
| -rw-r--r-- | packages/patcher/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/patcher/files/freebsd_gpatch.patch | 28 | ||||
| -rw-r--r-- | packages/patcher/patcher-native_20040913.bb | 1 |
3 files changed, 29 insertions, 0 deletions
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..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 = "" |