On 1/5/21 2:58 AM, Jose Quaresma wrote:
Hi,
Fix typo in commit message:
-[oe] [meta-networking][PATCH 2/3] etbales: remove upstream
ebtables-legacy-save
+[oe] [meta-networking][PATCH 2/3] ebtables: remove upstream
ebtables-legacy-save
I gave edited in master-next
Yi Zhao <[email protected] <mailto:[email protected]>> escreveu
no dia quinta, 31/12/2020 à(s) 09:03:
Remove the upstream ebtables-legacy-save before we install the local
ones. And install it to ${sbindir} rather than ${base_sbindir}.
Signed-off-by: Yi Zhao <[email protected]
<mailto:[email protected]>>
---
.../ebtables/ebtables-2.0.11/ebtables-legacy-save | 2 +-
meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
<http://ebtables_2.0.11.bb> | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
mode change 100755 => 100644
meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save
diff --git
a/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save
b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save
old mode 100755
new mode 100644
index 2d7fc4ed7..2133600f7
---
a/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save
+++
b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save
@@ -1,6 +1,6 @@
#!/bin/bash
-EBTABLES="/sbin/ebtables"
+EBTABLES="/usr/sbin/ebtables-legacy"
[ -x "$EBTABLES" ] || exit 1
diff --git
a/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
<http://ebtables_2.0.11.bb>
b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
<http://ebtables_2.0.11.bb>
index 08d4d661d..be21c372d 100644
--- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
<http://ebtables_2.0.11.bb>
+++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
<http://ebtables_2.0.11.bb>
@@ -28,11 +28,11 @@ do_install_append () {
#This file has been provided by netbase
rm -f ${D}${sysconfdir}/ethertypes
- install -d ${D}${base_sbindir}
# Replace upstream ebtables-save perl script with Fedora
bash based rewrite
#
http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save
<http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save>
- install -m 0755 ${WORKDIR}/ebtables-legacy-save
${D}${base_sbindir}/ebtables-legacy-save
- sed -i 's!/sbin/!${base_sbindir}/!g'
${D}${base_sbindir}/ebtables-legacy-save
+ rm -f ${D}${sbindir}/ebtables-legacy-save
+ install -m 0755 ${WORKDIR}/ebtables-legacy-save
${D}${sbindir}/ebtables-legacy-save
+
# Install systemd service files
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd',
'true', 'false', d)}; then
install -d ${D}${systemd_unitdir}/system
--
2.25.1
--
best regards,
José Quaresma
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#88541):
https://lists.openembedded.org/g/openembedded-devel/message/88541
Mute This Topic: https://lists.openembedded.org/mt/79331158/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
