Patchwork [meta-networking] quagga: fix info-related QA warning

login
register
mail settings
Submitter Joe MacDonald
Date Sept. 5, 2013, 9:10 p.m.
Message ID <1378415406-31225-1-git-send-email-joe@deserted.net>
Download mbox | patch
Permalink /patch/57501/
State Accepted
Commit c896a9bbdcd8c646e33ef11b4c6ece95e154cc7e
Headers show

Comments

Joe MacDonald - Sept. 5, 2013, 9:10 p.m.
Correct the warning:

   quagga-0.99.21: The /usr/share/info/dir file is not meant to be shipped in a particular package.

Simply remove the installed 'dir' file if info docs are installed.

Signed-off-by: Joe MacDonald <joe@deserted.net>
---
 meta-networking/recipes-protocols/quagga/quagga.inc |    4 ++++
 2 file changed, 4 insertions(+)

One of two quick hacks I've thrown together to address the issue.  Neither is
all that pretty, but this one seems to be less destructive.

Roy:  if you have a better solution in the works, please let me know, I'm just
taking a quick patch to addressing the QA issue Martin asked about several weeks
back.

-J

Patch

diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc
index 89b9f7a..8720876 100644
--- a/meta-networking/recipes-protocols/quagga/quagga.inc
+++ b/meta-networking/recipes-protocols/quagga/quagga.inc
@@ -85,6 +85,10 @@  do_install () {
     sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga
     sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
     sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/*
+
+    # Remove generated info dir file, it doesn't belong in the generated
+    # package.
+    rm -f ${D}${infodir}/dir
 }
 
 # Split into a main package and separate per-protocol packages