From: "Yi Zhao" <yi.zhao@windriver.com>
To: Khem Raj <raj.khem@gmail.com>, Jose Quaresma <quaresma.jose@gmail.com>
Cc: openembeded-devel <openembedded-devel@lists.openembedded.org>
Subject: Re: [oe] [meta-networking][PATCH 2/3] etbales: remove upstream ebtables-legacy-save
Date: Wed, 6 Jan 2021 09:03:06 +0800 [thread overview]
Message-ID: <967b10c8-6de1-1b6b-dfce-791007fd2a7a@windriver.com> (raw)
In-Reply-To: <2a98d116-830e-e479-e75d-b2aa285f1743@gmail.com>
On 1/6/21 1:17 AM, Khem Raj wrote:
>
>
> 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
Thanks, Jose and Khem.
//Yi
>
>>
>>
>> Yi Zhao <yi.zhao@windriver.com <mailto:yi.zhao@windriver.com>>
>> 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 <yi.zhao@windriver.com
>> <mailto:yi.zhao@windriver.com>>
>> ---
>> .../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
>>
>>
>>
>>
next prev parent reply other threads:[~2021-01-06 1:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-31 9:03 [meta-networking][PATCH 1/3] ebtables: add missing file ebtables.common Yi Zhao
2020-12-31 9:03 ` [meta-networking][PATCH 2/3] etbales: remove upstream ebtables-legacy-save Yi Zhao
2021-01-05 10:58 ` [oe] " Jose Quaresma
2021-01-05 17:17 ` Khem Raj
2021-01-06 1:03 ` Yi Zhao [this message]
2020-12-31 9:03 ` [meta-networking][PATCH 3/3] ebtables: do not install /etc/ethertypes Yi Zhao
2020-12-31 20:23 ` [oe] [meta-networking][PATCH 1/3] ebtables: add missing file ebtables.common Khem Raj
2021-01-03 4:55 ` Yi Zhao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=967b10c8-6de1-1b6b-dfce-791007fd2a7a@windriver.com \
--to=yi.zhao@windriver.com \
--cc=openembedded-devel@lists.openembedded.org \
--cc=quaresma.jose@gmail.com \
--cc=raj.khem@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox