blob: 0d509a381ac62ec7bafe91aaf4177a773854ee01 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
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}"
|
