- 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
Signed-off-by: Jian Liu <jian....@windriver.com> --- meta/recipes-extended/man/man/man-1.6e-whatis2.patch | 7 +++++++ meta/recipes-extended/man/man/man-1.6g-whatis3.patch | 20 ++++++++++++++++++++ meta/recipes-extended/man/man_1.6g.bb | 4 +++- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/man/man/man-1.6g-whatis3.patch 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 7f01383..f65971a 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 here=`pwd` cd $mandir for i in $sections +@@ -447,7 +447,6 @@ + + chmod 644 ${mandir1}/whatis + rm $TMPFILE +- fi + done + 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 0000000..145aeaf --- /dev/null +++ b/meta/recipes-extended/man/man/man-1.6g-whatis3.patch @@ -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....@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 diff --git a/meta/recipes-extended/man/man_1.6g.bb b/meta/recipes-extended/man/man_1.6g.bb index a2b16d2..917fd50 100644 --- a/meta/recipes-extended/man/man_1.6g.bb +++ b/meta/recipes-extended/man/man_1.6g.bb @@ -38,7 +38,9 @@ SRC_URI = "http://primates.ximian.com/~flucifredi/${BPN}/${BPN}-${PV}.tar.gz \ 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" -- 1.8.5.2.233.g932f7e4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core