diff options
author | Jian Liu <jian.liu@windriver.com> | 2015-02-26 10:35:52 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-09 15:57:59 +0000 |
commit | 73be8c18256b28d8faec96e8713600ddef8f900c (patch) | |
tree | b29c918de1f6d55539178e7f137dcca54a9fa055 /meta/recipes-extended/man/man | |
parent | 36e47a99ae6668cb9a601f137f56011b7de13512 (diff) | |
download | poky-73be8c18256b28d8faec96e8713600ddef8f900c.tar.gz |
man: fix bugs of makewhatis script
- man-1.6e-whatis2.patch does not delete the tail "fi"
fix it to avoid syntax error
- Use the command "which" to get the path of awk
(From OE-Core rev: 9383f635858e35e8fb83fba1750a8c6e4b4274b1)
Signed-off-by: Jian Liu <jian.liu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/man/man')
-rw-r--r-- | meta/recipes-extended/man/man/man-1.6e-whatis2.patch | 7 | ||||
-rw-r--r-- | meta/recipes-extended/man/man/man-1.6g-whatis3.patch | 20 |
2 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-extended/man/man/man-1.6e-whatis2.patch b/meta/recipes-extended/man/man/man-1.6e-whatis2.patch index 7f013836c0..fc4ed3135d 100644 --- a/meta/recipes-extended/man/man/man-1.6e-whatis2.patch +++ b/meta/recipes-extended/man/man/man-1.6e-whatis2.patch | |||
@@ -50,3 +50,10 @@ Index: man-1.6f/src/makewhatis.sh | |||
50 | here=`pwd` | 50 | here=`pwd` |
51 | cd $mandir | 51 | cd $mandir |
52 | for i in $sections | 52 | for i in $sections |
53 | @@ -447,7 +447,6 @@ | ||
54 | |||
55 | chmod 644 ${mandir1}/whatis | ||
56 | rm $TMPFILE | ||
57 | - fi | ||
58 | done | ||
59 | done | ||
diff --git a/meta/recipes-extended/man/man/man-1.6g-whatis3.patch b/meta/recipes-extended/man/man/man-1.6g-whatis3.patch new file mode 100644 index 0000000000..6334456857 --- /dev/null +++ b/meta/recipes-extended/man/man/man-1.6g-whatis3.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | Do not use absolute path for awk while getting the path of awk | ||
2 | when running makewhatis. | ||
3 | This can avoid errors if path of awk changes. | ||
4 | |||
5 | Upstream-Status: Submitted [man-1.6g] | ||
6 | |||
7 | Signed-off-by: Jian Liu <jian.liu@windriver.com> | ||
8 | |||
9 | diff -Nur man-1.6g.orig/src/makewhatis.sh man-1.6g/src/makewhatis.sh | ||
10 | --- man-1.6g.orig/src/makewhatis.sh 2015-02-25 16:13:12.657611419 +0800 | ||
11 | +++ man-1.6g/src/makewhatis.sh 2015-02-25 16:14:49.334694815 +0800 | ||
12 | @@ -67,7 +67,7 @@ | ||
13 | # but that leads to problems and bugs. | ||
14 | |||
15 | # AWK=/usr/bin/gawk | ||
16 | -AWK=@awk@ | ||
17 | +AWK=`which awk` | ||
18 | |||
19 | # Find a place for our temporary files. If security is not a concern, use | ||
20 | # TMPFILE=/tmp/whatis$$; TMPFILEDIR=none | ||