Skip to contentSkip to conversation

ebtables: move ebtables-save to sbindir to avoid QA issue

PATCH Applied [email protected] 2 participants 2 messages Feb 25, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ebtables: move ebtables-save to sbindir to avoid QA issue

From: Jackie Huang <[email protected]>

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

---
 .../recipes-filter/ebtables/ebtables_2.0.10-4.bb   |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb +6 -1
index bca34c0..d6d803a 100644
@@ -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"
Signature · 1 line
1.7.4.1
#1 lore raw

Merged, thanks.

-J.

Quoted 37 lines · [[meta-networking][PATCH] ebtables: move ebtables-save to sbindir to avoid QA…

From: Jackie Huang <[email protected]>

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

---
 .../recipes-filter/ebtables/ebtables_2.0.10-4.bb   |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb +6 -1
index bca34c0..d6d803a 100644
@@ -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"
Signature · 2 lines
-Joe MacDonald.
:wq