* [PATCH 0/2] socat: upgrade to 1.7.2.3 and enable ptest
@ 2014-02-13 2:54 Hongxu Jia
2014-02-13 2:54 ` [PATCH 1/2] socat: upgrade to 1.7.2.3 Hongxu Jia
2014-02-13 2:54 ` [PATCH 2/2] socat: enable ptest Hongxu Jia
0 siblings, 2 replies; 6+ messages in thread
From: Hongxu Jia @ 2014-02-13 2:54 UTC (permalink / raw)
To: openembedded-core; +Cc: saul.wold
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%)
--
1.8.1.2
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] socat: upgrade to 1.7.2.3 2014-02-13 2:54 [PATCH 0/2] socat: upgrade to 1.7.2.3 and enable ptest Hongxu Jia @ 2014-02-13 2:54 ` Hongxu Jia 2014-02-13 2:54 ` [PATCH 2/2] socat: enable ptest Hongxu Jia 1 sibling, 0 replies; 6+ messages in thread From: Hongxu Jia @ 2014-02-13 2:54 UTC (permalink / raw) To: openembedded-core; +Cc: saul.wold The package has been successfully compiled for all major architectures. Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- 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%) diff --git a/meta/recipes-connectivity/socat/files/compile.patch b/meta/recipes-connectivity/socat/socat/compile.patch similarity index 100% rename from meta/recipes-connectivity/socat/files/compile.patch rename to meta/recipes-connectivity/socat/socat/compile.patch diff --git a/meta/recipes-connectivity/socat/files/fix-xxx_SHIFT-autoheader.patch b/meta/recipes-connectivity/socat/socat/fix-xxx_SHIFT-autoheader.patch similarity index 100% rename from meta/recipes-connectivity/socat/files/fix-xxx_SHIFT-autoheader.patch rename to meta/recipes-connectivity/socat/socat/fix-xxx_SHIFT-autoheader.patch diff --git a/meta/recipes-connectivity/socat/socat_1.7.2.2.bb b/meta/recipes-connectivity/socat/socat_1.7.2.3.bb similarity index 89% rename from meta/recipes-connectivity/socat/socat_1.7.2.2.bb rename to meta/recipes-connectivity/socat/socat_1.7.2.3.bb index 398caa3..99060b1 100644 --- a/meta/recipes-connectivity/socat/socat_1.7.2.2.bb +++ b/meta/recipes-connectivity/socat/socat_1.7.2.3.bb @@ -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" -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] socat: enable ptest 2014-02-13 2:54 [PATCH 0/2] socat: upgrade to 1.7.2.3 and enable ptest Hongxu Jia 2014-02-13 2:54 ` [PATCH 1/2] socat: upgrade to 1.7.2.3 Hongxu Jia @ 2014-02-13 2:54 ` Hongxu Jia 2014-02-13 3:26 ` Khem Raj 1 sibling, 1 reply; 6+ messages in thread From: Hongxu Jia @ 2014-02-13 2:54 UTC (permalink / raw) To: openembedded-core; +Cc: saul.wold Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- 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 diff --git a/meta/recipes-connectivity/socat/socat/run-ptest b/meta/recipes-connectivity/socat/socat/run-ptest new file mode 100644 index 0000000..1fffab1 --- /dev/null +++ b/meta/recipes-connectivity/socat/socat/run-ptest @@ -0,0 +1,5 @@ +#!/bin/bash + +export SOCAT="/usr/bin/socat" + +./test.sh diff --git a/meta/recipes-connectivity/socat/socat_1.7.2.3.bb b/meta/recipes-connectivity/socat/socat_1.7.2.3.bb index 99060b1..2e763bb 100644 --- a/meta/recipes-connectivity/socat/socat_1.7.2.3.bb +++ b/meta/recipes-connectivity/socat/socat_1.7.2.3.bb @@ -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} +} -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] socat: enable ptest 2014-02-13 2:54 ` [PATCH 2/2] socat: enable ptest Hongxu Jia @ 2014-02-13 3:26 ` Khem Raj 2014-02-13 3:38 ` Hongxu Jia 0 siblings, 1 reply; 6+ messages in thread From: Khem Raj @ 2014-02-13 3:26 UTC (permalink / raw) To: Hongxu Jia; +Cc: Patches and discussions about the oe-core layer, Saul Wold [-- Attachment #1: Type: text/plain, Size: 2610 bytes --] -Khem On Feb 12, 2014 6:57 PM, "Hongxu Jia" <hongxu.jia@windriver.com> wrote: > > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > --- > 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 > > diff --git a/meta/recipes-connectivity/socat/socat/run-ptest b/meta/recipes-connectivity/socat/socat/run-ptest > new file mode 100644 > index 0000000..1fffab1 > --- /dev/null > +++ b/meta/recipes-connectivity/socat/socat/run-ptest > @@ -0,0 +1,5 @@ > +#!/bin/bash is bash really needed ? > + > +export SOCAT="/usr/bin/socat" > + > +./test.sh > diff --git a/meta/recipes-connectivity/socat/socat_1.7.2.3.bbb/meta/recipes-connectivity/socat/ socat_1.7.2.3.bb > index 99060b1..2e763bb 100644 > --- a/meta/recipes-connectivity/socat/socat_1.7.2.3.bb > +++ b/meta/recipes-connectivity/socat/socat_1.7.2.3.bb > @@ -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} > +} > -- > 1.8.1.2 > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core [-- Attachment #2: Type: text/html, Size: 3854 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] socat: enable ptest 2014-02-13 3:26 ` Khem Raj @ 2014-02-13 3:38 ` Hongxu Jia 2014-02-13 3:48 ` Khem Raj 0 siblings, 1 reply; 6+ messages in thread From: Hongxu Jia @ 2014-02-13 3:38 UTC (permalink / raw) To: Khem Raj; +Cc: Patches and discussions about the oe-core layer, Saul Wold [-- Attachment #1: Type: text/plain, Size: 3548 bytes --] On 02/13/2014 11:26 AM, Khem Raj wrote: > > -Khem > On Feb 12, 2014 6:57 PM, "Hongxu Jia" <hongxu.jia@windriver.com > <mailto:hongxu.jia@windriver.com>> wrote: > > > > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com > <mailto:hongxu.jia@windriver.com>> > > --- > > 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 ++++++++++-- > > 2 files changed, 15 insertions(+), 2 deletions(-) > > create mode 100644 meta/recipes-connectivity/socat/socat/run-ptest > > > > diff --git a/meta/recipes-connectivity/socat/socat/run-ptest > b/meta/recipes-connectivity/socat/socat/run-ptest > > new file mode 100644 > > index 0000000..1fffab1 > > --- /dev/null > > +++ b/meta/recipes-connectivity/socat/socat/run-ptest > > @@ -0,0 +1,5 @@ > > +#!/bin/bash > > is 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 > > + > > +export SOCAT="/usr/bin/socat" > > + > > +./test.sh > > diff --git a/meta/recipes-connectivity/socat/socat_1.7.2.3.bb > <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> > > index 99060b1..2e763bb 100644 > > --- a/meta/recipes-connectivity/socat/socat_1.7.2.3.bb > <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> > > @@ -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 > <http://www.dest-unreach.org/socat/download/socat-$%7BPV%7D.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} > > +} > > -- > > 1.8.1.2 > > > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > <mailto:Openembedded-core@lists.openembedded.org> > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > [-- Attachment #2: Type: text/html, Size: 6460 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] socat: enable ptest 2014-02-13 3:38 ` Hongxu Jia @ 2014-02-13 3:48 ` Khem Raj 0 siblings, 0 replies; 6+ messages in thread From: Khem Raj @ 2014-02-13 3:48 UTC (permalink / raw) To: Hongxu Jia; +Cc: Patches and discussions about the oe-core layer, Saul Wold [-- Attachment #1: Type: text/plain, Size: 1257 bytes --] On Feb 12, 2014, at 7:38 PM, Hongxu Jia <hongxu.jia@windriver.com> wrote: > On 02/13/2014 11:26 AM, Khem Raj wrote: >> -Khem >> On Feb 12, 2014 6:57 PM, "Hongxu Jia" <hongxu.jia@windriver.com> wrote: >> > >> > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> >> > --- >> > 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 >> > >> > diff --git a/meta/recipes-connectivity/socat/socat/run-ptest b/meta/recipes-connectivity/socat/socat/run-ptest >> > new file mode 100644 >> > index 0000000..1fffab1 >> > --- /dev/null >> > +++ b/meta/recipes-connectivity/socat/socat/run-ptest >> > @@ -0,0 +1,5 @@ >> > +#!/bin/bash >> >> is 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. OK thx [-- Attachment #2: Type: text/html, Size: 2644 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-02-13 3:48 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-02-13 2:54 [PATCH 0/2] socat: upgrade to 1.7.2.3 and enable ptest Hongxu Jia 2014-02-13 2:54 ` [PATCH 1/2] socat: upgrade to 1.7.2.3 Hongxu Jia 2014-02-13 2:54 ` [PATCH 2/2] socat: enable ptest Hongxu Jia 2014-02-13 3:26 ` Khem Raj 2014-02-13 3:38 ` Hongxu Jia 2014-02-13 3:48 ` Khem Raj
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.