diff options
| author | P. J. McDermott <pjm@nac.net> | 2013-09-07 16:28:32 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2013-09-07 16:28:32 (EDT) |
| commit | 4673f05480dacd73ccc0568f68f689bd28e27490 (patch) | |
| tree | 78411fda7784b6512305568734a8038a5b1faec2 /patches | |
| parent | 34d2896548a9d4ebe7c8df98db6e8a2e54e0e1c3 (diff) | |
Drop patch that's been applied upstream.
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/01_fix-ob-applypatches-to-work-with-busybox.patch | 43 |
1 files changed, 0 insertions, 43 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 deleted file mode 100644 index 0d509a3..0000000 --- a/patches/01_fix-ob-applypatches-to-work-with-busybox.patch +++ /dev/null @@ -1,43 +0,0 @@ -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}" |