diff options
Diffstat (limited to 'meta/recipes-extended/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 | ||||
| -rw-r--r-- | meta/recipes-extended/man/man/man.conf | 3 | ||||
| -rw-r--r-- | meta/recipes-extended/man/man_1.6g.bb | 21 |
4 files changed, 47 insertions, 4 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 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 0000000000..6334456857 --- /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.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 diff --git a/meta/recipes-extended/man/man/man.conf b/meta/recipes-extended/man/man/man.conf index bb3c69720e..fc10be2758 100644 --- a/meta/recipes-extended/man/man/man.conf +++ b/meta/recipes-extended/man/man/man.conf @@ -133,7 +133,8 @@ MANSECT 1:1p:8:2:3:3p:4:5:6:7:9:0p:tcl:n:l:p:o # The command given must act as a filter. # .gz /bin/gunzip -c -.bz2 /bin/bzip2 -c -d +.bz2 /usr/bin/bunzip2 -c +.xz /usr/bin/unxz -c .z .Z /bin/zcat .F diff --git a/meta/recipes-extended/man/man_1.6g.bb b/meta/recipes-extended/man/man_1.6g.bb index a66e01cb9a..d4a4b26fc5 100644 --- a/meta/recipes-extended/man/man_1.6g.bb +++ b/meta/recipes-extended/man/man_1.6g.bb @@ -9,7 +9,20 @@ PR = "r1" DEPENDS = "groff less" -SRC_URI = "http://primates.ximian.com/~flucifredi/${BPN}/${BPN}-${PV}.tar.gz \ +def compress_pkg(d): + if "compress_doc" in (d.getVar("INHERIT", True) or "").split(): + compress = d.getVar("DOC_COMPRESS", True) + if compress == "gz": + return "gzip" + elif compress == "bz2": + return "bzip2" + elif compress == "xz": + return "xz" + return "" + +RDEPENDS_${PN} += "${@compress_pkg(d)}" + +SRC_URI = "http://pkgs.fedoraproject.org/lookaside/pkgs/man2html/${BP}.tar.gz/ba154d5796928b841c9c69f0ae376660/${BP}.tar.gz \ file://man-1.5k-confpath.patch;striplevel=0 \ file://man-1.5h1-make.patch \ file://man-1.5k-nonascii.patch \ @@ -37,7 +50,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" @@ -47,7 +62,7 @@ do_configure () { } -fakeroot do_install() { +do_install() { oe_runmake install DESTDIR=${D} } |