From 58ac4da13cf32e1c8484d1a6ac51f0f439a6932c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 30 Sep 2016 12:47:34 +0300 Subject: iputils: do not build or install manpages This allows dropping the SGML stack dependency, and iputils is the only package in oe-core that still needs it (for manpages only). Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- meta/recipes-extended/iputils/iputils_s20151218.bb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/meta/recipes-extended/iputils/iputils_s20151218.bb b/meta/recipes-extended/iputils/iputils_s20151218.bb index 715045470c..0d4dd1b17c 100644 --- a/meta/recipes-extended/iputils/iputils_s20151218.bb +++ b/meta/recipes-extended/iputils/iputils_s20151218.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://ping.c;beginline=1;endline=35;md5=f9ceb201733e9a6cf8f file://arping.c;beginline=1;endline=11;md5=fe84301b5c2655c950f8b92a057fafa6 \ file://tftpd.c;beginline=1;endline=32;md5=28834bf8a91a5b8a92755dbee709ef96 " -DEPENDS = "gnutls docbook-utils-native sgmlspl-native libcap libgcrypt" +DEPENDS = "gnutls libcap libgcrypt" SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \ @@ -30,11 +30,11 @@ UPSTREAM_CHECK_REGEX = "iputils-(?Ps\d+).tar" EXTRA_OEMAKE = "-e MAKEFLAGS=" do_compile () { - oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}:${STAGING_DIR_HOST}/${base_libdir}" all man + oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}:${STAGING_DIR_HOST}/${base_libdir}" all } do_install () { - install -m 0755 -d ${D}${base_bindir} ${D}${mandir}/man8 + install -m 0755 -d ${D}${base_bindir} # SUID root programs install -m 4555 ping ${D}${base_bindir}/ping install -m 4555 ping6 ${D}${base_bindir}/ping6 @@ -44,10 +44,6 @@ do_install () { for i in arping tracepath tracepath6; do install -m 0755 $i ${D}${base_bindir}/ done - # Manual pages for things we build packages for - for i in tracepath.8 traceroute6.8 ping.8 arping.8; do - install -m 0644 doc/$i ${D}${mandir}/man8/ || true - done } inherit update-alternatives @@ -73,4 +69,3 @@ FILES_${PN}-tracepath = "${base_bindir}/tracepath" FILES_${PN}-tracepath6 = "${base_bindir}/tracepath6" FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" FILES_${PN}-clockdiff = "${base_bindir}/clockdiff" -FILES_${PN}-doc = "${mandir}/man8" -- cgit 1.2.3-korg