On 6/10/19 12:24 AM, Zang Ruochen wrote:
> -Remove redundant sed operations.
>
> -Rename conflicting files to resolve conflicts.
merged to master.
working on warrior
thanks,
- armin
>
>
> Zang Ruochen (3):
> [yocto][meta-security][master][warrior][PATCH 1/3] python-scapy: Remove
> redundant sed operations
> [yocto][meta-security][master][warrior][PATCH 2/3] python-scapy: solved
> the conflict with python3-scapy
> [yocto][meta-security][master][warrior][PATCH 3/3] python3-scapy: solved
> the conflict with python-scapy
>
> recipes-security/scapy/python-scapy.inc | 7 -------
> recipes-security/scapy/python-scapy_2.4.2.bb | 5 +++++
> recipes-security/scapy/python3-scapy_2.4.2.bb | 4 ++++
> 3 files changed, 9 insertions(+), 7 deletions(-)
>
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto