diff options
| author | P. J. McDermott <pjm@nac.net> | 2013-06-18 11:17:04 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2013-06-18 11:17:04 (EDT) |
| commit | ce2d35655d89ec39231dc1df866254886b2fee65 (patch) | |
| tree | ea742c7d6039a0a392b5f6599bf0c298b595be75 /patches | |
| parent | 84193f0ba581a455a5c3d366e7ae5804d70e8e5e (diff) | |
Add patch to make ob-applypatches work on BusyBox.
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/01_fix-ob-applypatches-to-work-with-busybox.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/patches/01_fix-ob-applypatches-to-work-with-busybox.patch b/patches/01_fix-ob-applypatches-to-work-with-busybox.patch new file mode 100644 index 0000000..0d509a3 --- /dev/null +++ b/patches/01_fix-ob-applypatches-to-work-with-busybox.patch @@ -0,0 +1,43 @@ +From: "P. J. McDermott" <pjm@nac.net> +Date: Tue, 18 Jun 2013 11:00:58 -0400 +Origin: upstream, http://git.proteanos.com/opkbuild/opkbuild.git/commit/?id=93dda971 +Subject: ob-applypatches: Fix to work with BusyBox patch. + +BusyBox's patch applet doesn't support the -d option, which is specified by +POSIX.1. + +Fixes: + + ob-applypatches: Applying patch "01_better-handle-unrecognized-options.patch"... + patch: invalid option -- 'd' + BusyBox v1.21.0 (2013-06-15 09:00:55 EDT) multi-call binary. + + Usage: patch [OPTIONS] [ORIGFILE [PATCHFILE]] + + -p,--strip N Strip N leading components from file names + -i,--input DIFF Read DIFF instead of stdin + -R,--reverse Reverse patch + -N,--forward Ignore already applied patches + -E,--remove-empty-files Remove output files if they become empty + + ob-applypatches: Error: Can't apply patch "01_better-handle-unrecognized-options.patch" +--- + src/ob-applypatches.sh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/ob-applypatches.sh b/src/ob-applypatches.sh +index a522238..10ace82 100644 +--- a/src/ob-applypatches.sh ++++ b/src/ob-applypatches.sh +@@ -50,8 +50,10 @@ apply_patches() + LANG="${orig_lang}" + patch="${patch#../patches/}" + ob_info "$(ob_get_msg 'applying_patch')" "${patch}" +- patch -N -p 1 -u -d 'src' -i "../../patches/${patch}" || \ ++ cd src ++ patch -N -p 1 -u -i "../../patches/${patch}" || \ + ob_error "$(ob_get_msg 'cant_apply_patch')" "${patch}" ++ cd .. + applied='true' + done + LANG="${orig_lang}" |