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>
This commit is contained in:
parent
36e47a99ae
commit
73be8c1825
|
@ -50,3 +50,10 @@ Index: man-1.6f/src/makewhatis.sh
|
|||
here=`pwd`
|
||||
cd $mandir
|
||||
for i in $sections
|
||||
@@ -447,7 +447,6 @@
|
||||
|
||||
chmod 644 ${mandir1}/whatis
|
||||
rm $TMPFILE
|
||||
- fi
|
||||
done
|
||||
done
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
Do not use absolute path for awk while getting the path of awk
|
||||
when running makewhatis.
|
||||
This can avoid errors if path of awk changes.
|
||||
|
||||
Upstream-Status: Submitted [man-1.6g]
|
||||
|
||||
Signed-off-by: Jian Liu <jian.liu@windriver.com>
|
||||
|
||||
diff -Nur man-1.6g.orig/src/makewhatis.sh man-1.6g/src/makewhatis.sh
|
||||
--- man-1.6g.orig/src/makewhatis.sh 2015-02-25 16:13:12.657611419 +0800
|
||||
+++ man-1.6g/src/makewhatis.sh 2015-02-25 16:14:49.334694815 +0800
|
||||
@@ -67,7 +67,7 @@
|
||||
# but that leads to problems and bugs.
|
||||
|
||||
# AWK=/usr/bin/gawk
|
||||
-AWK=@awk@
|
||||
+AWK=`which awk`
|
||||
|
||||
# Find a place for our temporary files. If security is not a concern, use
|
||||
# TMPFILE=/tmp/whatis$$; TMPFILEDIR=none
|
|
@ -50,7 +50,9 @@ SRC_URI = "http://pkgs.fedoraproject.org/lookaside/pkgs/man2html/${BP}.tar.gz/ba
|
|||
file://man.1.gz;unpack=false \
|
||||
file://man.7.gz;unpack=false \
|
||||
file://man.conf \
|
||||
file://manpath.5.gz;unpack=false"
|
||||
file://manpath.5.gz;unpack=false \
|
||||
file://man-1.6g-whatis3.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660"
|
||||
SRC_URI[sha256sum] = "ccdcb8c3f4e0080923d7e818f0e4a202db26c46415eaef361387c20995b8959f"
|
||||
|
|
Loading…
Reference in New Issue