From f71ffa49a369702aa6204c27b12a071ac58464d0 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 25 Feb 2013 13:24:11 +0800 Subject: [PATCH] ebtables: move ebtables-save to sbindir to avoid QA issue Fix the QA issue: WARNING: QA Issue: ebtables: Found a reference to /usr/ in /path/to/tmp/work/x86_64-wrs-linux/ebtables-2.0.10-4-r1/packages-split/ebtables/sbin/ebtables-save WARNING: QA Issue: Shell scripts in base_bindir and base_sbindir should not reference anything in exec_prefix (From meta-openembedded rev: a7c6fcebee7d9f86c356ea92de445d89e714ff62) Signed-off-by: Jackie Huang Signed-off-by: Joe MacDonald Signed-off-by: Patrick Ohly --- .../meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb index bca34c0..d6d803a 100644 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb +++ b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb @@ -2,7 +2,7 @@ SUMMARY = "Utility for basic Ethernet frame filtering on a Linux bridge, MAC NAT LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=53b4a999993871a28ab1488fdbd2e73e" SECTION = "console/network" -PR = "r1" +PR = "r2" RDEPENDS_${PN} += "perl" @@ -44,6 +44,11 @@ do_install () { # Fix hardcoded paths in scripts sed -i 's!/sbin/!${base_sbindir}/!g' ${D}/${sysconfdir}/init.d/ebtables sed -i 's!/etc/!${sysconfdir}/!g' ${D}/${sysconfdir}/init.d/ebtables + + # The script ebtables-save refernces perl in exec_prefix, so + # move it to sbindir to avoid QA issue + install -d ${D}/${sbindir} + mv ${D}/${base_sbindir}/ebtables-save ${D}/${sbindir} } CONFFILES_${PN} += "${sysconfdir}/default/ebtables" -- 2.7.4