helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-16 17:52:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

ebtables: remove upstream ebtables-legacy-save

Browse Source 
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 <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao 2020-12-31 17:03:30 +08:00 committed by Khem Raj
parent cac0daacd1
commit 5816f414af
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save Executable file → Normal file
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
EBTABLES="/sbin/ebtables" EBTABLES="/usr/sbin/ebtables-legacy"
[ -x "$EBTABLES" ] || exit 1 [ -x "$EBTABLES" ] || exit 1

6
meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
View File

@ -28,11 +28,11 @@ do_install_append () {
#This file has been provided by netbase #This file has been provided by netbase
rm -f ${D}${sysconfdir}/ethertypes rm -f ${D}${sysconfdir}/ethertypes
install -d ${D}${base_sbindir}
# Replace upstream ebtables-save perl script with Fedora bash based rewrite # 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 rm -f ${D}${sbindir}/ebtables-legacy-save
sed -i 's!/sbin/!${base_sbindir}/!g' ${D}${base_sbindir}/ebtables-legacy-save install -m 0755 ${WORKDIR}/ebtables-legacy-save ${D}${sbindir}/ebtables-legacy-save
# Install systemd service files # Install systemd service files
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
install -d ${D}${systemd_unitdir}/system install -d ${D}${systemd_unitdir}/system