Patchwork [meta-networking] ebtables: move ebtables-save to sbindir to avoid QA issue

login
register
mail settings
Submitter jackie huang
Date Feb. 25, 2013, 5:24 a.m.
Message ID <1361769851-28342-1-git-send-email-jackie.huang@windriver.com>
Download mbox | patch
Permalink /patch/45025/
State Accepted
Commit a7c6fcebee7d9f86c356ea92de445d89e714ff62
Headers show

Comments

jackie huang - Feb. 25, 2013, 5:24 a.m.
From: Jackie Huang <jackie.huang@windriver.com>

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

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 .../recipes-filter/ebtables/ebtables_2.0.10-4.bb   |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
Joe MacDonald - Feb. 25, 2013, 3:18 p.m.
Merged, thanks.

-J.

[[meta-networking][PATCH] ebtables: move ebtables-save to sbindir to avoid QA issue] On 13.02.25 (Mon 13:24) jackie.huang@windriver.com wrote:

> From: Jackie Huang <jackie.huang@windriver.com>
> 
> 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
> 
> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ---
>  .../recipes-filter/ebtables/ebtables_2.0.10-4.bb   |    7 ++++++-
>  1 files changed, 6 insertions(+), 1 deletions(-)
> 
> diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
> index bca34c0..d6d803a 100644
> --- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
> +++ b/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"

Patch

diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
index bca34c0..d6d803a 100644
--- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
+++ b/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"