socat: upgrade to 1.7.2.3 and enable ptest
cover socat: upgrade to 1.7.2.3 and enable ptest
Test Steps:
1. vim local.conf
...IMAGE_INSTALL_append = " socat"DISTRO_FEATURES_append = " ptest"IMAGE_FEATURES += "ptest-pkgs"
...
2. build core-image-minimal and runqemu
bitbake core-image-minimal
runqemu qemux86
3. start test
/usr/lib/socat/ptest/run-ptest
4. test result
...
summary: 314 tests; 255 ok, 25 failed, 31 could not be performed
...
//Hongxu
The following changes since commit 095bb006c3dbbfbdfa05f13d8d7b50e2a5ab2af0:
bitbake: bitbake: build.py: create separate function for shell trap creation code (2014-02-09 10:01:38 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib hongxu/socat
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/socat
Hongxu Jia (2):
socat: upgrade to 1.7.2.3
socat: enable ptest
.../socat/{files => socat}/compile.patch | 0
.../{files => socat}/fix-xxx_SHIFT-autoheader.patch | 0
meta/recipes-connectivity/socat/socat/run-ptest | 5 +++++
.../socat/{socat_1.7.2.2.bb => socat_1.7.2.3.bb} | 16 ++++++++++++----
4 files changed, 17 insertions(+), 4 deletions(-)
rename meta/recipes-connectivity/socat/{files => socat}/compile.patch (100%)
rename meta/recipes-connectivity/socat/{files => socat}/fix-xxx_SHIFT-autoheader.patch (100%)
create mode 100644 meta/recipes-connectivity/socat/socat/run-ptest
rename meta/recipes-connectivity/socat/{socat_1.7.2.2.bb => socat_1.7.2.3.bb} (77%)Signature · 1 line
1.8.1.2
PATCH 1/2 socat: upgrade to 1.7.2.3
The package has been successfully compiled for all major architectures.
---
meta/recipes-connectivity/socat/{files => socat}/compile.patch | 0
.../socat/{files => socat}/fix-xxx_SHIFT-autoheader.patch | 0
.../recipes-connectivity/socat/{socat_1.7.2.2.bb => socat_1.7.2.3.bb} | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-connectivity/socat/{files => socat}/compile.patch (100%)
rename meta/recipes-connectivity/socat/{files => socat}/fix-xxx_SHIFT-autoheader.patch (100%)
rename meta/recipes-connectivity/socat/{socat_1.7.2.2.bb => socat_1.7.2.3.bb} (89%)meta/recipes-connectivity/socat/socat/compile.patch renamed from meta/recipes-connectivity/socat/files/compile.patch +0 -0
meta/recipes-connectivity/socat/socat/fix-xxx_SHIFT-autoheader.patch renamed from meta/recipes-connectivity/socat/files/fix-xxx_SHIFT-autoheader.patch +0 -0
meta/recipes-connectivity/socat/socat_1.7.2.3.bb renamed from meta/recipes-connectivity/socat/socat_1.7.2.2.bb +2 -2
@@ -16,8 +16,8 @@ SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ file://compile.patch \ file://fix-xxx_SHIFT-autoheader.patch" -SRC_URI[md5sum] = "39231e512d8052f328552865df15d42f" -SRC_URI[sha256sum] = "9a167af11a4d3809cbc66f5e2dcb39b6e371251282ef5de6ea6ff0c4be8a953c" +SRC_URI[md5sum] = "75008d8baf7c6c9e27aa7afb34a622de" +SRC_URI[sha256sum] = "0598ac54af7b138cda9e3c141bcf0cc63eeb2ab31f468a772dc3f7eb3896aad0" PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
Signature · 1 line
1.8.1.2
PATCH 2/2 socat: enable ptest
In reply to Hongxu Jia--- meta/recipes-connectivity/socat/socat/run-ptest | 5 +++++ meta/recipes-connectivity/socat/socat_1.7.2.3.bb | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/socat/socat/run-ptest
meta/recipes-connectivity/socat/socat/run-ptest new file +5 -0
@@ -0,0 +1,5 @@ +#!/bin/bash + +export SOCAT="/usr/bin/socat" + +./test.sh
meta/recipes-connectivity/socat/socat_1.7.2.3.bb +10 -2
@@ -7,6 +7,8 @@ SECTION = "console/network" DEPENDS = "openssl readline" +RDEPENDS_${PN}-ptest += "bash" + LICENSE = "GPL-2.0+-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \ file://README;beginline=252;endline=282;md5=79246f11a1db0b6ccec54d1fb711c01e"
@@ -14,7 +16,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \ SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ file://compile.patch \ - file://fix-xxx_SHIFT-autoheader.patch" + file://fix-xxx_SHIFT-autoheader.patch \ + file://run-ptest \ +" SRC_URI[md5sum] = "75008d8baf7c6c9e27aa7afb34a622de" SRC_URI[sha256sum] = "0598ac54af7b138cda9e3c141bcf0cc63eeb2ab31f468a772dc3f7eb3896aad0"
@@ -27,7 +31,7 @@ EXTRA_OECONF += "ac_cv_have_z_modifier=yes sc_cv_sys_crdly_shift=9 \ ac_cv_ispeed_offset=13 \ " -inherit autotools +inherit autotools ptest do_configure_prepend() { sed '/AC_DEFINE_UNQUOTED(ISPEED_OFFSET/a\AC_DEFINE(OSPEED_OFFSET,\
@@ -38,3 +42,7 @@ do_install_prepend () { mkdir -p ${D}${bindir} install -d ${D}${bindir} ${D}${mandir}/man1 } + +do_install_ptest() { + cp -r ${S}/*.sh ${D}${PTEST_PATH} +}
Signature · 1 line
1.8.1.2
Re: [PATCH 2/2] socat: enable ptest
-Khem
Review
Quoted 9 lines · Hongxu Jia
Signed-off-by Hongxu Jia <[email protected]>--- meta/recipes-connectivity/socat/socat/run-ptest | 5 +++++ meta/recipes-connectivity/socat/socat_1.7.2.3.bb | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/socat/socat/run-ptest(quoted diff) +0
-0
b/meta/recipes-connectivity/socat/socat/run-ptest
meta/recipes-connectivity/socat/socat/run-ptest line 1
Quoted 6 lines
new file mode 100644
index 0000000..1fffab1meta/recipes-connectivity/socat/socat/run-ptest new file +1
-0@@ -0,0 +1,5 @@ +#!/bin/bash
is bash really needed ?
Review
Quoted 5 lines
meta/recipes-connectivity/socat/socat/run-ptest new file +4
-0+ +export SOCAT="/usr/bin/socat" + +./test.sh(quoted diff) +0
-0
socat_1.7.2.3.bb
meta/recipes-connectivity/socat/socat_1.7.2.3.bb SECTION = "console/network" · line 14
Quoted 12 lines
index 99060b1..2e763bb 100644
meta/recipes-connectivity/socat/socat_1.7.2.3.bb +2
-0@@ -7,6 +7,8 @@ SECTION = "console/network" DEPENDS = "openssl readline" +RDEPENDS_${PN}-ptest += "bash" + LICENSE = "GPL-2.0+-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \
file://README;beginline=252;endline=282;md5=79246f11a1db0b6ccec54d1fb711c01e"
meta/recipes-connectivity/socat/socat_1.7.2.3.bb LIC_FILES_CHKSUM =
Quoted 1 line
meta/recipes-connectivity/socat/socat_1.7.2.3.bb +0
-0@@ -14,7 +16,9 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=18810669f13b87348459e611d31ab760 \
meta/recipes-connectivity/socat/socat_1.7.2.3.bb LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \
Quoted 10 lines
meta/recipes-connectivity/socat/socat_1.7.2.3.bb +3
-1SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2\ file://compile.patch \ - file://fix-xxx_SHIFT-autoheader.patch" + file://fix-xxx_SHIFT-autoheader.patch \ + file://run-ptest \ +" SRC_URI[md5sum] = "75008d8baf7c6c9e27aa7afb34a622de" SRC_URI[sha256sum] =
"0598ac54af7b138cda9e3c141bcf0cc63eeb2ab31f468a772dc3f7eb3896aad0"
meta/recipes-connectivity/socat/socat_1.7.2.3.bb EXTRA_OECONF += "ac_cv_have_z_modifier=yes
Quoted 1 line
meta/recipes-connectivity/socat/socat_1.7.2.3.bb +0
-0@@ -27,7 +31,7 @@ EXTRA_OECONF += "ac_cv_have_z_modifier=yes
sc_cv_sys_crdly_shift=9 \
Quoted 23 lines
meta/recipes-connectivity/socat/socat_1.7.2.3.bb +5
-2ac_cv_ispeed_offset=13 \ " -inherit autotools +inherit autotools ptest do_configure_prepend() { sed '/AC_DEFINE_UNQUOTED(ISPEED_OFFSET/a\AC_DEFINE(OSPEED_OFFSET,\@@ -38,3 +42,7 @@ do_install_prepend () { mkdir -p ${D}${bindir} install -d ${D}${bindir} ${D}${mandir}/man1 } + +do_install_ptest() { + cp -r ${S}/*.sh ${D}${PTEST_PATH} +} --1.8.1.2
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 2/2] socat: enable ptest
Quoted 15 lines · Khem Raj
-Khem
Quoted 2 lines · On Feb 12, 2014 6:57 PM, "Hongxu Jia" <[email protected]…
Signed-off-by Hongxu Jia <[email protected]<mailto:[email protected]>>
Quoted 3 lines
--- meta/recipes-connectivity/socat/socat/run-ptest | 5 +++++meta/recipes-connectivity/socat/socat_1.7.2.3.bb
<http://socat_1.7.2.3.bb> | 12 ++++++++++--
Review
Quoted 4 lines
2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/socat/socat/run-ptest(quoted diff) +0
-0b/meta/recipes-connectivity/socat/socat/run-ptest
Quoted 9 lines
meta/recipes-connectivity/socat/socat/run-ptest line 1
Quoted 6 lines
new file mode 100644
index 0000000..1fffab1meta/recipes-connectivity/socat/socat/run-ptest new file +1
-0@@ -0,0 +1,5 @@ +#!/bin/bashis bash really needed ?
Yes, I am sure.
The socat's FAQ:
...
23 Q: I succeeded to configure and make socat, but ./test.sh says
something
24 like:
25 ./test.sh: No such file or directory
26
27 A: You need a bash shell, and its location must be correctly
specified in the
28 first line of test.sh, e.g. /usr/local/bin/bash instead of /bin/bash.
...
//Hongxu
Quoted 63 lines
Review
Quoted 5 lines
meta/recipes-connectivity/socat/socat/run-ptest new file +4
-0+ +export SOCAT="/usr/bin/socat" + +./test.sh(quoted diff) +0
-0<http://socat_1.7.2.3.bb> b/meta/recipes-connectivity/socat/socat_1.7.2.3.bb <http://socat_1.7.2.3.bb>
Quoted 2 lines
index 99060b1..2e763bb 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.2.3.bbQuoted 1 line
+++ b/meta/recipes-connectivity/socat/socat_1.7.2.3.bb
meta/recipes-connectivity/socat/socat_1.7.2.3.bb SECTION = "console/network" · line 13
Quoted 8 lines
meta/recipes-connectivity/socat/socat_1.7.2.3.bb +2
-0@@ -7,6 +7,8 @@ SECTION = "console/network" DEPENDS = "openssl readline" +RDEPENDS_${PN}-ptest += "bash" + LICENSE = "GPL-2.0+-with-OpenSSL-exception" LIC_FILES_CHKSUM ="file://COPYING;md5=18810669f13b87348459e611d31ab760 \
Quoted 1 line
file://README;beginline=252;endline=282;md5=79246f11a1db0b6ccec54d1fb711c01e"
Review LIC_FILES_CHKSUM =
Quoted 1 line
(quoted diff) +0
-0@@ -14,7 +16,9 @@ LIC_FILES_CHKSUM ="file://COPYING;md5=18810669f13b87348459e611d31ab760 \
Review LIC_FILES_CHKSUM = · line 16
Quoted 2 lines
(quoted diff) +0
-0SRC_URI ="http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 <http://www.dest-unreach.org/socat/download/socat-$%7BPV%7D.tar.bz2> \
meta/recipes-connectivity/socat/socat_1.7.2.3.bb LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \
Quoted 8 lines
meta/recipes-connectivity/socat/socat_1.7.2.3.bb +3
-1file://compile.patch \ - file://fix-xxx_SHIFT-autoheader.patch" + file://fix-xxx_SHIFT-autoheader.patch \ + file://run-ptest \ +" SRC_URI[md5sum] = "75008d8baf7c6c9e27aa7afb34a622de" SRC_URI[sha256sum] ="
0598ac54af7b138cda9e3c141bcf0cc63eeb2ab31f468a772dc3f7eb3896aad0"Review EXTRA_OECONF += "ac_cv_have_z_modifier=yes
Quoted 1 line
(quoted diff) +0
-0@@ -27,7 +31,7 @@ EXTRA_OECONF += "ac_cv_have_z_modifier=yessc_cv_sys_crdly_shift=9 \
Quoted 19 lines
meta/recipes-connectivity/socat/socat_1.7.2.3.bb +5
-2ac_cv_ispeed_offset=13 \ " -inherit autotools +inherit autotools ptest do_configure_prepend() { sed '/AC_DEFINE_UNQUOTED(ISPEED_OFFSET/a\AC_DEFINE(OSPEED_OFFSET,\@@ -38,3 +42,7 @@ do_install_prepend () { mkdir -p ${D}${bindir} install -d ${D}${bindir} ${D}${mandir}/man1 } + +do_install_ptest() { + cp -r ${S}/*.sh ${D}${PTEST_PATH} +} --1.8.1.2
Quoted 3 lines
_______________________________________________
Openembedded-core mailing list
[email protected]<mailto:[email protected]>
Re: [PATCH 2/2] socat: enable ptest
Quoted 21 lines · Hongxu Jia
Quoted 10 lines · Khem Raj
-Khem
Quoted 8 lines · Hongxu Jia
Signed-off-by Hongxu Jia <[email protected]>--- meta/recipes-connectivity/socat/socat/run-ptest | 5 +++++ meta/recipes-connectivity/socat/socat_1.7.2.3.bb | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/socat/socat/run-ptestQuoted 9 lines
meta/recipes-connectivity/socat/socat/run-ptest line 1
Quoted 7 lines
meta/recipes-connectivity/socat/socat/run-ptest new file +1
-0@@ -0,0 +1,5 @@ +#!/bin/bashis bash really needed ?
Quoted 9 lines
Yes, I am sure.
The socat's FAQ:
...
23 Q: I succeeded to configure and make socat, but ./test.sh says something 24 like:
25 ./test.sh: No such file or directory
26
27 A: You need a bash shell, and its location must be correctly specified in the 28 first line oftest.sh, e.g./usr/local/bin/bashinstead of/bin/bash.
OK thx