diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
| commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
| tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-security/recipes-security/scapy | |
| parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
| download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz | |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-security/recipes-security/scapy')
| -rw-r--r--[-rwxr-xr-x] | meta-security/recipes-security/scapy/files/run-ptest | 0 | ||||
| -rw-r--r-- | meta-security/recipes-security/scapy/python-scapy.inc | 17 | ||||
| -rw-r--r-- | meta-security/recipes-security/scapy/python-scapy_2.4.2.bb (renamed from meta-security/recipes-security/scapy/python-scapy_2.4.0.bb) | 0 | ||||
| -rw-r--r-- | meta-security/recipes-security/scapy/python3-scapy_2.4.2.bb (renamed from meta-security/recipes-security/scapy/python3-scapy_2.4.0.bb) | 1 |
4 files changed, 14 insertions, 4 deletions
diff --git a/meta-security/recipes-security/scapy/files/run-ptest b/meta-security/recipes-security/scapy/files/run-ptest index 91b29f907..91b29f907 100755..100644 --- a/meta-security/recipes-security/scapy/files/run-ptest +++ b/meta-security/recipes-security/scapy/files/run-ptest diff --git a/meta-security/recipes-security/scapy/python-scapy.inc b/meta-security/recipes-security/scapy/python-scapy.inc index 5abe7db76..99f30a7bf 100644 --- a/meta-security/recipes-security/scapy/python-scapy.inc +++ b/meta-security/recipes-security/scapy/python-scapy.inc @@ -5,16 +5,25 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://bin/scapy;beginline=9;endline=13;md5=1d5249872cc54cd4ca3d3879262d0c69" -SRC_URI[md5sum] = "d7d3c4294f5a718e234775d38dbeb7ec" -SRC_URI[sha256sum] = "452f714f5c2eac6fd0a6146b1dbddfc24dd5f4103f3ed76227995a488cfb2b73" +S = "${WORKDIR}/git" -inherit pypi ptest +SRCREV = "bad14cb1a5aee29f8107fbe8ad008d4645f14da7" +SRC_URI = "git://github.com/secdev/scapy.git" + +inherit ptest + +do_install_append() { + if [ "${PYTHON_PN}" = "python3" ]; then + sed -i -e 's/python/python3/' ${D}${bindir}/scapy + sed -i -e 's/python/python3/' ${D}${bindir}/UTscapy + fi +} do_install_ptest() { install -m 0644 ${S}/test/regression.uts ${D}${PTEST_PATH} sed -i 's,@PTEST_PATH@,${PTEST_PATH},' ${D}${PTEST_PATH}/run-ptest } -RDEPENDS_${PN} = "tcpdump ${PYTHON_PN}-compression ${PYTHON_PN}-netclient \ +RDEPENDS_${PN} = "tcpdump ${PYTHON_PN}-compression ${PYTHON_PN}-cryptography ${PYTHON_PN}-netclient \ ${PYTHON_PN}-netserver ${PYTHON_PN}-pydoc ${PYTHON_PN}-pkgutil ${PYTHON_PN}-shell \ ${PYTHON_PN}-threading ${PYTHON_PN}-numbers ${PYTHON_PN}-pycrypto" diff --git a/meta-security/recipes-security/scapy/python-scapy_2.4.0.bb b/meta-security/recipes-security/scapy/python-scapy_2.4.2.bb index 98db1fd6d..98db1fd6d 100644 --- a/meta-security/recipes-security/scapy/python-scapy_2.4.0.bb +++ b/meta-security/recipes-security/scapy/python-scapy_2.4.2.bb diff --git a/meta-security/recipes-security/scapy/python3-scapy_2.4.0.bb b/meta-security/recipes-security/scapy/python3-scapy_2.4.2.bb index 93ca7be8a..83c79f484 100644 --- a/meta-security/recipes-security/scapy/python3-scapy_2.4.0.bb +++ b/meta-security/recipes-security/scapy/python3-scapy_2.4.2.bb @@ -2,3 +2,4 @@ inherit setuptools3 require python-scapy.inc SRC_URI += "file://run-ptest" + |